kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Improve grammar

Browse source
This commit is contained in:
Katarzyna Kobierska 2016-09-23 10:18:54 +02:00
parent 25edb0709c
commit 1b547cfba8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects/merge_requests_controller.rb
View file

@ -417,7 +417,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def validates_merge_request
# 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?
@merge_request.close
end

2
spec/views/projects/merge_requests/show.html.haml_spec.rb
View file

@ -43,7 +43,7 @@ describe 'projects/merge_requests/show.html.haml' do
end
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')
fork_project.destroy