diff options
| author | Gabriel Gizotti <gabriel@gizotti.com> | 2016-12-05 21:29:17 +1000 |
|---|---|---|
| committer | Gabriel Gizotti <gabriel@gizotti.com> | 2016-12-16 19:13:17 +1000 |
| commit | 603ef5d49ed453cbb47b68d3af078529c6b834a1 (patch) | |
| tree | 14075d8b3311e9f48fdb33e4ed3ea840eafa7a68 /spec/models | |
| parent | 99dd58ec557779eadd83aa597d8c16996be60df1 (diff) | |
| download | gitlab-ce-603ef5d49ed453cbb47b68d3af078529c6b834a1.tar.gz | |
Show either description or closes issues references on MergeRequest#merge_commit_message so closes issues references are not duplicated
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
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 |