diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-19 11:50:28 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-19 11:50:28 +0000 |
| commit | 0b032daa11d5ea140f2eea99fa10b21da4b50f0b (patch) | |
| tree | da6e9d5df199683a6fc394a01bd929b4d008c0ff /lib | |
| parent | 4ff5b76689de5498b1aa5379b9551d6d35330354 (diff) | |
| parent | 23dd313d76f2254a7a5c58283cb76236a160647b (diff) | |
| download | gitlab-ce-0b032daa11d5ea140f2eea99fa10b21da4b50f0b.tar.gz | |
Merge branch '32564-fix-double-system-closing-notes' into 'master'
Resolve "Double closing system notes when closing issue with Merge Request"
Closes #32546 and #32564
See merge request gitlab-org/gitlab-ce!17035
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb index d95561fe1b2..ae27a138b7c 100644 --- a/lib/gitlab/git/commit.rb +++ b/lib/gitlab/git/commit.rb @@ -508,7 +508,7 @@ module Gitlab @committed_date = Time.at(commit.committer.date.seconds).utc @committer_name = commit.committer.name.dup @committer_email = commit.committer.email.dup - @parent_ids = commit.parent_ids + @parent_ids = Array(commit.parent_ids) end def serialize_keys |