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

Improve grammar

This commit is contained in:
Katarzyna Kobierska 2016-09-13 12:16:40 +02:00
parent bef1292cbd
commit 34586c1894
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/helpers/merge_requests_helper.rb
View File

@ -98,7 +98,7 @@ module MergeRequestsHelper
end
def merge_request_button_visibility(merge_request, closed)
return 'hidden' if merge_request.can_reopen?
return 'hidden' if merge_request.closed? == closed || (merge_request.merged? == closed && !merge_request.closed?) || merge_request.closed_without_fork?
end
def merge_request_version_path(project, merge_request, merge_request_diff, start_sha = nil)

2
spec/models/merge_request_spec.rb
View File

@ -1101,7 +1101,7 @@ describe MergeRequest, models: true do
expect(merge_request.reload.can_reopen?).to be_falsey
end
it 'returnes false if the merge request is merged' do
it 'returns false if the merge request is merged' do
merge_request.update_attributes(state: 'merged')
expect(merge_request.reload.can_reopen?).to be_falsey