Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Gizotti <gabriel@gizotti.com>2016-12-05 14:29:17 +0300
committerGabriel Gizotti <gabriel@gizotti.com>2016-12-16 12:13:17 +0300
commit603ef5d49ed453cbb47b68d3af078529c6b834a1 (patch)
tree14075d8b3311e9f48fdb33e4ed3ea840eafa7a68 /spec/models/merge_request_spec.rb
parent99dd58ec557779eadd83aa597d8c16996be60df1 (diff)
Show either description or closes issues references on MergeRequest#merge_commit_message so closes issues references are not duplicated
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index f74c89bba4d..1e9790cf644 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -425,7 +425,7 @@ describe MergeRequest, models: true do
and_return(subject.target_branch)
expect(subject.merge_commit_message)
- .to match("Closed Issues: #{issue.to_reference}")
+ .to match("Closes issue #{issue.to_reference}")
end
it 'includes its reference in the body' do