Stop vendoring Gitlab::Git::{Ref,Branch,Tag}

5 files changed, 7 insertions, 15 deletions

diff --git a/_support/vendor-gitlab-git b/_support/vendor-gitlab-git
index 7d0a5e78f..6492226b6 100755
--- a/_support/vendor-gitlab-git
+++ b/_support/vendor-gitlab-git
@@ -12,6 +12,7 @@ FILE_LIST = %w[
 EXCLUDE = %w[
   lib/gitlab/git/blame.rb
   lib/gitlab/git/blob.rb
+  lib/gitlab/git/branch.rb
   lib/gitlab/git/blob_snippet.rb
   lib/gitlab/git/commit.rb
   lib/gitlab/git/commit_stats.rb
@@ -25,9 +26,11 @@ EXCLUDE = %w[
   lib/gitlab/git/lfs_changes.rb
   lib/gitlab/git/lfs_pointer_file.rb
   lib/gitlab/git/merge_base.rb
+  lib/gitlab/git/ref.rb
   lib/gitlab/git/rev_list.rb
   lib/gitlab/git/storage/
   lib/gitlab/git/storage.rb
+  lib/gitlab/git/tag.rb
   lib/gitlab/git/tree.rb
   lib/gitlab/git/wiki.rb
   lib/gitlab/git/wiki_file.rb
diff --git a/ruby/lib/gitlab/git.rb b/ruby/lib/gitlab/git.rb
index bc72f5ca4..d60554deb 100644
--- a/ruby/lib/gitlab/git.rb
+++ b/ruby/lib/gitlab/git.rb
@@ -31,7 +31,6 @@ require_relative File.join(vendor_gitlab_git, 'lib/gitlab/encoding_helper.rb')
 require_relative File.join(vendor_gitlab_git, 'lib/gitlab/utils/strong_memoize.rb')
 require_relative File.join(vendor_gitlab_git, 'lib/gitlab/git.rb')
 require_relative File.join(vendor_gitlab_git, 'lib/gitlab/git/popen.rb')
-require_relative File.join(vendor_gitlab_git, 'lib/gitlab/git/ref.rb')
 require_relative File.join(vendor_gitlab_git, 'lib/gitlab/git/repository_mirroring.rb')
 
 # Require all .rb files we can find in the vendored gitlab/git directory
diff --git a/ruby/vendor/gitlab_git/lib/gitlab/git/branch.rb b/ruby/lib/gitlab/git/branch.rb
index 6351cfb83..ab11401c8 100644
--- a/ruby/vendor/gitlab_git/lib/gitlab/git/branch.rb
+++ b/ruby/lib/gitlab/git/branch.rb
@@ -1,8 +1,8 @@
+require_relative 'ref'
+
 module Gitlab
   module Git
     class Branch < Ref
-      STALE_BRANCH_THRESHOLD = 3.months
-
       def self.find(repo, branch_name)
         if branch_name.is_a?(Gitlab::Git::Branch)
           branch_name
@@ -14,18 +14,6 @@ module Gitlab
       def initialize(repository, name, target, target_commit)
         super(repository, name, target, target_commit)
       end
-
-      def active?
-        self.dereferenced_target.committed_date >= STALE_BRANCH_THRESHOLD.ago
-      end
-
-      def stale?
-        !active?
-      end
-
-      def state
-        active? ? :active : :stale
-      end
     end
   end
 end
diff --git a/ruby/vendor/gitlab_git/lib/gitlab/git/ref.rb b/ruby/lib/gitlab/git/ref.rb
index fa71a4e7e..fa71a4e7e 100644
--- a/ruby/vendor/gitlab_git/lib/gitlab/git/ref.rb
+++ b/ruby/lib/gitlab/git/ref.rb
diff --git a/ruby/vendor/gitlab_git/lib/gitlab/git/tag.rb b/ruby/lib/gitlab/git/tag.rb
index bbf2ecdb1..706b12b5f 100644
--- a/ruby/vendor/gitlab_git/lib/gitlab/git/tag.rb
+++ b/ruby/lib/gitlab/git/tag.rb
@@ -1,3 +1,5 @@
+require_relative 'ref'
+
 module Gitlab
   module Git
     class Tag < Ref