Merge branch 'zj-ref-contains-sha-mandatory' into 'master'

Ref contains oid check done by Gitaly

Closes gitaly#884

See merge request gitlab-org/gitlab-ce!18944

changelogs/unreleased/zj-ref-contains-sha-mandatory.yml

+---
+title: Refs containting sha checks are done by Gitaly
+merge_request:
+author:
+type: other

lib/gitlab/git/repository.rb

@@ -1467,25 +1467,11 @@ module Gitlab
       end
 
       def branch_names_contains_sha(sha)
-        gitaly_migrate(:branch_names_contains_sha,
-                      status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
-          if is_enabled
         gitaly_ref_client.branch_names_contains_sha(sha)
-          else
-            refs_contains_sha('refs/heads/', sha)
-          end
-        end
       end
 
       def tag_names_contains_sha(sha)
-        gitaly_migrate(:tag_names_contains_sha,
-                       status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
-          if is_enabled
         gitaly_ref_client.tag_names_contains_sha(sha)
-          else
-            refs_contains_sha('refs/tags/', sha)
-          end
-        end
       end
 
       def search_files_by_content(query, ref)
@@ -1620,27 +1606,6 @@ module Gitlab
         end
       end
 
-      def refs_contains_sha(refs_prefix, sha)
-        refs_prefix << "/" unless refs_prefix.ends_with?('/')
-
-        # By forcing the output to %(refname) each line wiht a ref will start with
-        # the ref prefix. All other lines can be discarded.
-        args = %W(for-each-ref --contains=#{sha} --format=%(refname) #{refs_prefix})
-        names, code = run_git(args)
-
-        return [] unless code.zero?
-
-        refs = []
-        left_slice_count = refs_prefix.length
-        names.lines.each do |line|
-          next unless line.start_with?(refs_prefix)
-
-          refs << encode_utf8(line.rstrip[left_slice_count..-1])
-        end
-
-        refs
-      end
-
       def rugged_write_config(full_path:)
         rugged.config['gitlab.fullpath'] = full_path
       end

spec/lib/gitlab/git/repository_spec.rb

@@ -615,7 +615,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
   end
 
   describe '#branch_names_contains_sha' do
-    shared_examples 'returning the right branches' do
     let(:head_id) { repository.rugged.head.target.oid }
     let(:new_branch) { head_id }
     let(:utf8_branch) { 'branch-é' }
@@ -635,15 +634,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
   end
 
-    context 'when Gitaly is enabled' do
-      it_behaves_like 'returning the right branches'
-    end
-
-    context 'when Gitaly is disabled', :disable_gitaly do
-      it_behaves_like 'returning the right branches'
-    end
-  end
-
   describe "#refs_hash" do
     subject { repository.refs_hash }