diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-12-20 13:32:31 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-12-20 13:32:31 +0300 |
commit | 0d224376cfaf61d6c9050367c0098ba87dfe8c58 (patch) | |
tree | eac7276123b1fa45e3d11ed3aede881b0366b18e /app/controllers | |
parent | f7b7e918fef6567d26e7fe17894e5df14c58f37c (diff) | |
parent | deb74f73d9432c90649142cf8333c5cd5d0984ea (diff) |
Merge remote-tracking branch 'origin/master' into zj-mattermost-slash-config
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/blame_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb index f576d0be1fc..863a766a255 100644 --- a/app/controllers/projects/blame_controller.rb +++ b/app/controllers/projects/blame_controller.rb @@ -8,6 +8,9 @@ class Projects::BlameController < Projects::ApplicationController def show @blob = @repository.blob_at(@commit.id, @path) + + return render_404 unless @blob + @blame_groups = Gitlab::Blame.new(@blob, @commit).groups end end |