Rebase action not shown in Merge Request widget
Rebase action not shown in Merge Request widget.
It looks like this changed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16071/diffs#266d61fc63d03920ecbfd8f5f53fa326c00e0235_28_28 where it was backported from EE to CE and moved below other states. When it was in EE, it came before all the other states in CE.
Steps to reproduce
- Change the project settings -> Merge request settings -> Merge method to
Fast-forward merge - Create a base branch with some file
- Create another branch with some other change
- Edit the file on the base branch
- Notice how you get
mr-widget-conflictsinstead ofmr-widget-rebase
| Actual | Expected |
|---|---|
 |
 |
cc @jprovaznik