summaryrefslogtreecommitdiff
path: root/app/models/merge_request.rb
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2017-08-29 15:36:35 -0300
committerFelipe Artur <felipefac@gmail.com>2017-08-31 17:15:30 -0300
commit3e4013f21760be5522ac080669b6da9fb9118999 (patch)
tree85a464a1edae7af86dc139b953fa5be13ac790a4 /app/models/merge_request.rb
parent2a8dec2c27726cd0af995de97e596eab78e6efbf (diff)
downloadgitlab-ce-3e4013f21760be5522ac080669b6da9fb9118999.tar.gz
Remove closing external issues by reference errorissue_36820
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r--app/models/merge_request.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 7f73de67625..cd8006f6f5a 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -605,6 +605,8 @@ class MergeRequest < ActiveRecord::Base
self.merge_requests_closing_issues.delete_all
closes_issues(current_user).each do |issue|
+ next if issue.is_a?(ExternalIssue)
+
self.merge_requests_closing_issues.create!(issue: issue)
end
end