diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-06-13 16:44:59 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-06-13 16:44:59 +0200 |
| commit | f195a7436d8848cccc8888f2de047547fa9eb94f (patch) | |
| tree | 9f5b853bf8abbf73e71a38776488c0166b19bd04 /lib | |
| parent | 0e2577229d8e12fdb02a156fcc6672ebc6bb3f5d (diff) | |
| download | gitlab-ce-f195a7436d8848cccc8888f2de047547fa9eb94f.tar.gz | |
RawBlame only called through Gitaly
Closes https://gitlab.com/gitlab-org/gitaly/issues/376
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/blame.rb | 19 |
1 files changed, 2 insertions, 17 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(raw_output) - process_raw_blame output - end - - def load_blame_by_gitaly - @repo.gitaly_commit_client.raw_blame(@sha, @path) - end + output = encode_utf8(@repo.gitaly_commit_client.raw_blame(@sha, @path)) - def load_blame_by_shelling_out - @repo.shell_blame(@sha, @path) + process_raw_blame(output) end def process_raw_blame(output) |