From f195a7436d8848cccc8888f2de047547fa9eb94f Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Wed, 13 Jun 2018 16:44:59 +0200
Subject: [PATCH] RawBlame only called through Gitaly

Closes https://gitlab.com/gitlab-org/gitaly/issues/376
---
 lib/gitlab/git/blame.rb           | 19 ++-----------------
 spec/lib/gitlab/git/blame_spec.rb | 10 +---------
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/lib/gitlab/git/blame.rb b/lib/gitlab/git/blame.rb
index 40b65f6c0da..e25e15f5c80 100644
--- a/lib/gitlab/git/blame.rb
+++ b/lib/gitlab/git/blame.rb
@@ -22,24 +22,9 @@ module Gitlab
       private
 
       def load_blame
-        raw_output = @repo.gitaly_migrate(:blame, status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
-          if is_enabled
-            load_blame_by_gitaly
-          else
-            load_blame_by_shelling_out
-          end
-        end
+        output = encode_utf8(@repo.gitaly_commit_client.raw_blame(@sha, @path))
 
-        output = encode_utf8(raw_output)
-        process_raw_blame output
-      end
-
-      def load_blame_by_gitaly
-        @repo.gitaly_commit_client.raw_blame(@sha, @path)
-      end
-
-      def load_blame_by_shelling_out
-        @repo.shell_blame(@sha, @path)
+        process_raw_blame(output)
       end
 
       def process_raw_blame(output)
diff --git a/spec/lib/gitlab/git/blame_spec.rb b/spec/lib/gitlab/git/blame_spec.rb
index 793228701cf..ba790b717ae 100644
--- a/spec/lib/gitlab/git/blame_spec.rb
+++ b/spec/lib/gitlab/git/blame_spec.rb
@@ -7,7 +7,7 @@ describe Gitlab::Git::Blame, seed_helper: true do
     Gitlab::Git::Blame.new(repository, SeedRepo::Commit::ID, "CONTRIBUTING.md")
   end
 
-  shared_examples 'blaming a file' do
+  describe 'blaming a file' do
     context "each count" do
       it do
         data = []
@@ -68,12 +68,4 @@ describe Gitlab::Git::Blame, seed_helper: true do
       end
     end
   end
-
-  context 'when Gitaly blame feature is enabled' do
-    it_behaves_like 'blaming a file'
-  end
-
-  context 'when Gitaly blame feature is disabled', :skip_gitaly_mock do
-    it_behaves_like 'blaming a file'
-  end
 end