Commit 1b547cfb authored by Katarzyna Kobierska's avatar Katarzyna Kobierska

Improve grammar

parent 25edb070
...@@ -417,7 +417,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController ...@@ -417,7 +417,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def validates_merge_request def validates_merge_request
# If source project was removed and merge request for some reason # If source project was removed and merge request for some reason
# wasn't close (Ex. mr from fork to origin) merge request will be closed # wasn't closed (Ex. MR from fork to origin) merge request will be closed
if !@merge_request.source_project && @merge_request.open? if !@merge_request.source_project && @merge_request.open?
@merge_request.close @merge_request.close
end end
......
...@@ -43,7 +43,7 @@ describe 'projects/merge_requests/show.html.haml' do ...@@ -43,7 +43,7 @@ describe 'projects/merge_requests/show.html.haml' do
end end
context 'when the merge request is open' do context 'when the merge request is open' do
it 'closes open merge request' 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')
fork_project.destroy fork_project.destroy
......
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