- 01 Feb, 2017 17 commits
-
-
Sean McGivern authored
1. When a branch is protected by a wildcard, it can't be removed by anyone. Skip hooks on branch removal after squashing so that the branch is always removed. 2. Pushing a branch creates an event, cluttering the activity stream. Manually remove this, too.
-
Sean McGivern authored
-
Sean McGivern authored
If the temporary branch we want to push to is protected by a wildcard, we need to add a temporary protected branch entry to allow the current user to push to it, even if they can't administer the project.
-
Sean McGivern authored
In this case, we can save a lot of time and gymnastics by just immediately returning the commit SHA. If it can't be merged, the squashed commit couldn't be merged either.
-
Sean McGivern authored
* 'Learn more' should be 'about this feature' * The feature is to squash and merge at once, not squash before merge
-
Sean McGivern authored
-
Sean McGivern authored
-
Sean McGivern authored
-
Sean McGivern authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Sean McGivern authored
1. Clone the repo to a temp directory. 2. Apply the MR as a patch. 3. Use `git commit -C` to copy the commit metadata from the HEAD commit of the source branch, and manually add the merging user as the committer. 4. Push back to a randomly-generated branch name. 5. Immediately delete that branch, so that it does not appear in the branch list, trigger CI builds, etc. 6. Return the SHA of the squashed commit we've just pushed to the MergeService. 7. In the MergeService, allow an arbitrary source to be used, and set that to either the source branch (if there is no squashing) or the squashed SHA.
-
Sean McGivern authored
When squashing, we may want to merge a different commit than the MR's HEAD commit into the target branch. This interface matches the existing `Repository#ff_merge` method, and allows us to pick an arbitrary commit to merge.
-
Sean McGivern authored
-
- 31 Jan, 2017 3 commits
-
-
DJ Mountney authored
Update the 8.16.3 changelog in master See merge request !1145
-
DJ Mountney authored
-
Douwe Maan authored
Ignore encrypted attributes in Import/Export (EE version) See merge request !1140
-
- 30 Jan, 2017 3 commits
-
-
Douwe Maan authored
Closes #24458 See merge request !8739 # Conflicts: # spec/features/projects/import_export/test_project_export.tar.gz
-
Dmitriy Zaporozhets authored
CE upstream See merge request !1139
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
- 29 Jan, 2017 2 commits
-
-
Achilleas Pipinellis authored
UX Guide: minor updates See merge request !8862
-
Allison Whilden authored
[ci skip] UX guide: clean up term tables in copy [ci skip] UX guide: update dropdown max height for multiline items
-
- 27 Jan, 2017 15 commits
-
-
Jacob Schatz authored
Remove hard-coded absolute URLs from all frontend assets See merge request !8831
-
Alfredo Sumaran authored
Fixed Issuable sidebar so it remains closed on mobile/smaller screen devices See merge request !7466
-
Jose Ivan Vargas authored
-
Robert Speicher authored
[ci skip]
-
Robert Speicher authored
[ci skip]
-
Filipa Lacerda authored
Merge branch '27248-filtered-search-does-not-allow-filtering-labels-with-multiple-words' into 'master' Fix filtering label and milestone with multiple words Closes #27248 and #27334 See merge request !8830
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Robert Speicher authored
[EE] Resolve "NameError: uninitialized constant ApplicationSetting::DEFAULTS" See merge request !1124
-
Robert Speicher authored
Resolve "NameError: uninitialized constant ApplicationSetting::DEFAULTS" Closes #27280 See merge request !8805
-