Backport 'Rebase' feature from EE to CE
EE version of gitlab-ce!16071 patch. Part of this EE version is also removing rebase bits from 'ee/'.
Merge request reports
Activity
added 18 commits
-
72fca54a...3f54d5d6 - 16 commits from branch
master
- 302b9c0f - Backport 'Rebase' feature from EE to CE
- ff43868f - removed rebase from EE
-
72fca54a...3f54d5d6 - 16 commits from branch
added 2 commits
@vsizov could you please review this one? @MadLittleMods could you please review fronted part of the patch (and if your fix for !3732 (merged) is included properly)?
assigned to @vsizov
- Resolved by Eric Eastwood
- Resolved by Jan Provaznik
@jprovaznik Seems good
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3732 and https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3727 are integrated in. Only a few minor points.Edited by Eric Eastwoodassigned to @jprovaznik
added 2 commits
added 2 commits
added 224 commits
-
7154e769...b6dfd6be - 222 commits from branch
master
- 63db052c - Backport 'Rebase' feature from EE to CE
- fcae5048 - removed rebase from EE
-
7154e769...b6dfd6be - 222 commits from branch
@dbalexandre could you please review this one?
assigned to @dbalexandre
@jprovaznik I'll review this one after we resolve the discussions on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16071
added 54 commits
-
fcae5048...38521d11 - 52 commits from branch
master
- 4165cd97 - Backport 'Rebase' feature from EE to CE
- a40cdc2e - removed rebase from EE
-
fcae5048...38521d11 - 52 commits from branch
added 151 commits
-
a40cdc2e...81d9e72b - 149 commits from branch
master
- 71280599 - Backport 'Rebase' feature from EE to CE
- 3ae31798 - removed rebase from EE
-
a40cdc2e...81d9e72b - 149 commits from branch
Thanks, @jprovaznik! @smcgivern Can you take care of the maintainer review?
assigned to @smcgivern
Thanks @jprovaznik, backend LGTM.
@filipa could you review and merge if you're happy with the FE please? Please pass to someone else if you're too busy today.
assigned to @filipa
@jprovaznik The frontend changes LGTM, thanks!
I haven't run this locally though, does this need UX approval?
mentioned in commit 2aa91fd2
@filipa thanks! Yes - I think UX is not needed in this case as it's only a backport of an existing feature.
added devopsplan label
added Enterprise Edition label
removed Plan [DEPRECATED] label