summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMicaël Bergeron <mbergeron@gitlab.com>2018-02-12 09:02:15 -0500
committerMicaël Bergeron <mbergeron@gitlab.com>2018-02-16 13:51:19 -0500
commitf9492554617d807b35358cb799d26e3422dd4c71 (patch)
tree50b1a13167df1b61e2424fd5852b8ef45d4e139c /lib
parent1883c5964085ab18a12633ae5db663298f176ccb (diff)
downloadgitlab-ce-f9492554617d807b35358cb799d26e3422dd4c71.tar.gz
fix specs
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/commit.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index d95561fe1b2..28a8a79e36e 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -471,6 +471,14 @@ module Gitlab
private
+ def parent_ids=(shas)
+ @parent_ids = case shas
+ when String then JSON.parse(shas)
+ else
+ shas
+ end
+ end
+
def init_from_hash(hash)
raw_commit = hash.symbolize_keys