diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2017-12-20 12:01:21 +0300 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-01-05 11:34:59 +0300 |
| commit | 27a75ea1757d1c1b67bf501ec333221ed5e92d04 (patch) | |
| tree | 4ef9caa88a19ed27cc58d60e42769a2fe5cf1e8d /spec/views | |
| parent | 1560c234d2410ccbd163b9aedecf2d8b7a596627 (diff) | |
Backport 'Rebase' feature from EE to CE
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
Diffstat (limited to 'spec/views')
| -rw-r--r-- | spec/views/projects/merge_requests/show.html.haml_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb index 28d54c2fb77..264e0ce0b40 100644 --- a/spec/views/projects/merge_requests/show.html.haml_spec.rb +++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb @@ -54,6 +54,8 @@ describe 'projects/merge_requests/show.html.haml' do it 'closes the merge request if the source project does not exist' do closed_merge_request.update_attributes(state: 'open') forked_project.destroy + # Reload merge request so MergeRequest#source_project turns to `nil` + closed_merge_request.reload render |