Skip to content

G
gitlab-ce
Commit aa583731 authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files
Options

Resolve conflicts in merge_requests/show.html.haml_spec.rb

parent 4a5df964
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
spec/views/projects/merge_requests/show.html.haml_spec.rb
View file @ aa583731
...@@ -54,11 +54,8 @@ describe 'projects/merge_requests/show.html.haml' do ...@@ -54,11 +54,8 @@ describe 'projects/merge_requests/show.html.haml' do
it 'closes the merge request if the source project does not exist' do it 'closes the merge request if the source project does not exist' do
closed_merge_request.update_attributes(state: 'open') closed_merge_request.update_attributes(state: 'open')
forked_project.destroy forked_project.destroy
<<<<<<< HEAD
# Reload merge request so MergeRequest#source_project turns to `nil` # Reload merge request so MergeRequest#source_project turns to `nil`
closed_merge_request.reload closed_merge_request.reload
=======
>>>>>>> ce-com/master
render render
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7