diff options
author | Akos Gyimesi <akos@gyim.hu> | 2018-01-18 00:12:08 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2018-12-06 17:20:08 +0000 |
commit | 4a31c6778decb3ea251b0943f1c8ebda0ad98800 (patch) | |
tree | 1eeca043a758c92bde542025db556d5d1b130e46 /app/models/merge_request.rb | |
parent | 5fd5dad492a2918c10633996bb29d656a4e9137a (diff) | |
download | gitlab-ce-4a31c6778decb3ea251b0943f1c8ebda0ad98800.tar.gz |
Link to conflicting MR in reopening error message
Also, the error message became shorter.
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b50cfa639e0..975dea08cee 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -547,7 +547,7 @@ class MergeRequest < ActiveRecord::Base similar_mrs = similar_mrs.where('id not in (?)', self.id) if self.id if similar_mrs.any? errors.add :validate_branches, - "Cannot open this Merge Request because another open Merge Request already exists for this source branch: #{similar_mrs.first.title}" + "Another open Merge Request already exists for this source branch: !#{similar_mrs.first.id}" end end end |