summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-02-19 11:21:23 +0000
committerIan Baum <ibaum@gitlab.com>2018-02-23 15:28:11 -0600
commitaee1d09de2762735147195c1394c650ceab92746 (patch)
treea069f5c33759474958edcb87c936ee38571db353
parent003720e036aa2b34272e43809e9b8983a50fa121 (diff)
downloadgitlab-ce-aee1d09de2762735147195c1394c650ceab92746.tar.gz
Convert Gitaly commit parent IDs to array as early as possible
The tracking issue if this causes problems is https://gitlab.com/gitlab-org/gitaly/issues/1028
-rw-r--r--lib/gitlab/git/commit.rb2
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