diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 14:45:54 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 14:45:54 +0000 |
| commit | fed202f6774838d5c5f3fe9b4b31fb03945b6868 (patch) | |
| tree | 9bada7bde77cb66a61ca837ee032472788461657 /app/controllers | |
| parent | 43e15200335bf1bcb5f61f17a93724f288c1b6cf (diff) | |
| parent | 50b1f09ab2b07c41819801b63a882d850954543d (diff) | |
| download | gitlab-ce-fed202f6774838d5c5f3fe9b4b31fb03945b6868.tar.gz | |
Merge branch 'grit_blame' into 'master'
Fast blame
Improve performance for file blame page. Also bring some small UI improvements
See merge request !1129
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/blame_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb index 3362264dcce..45e157c90cb 100644 --- a/app/controllers/projects/blame_controller.rb +++ b/app/controllers/projects/blame_controller.rb @@ -7,7 +7,7 @@ class Projects::BlameController < Projects::ApplicationController before_action :authorize_download_code! def show + @blob = @repository.blob_at(@commit.id, @path) @blame = Gitlab::Git::Blame.new(@repository, @commit.id, @path) - @blob = @blame.blob end end |