summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2019-03-21 11:32:37 +0000
committerJames Lopez <james@gitlab.com>2019-03-21 11:32:37 +0000
commit22fbf7345b1df67b6f169d9ca664723867be5ae7 (patch)
tree4662294a84ae2943e7de9931dd8b0e0ab80385d4 /lib
parent4d5512e916107bbbd4da6a7a1c99956d61b1c1d5 (diff)
parenta97ec84f0503b164e57e7f43b217ddfea864209f (diff)
downloadgitlab-ce-22fbf7345b1df67b6f169d9ca664723867be5ae7.tar.gz
Merge branch 'revert-1efa9604' into 'master'
Revert "Enrich commits with full data in CommitCollection" See merge request gitlab-org/gitlab-ce!26412
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/commit.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index 8fac3621df9..88ff9fbceb4 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -318,10 +318,6 @@ module Gitlab
parent_ids.size > 1
end
- def gitaly_commit?
- raw_commit.is_a?(Gitaly::GitCommit)
- end
-
def tree_entry(path)
return unless path.present?
@@ -344,7 +340,7 @@ module Gitlab
end
def to_gitaly_commit
- return raw_commit if gitaly_commit?
+ return raw_commit if raw_commit.is_a?(Gitaly::GitCommit)
message_split = raw_commit.message.split("\n", 2)
Gitaly::GitCommit.new(