diff options
author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-06-14 10:18:45 +0200 |
---|---|---|
committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-06-14 10:18:45 +0200 |
commit | 143a632ebe1772f2c74a892817659a464f3e887c (patch) | |
tree | d287a4c5b6c7cb4e0f1b741005e99361bc0a8322 /lib | |
parent | 36d75be393eaa8385a4ba121b11b9d8e02ad52de (diff) | |
download | gitlab-ce-143a632ebe1772f2c74a892817659a464f3e887c.tar.gz |
Tags are migrated to Gitaly
Closes https://gitlab.com/gitlab-org/gitaly/issues/390
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/git/repository.rb | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 37c0af3622e..f6b21692493 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -273,12 +273,8 @@ module Gitlab # # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/390 def tags - gitaly_migrate(:tags, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled| - if is_enabled - tags_from_gitaly - else - tags_from_rugged - end + wrapped_gitaly_errors do + gitaly_ref_client.tags end end @@ -1931,37 +1927,11 @@ module Gitlab end end - def tags_from_rugged - rugged.references.each("refs/tags/*").map do |ref| - message = nil - - if ref.target.is_a?(Rugged::Tag::Annotation) - tag_message = ref.target.message - - if tag_message.respond_to?(:chomp) - message = tag_message.chomp - end - end - - target_commit = Gitlab::Git::Commit.find(self, ref.target) - Gitlab::Git::Tag.new(self, { - name: ref.name, - target: ref.target, - target_commit: target_commit, - message: message - }) - end.sort_by(&:name) - end - def last_commit_for_path_by_rugged(sha, path) sha = last_commit_id_for_path_by_shelling_out(sha, path) commit(sha) end - def tags_from_gitaly - gitaly_ref_client.tags - end - def size_by_shelling_out popen(%w(du -sk), path).first.strip.to_i end |