diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-01 09:15:40 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-01 09:15:40 +0000 |
| commit | 2fc500819f83edf976879789113673389c55a461 (patch) | |
| tree | bf4729e2d6eaea95013c459fe77456161423b20d /app/models/merge_request.rb | |
| parent | 5dd157be16c04850279373123d9dba4377a9f852 (diff) | |
| parent | 3e4013f21760be5522ac080669b6da9fb9118999 (diff) | |
| download | gitlab-ce-2fc500819f83edf976879789113673389c55a461.tar.gz | |
Merge branch 'issue_36820' into 'master'
Remove closing external issues by reference error
Closes #36820
See merge request !13910
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ca3a1806ee8..7a817eedec2 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 |