27a75ea175
When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
8 lines
255 B
Ruby
8 lines
255 B
Ruby
class MergeRequestBasicEntity < IssuableSidebarEntity
|
|
expose :assignee_id
|
|
expose :merge_status
|
|
expose :merge_error
|
|
expose :state
|
|
expose :source_branch_exists?, as: :source_branch_exists
|
|
expose :rebase_in_progress?, as: :rebase_in_progress
|
|
end
|