All notable changes in MegaMerge will be documented in this file.
- [Feature]: Support multiple manifest files from one meta. The user can select one or more top level (not already included in other manifest files) manifest files. All provided Repositories are scanned for possible PRs to be opned. If there is a Repository present in more than one of the manifest files, its hash will be udpated in all of them.
- [Feature]: Fix text for OpenSource
- [Feature]: Check PR summary as API call (check if: dismiss_stale_pr (disabled), restricted_push (disabled) and access to all included repos)
- [Feature]: Subrepository template dropdown sets template default if there is only one template present
- [Feature]: Show error messsage if merge method "rebase" is not possible on one of the repositories
- [Feature]: Show "rebaseable" state of each repo in GUI on xml file and as return value for API calls
- [Feature]: Return 'mergeable_state' at retrieve pull request api call
- [Feature]: Add dropdown to support all three merge methods SQUASH, REBASE and MERGE
- [Feature]: Remove merge method SQUASH toggle button
- [Feature]: Add NOTICE.txt for update of MM Open Source repository
- [Feature]: Remove content_security_policy.rb for update of MM Open Source repository
- [FIX]: Fix dublicate subs error in case of invalid project
- [FIX]: Update revision of all ocurences of a subrepo in manifest file
- [FIX]: PR Creation not allowed if I have not access to all subrepos
- [FIX]: pr_templates are not present error
- [GUI]:
Description
Draft state info in generated MM PR description - [FIX]: pr_template is nil error
- [Test]: Add a playground instance for live testing
- [Fix]: Removed misleading error message about not found manifest file after successful merge
- [FIX]: Updated security policy according to ccif
- [GUI]: Improved generated PR description
- [Feature]: Enabled include feature
- [GUI]: Added Announcement banner for the include feature to the main Mega Merge page
- [GUI]:
Find All
button - adds all sub PRs with the same source branch as the meta PR to the meta PR - [GUI]: Meta PR template select menu - able to choose between multiple templates for meta PR during MM PR creation
- [GUI]: Sub PR template select menu - able to choose between multiple templates for sub PR during MM PR creation
- [GUI]:
Description
button for sub PRs - shows sub PR template - [GUI]:
Branch
column on the meta repository page - shows meta PR source and target branches - [GUI]:
Source branch
column on the MM PR page - shows the source branch of meta and sub PRs, also acts as a link to the GitHub source branch page - [GUI]: Source branch select menu for sub PRs - able to select a different source branch for sub PRs
- [GUI]:
Target branch
column on the MM PR page - shows the target branch of meta and sub PRs, also acts as a link to the GitHub target branch page - [GUI]:
Squash
button next to the target branch - enables/disables squash and merge(enabled by default) - [Fix]: Ignored white spaces for MM PR titles
- [Fix]: Merge is no longer blocked to branches without protection rules even if changes are requested in the PR
- [Fix]: 502 Bad Gateway GitHub error fixed by executing GQL in batches
- [Fix]: In draft PR state, use source branch head hash instead of the pseudo-merge hash
- [API]: Check remaining rate limit:
/api/v1/:organization/:repository/rate_limit
- [API]: Make PR ready for review:
/api/v1/:organization/:repository/pull/:number/ready_for_review
- [Test]: Enabled Auto-Merging the Test PR in auto test case
- [GUI]: Renamed
Sub Pull Request
button toAdd
button - [GUI]: Changed tooltip next to the
Sub Pull Requests
heading to accomodate new buttons
- Disabled include again
- XML files that are in "external_manifests" folder will be always ignored by MegaMerge
- activated include feature
- symlink will be respected
- draft label is now shown on PR overview page
- "default remote" in XML file will be respected!
- draft button no longer clickable during update process
- source branch name is no longer cut off
- Added API parameter: reviews_done can be true/ false Status is seperate for each repository in the MMPR
- Adapted contributing file
- Changed logger
- Branch protection
-Removed Subrepo Actions
- Changed mergable state. Added third state that means GitHub is still calculating.
- introduced CONTRIBUTING.md, CHANGELOG.md, CODEOWNERS.md
- branch protection