Skip to content
Snippets Groups Projects

Backport 'Rebase' feature from EE to CE

Merged Jan Provaznik requested to merge jprovazn-rebase-ee into master
All threads resolved!

EE version of gitlab-ce!16071 patch. Part of this EE version is also removing rebase bits from 'ee/'.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Jan Provaznik added 2 commits

    added 2 commits

    • a71a43f8 - Backport 'Rebase' feature from EE to CE
    • ece42c6b - removed rebase from EE

    Compare with previous version

  • Jan Provaznik resolved all discussions

    resolved all discussions

  • Eric Eastwood resolved all discussions

    resolved all discussions

  • Jan Provaznik added 2 commits

    added 2 commits

    • 443c2057 - Backport 'Rebase' feature from EE to CE
    • 7154e769 - removed rebase from EE

    Compare with previous version

  • Jan Provaznik added 224 commits

    added 224 commits

    Compare with previous version

  • Author Maintainer

    @dbalexandre could you please review this one?

  • Jan Provaznik added 54 commits

    added 54 commits

    Compare with previous version

  • Jan Provaznik added 151 commits

    added 151 commits

    Compare with previous version

  • Thanks, @jprovaznik! @smcgivern Can you take care of the maintainer review?

  • 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?

  • I see that the issue doesn't have UX, going to merge

  • Filipa Lacerda approved this merge request

    approved this merge request

  • Filipa Lacerda mentioned in commit 2aa91fd2

    mentioned in commit 2aa91fd2

  • Author Maintainer

    @filipa thanks! Yes - I think UX is not needed in this case as it's only a backport of an existing feature.

  • Please register or sign in to reply
    Loading