summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-16 13:44:50 +0100
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-12-16 13:44:50 +0100
commit40104746d6418b54cd80726d77c05e85cf2ddbb3 (patch)
treeaaa9bd256a8fefc7fb9dfcbe123dc869550dfb71 /app/models/merge_request.rb
parent5ffed49fef07a06f46f7e4e3511d7f6b9f378892 (diff)
parent907209821590efc34b11b60a042c6554bd11897f (diff)
downloadgitlab-ce-40104746d6418b54cd80726d77c05e85cf2ddbb3.tar.gz
Merge remote-tracking branch 'origin/feature/update-rubocop'
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index f6f77a16267..d7430d36c41 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -194,9 +194,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 Create: This merge request already exists: #{
- similar_mrs.pluck(:title)
- }"
+ "Cannot Create: This merge request already exists: #{similar_mrs.pluck(:title)}"
end
end
end