deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'fix-404-json-file' of https://github.com/hiroponz/gitlabhq into hiroponz-fix-404-json-file

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-24 11:26:57 +02:00
commit b6641d6932
5 changed files with 6 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/blame_controller.rb
View file

@ -7,8 +7,6 @@ class BlameController < ProjectResourceController
before_filter :authorize_code_access!
before_filter :require_non_empty_project
before_filter :assign_ref_vars
def show
@repo = @project.repo
@blame = Grit::Blob.blame(@repo, @commit.id, @path)

2
app/controllers/blob_controller.rb
View file

@ -7,8 +7,6 @@ class BlobController < ProjectResourceController
before_filter :authorize_code_access!
before_filter :require_non_empty_project
before_filter :assign_ref_vars
def show
if @tree.is_blob?
send_data(

1
app/controllers/tree_controller.rb
View file

@ -7,7 +7,6 @@ class TreeController < ProjectResourceController
before_filter :authorize_code_access!
before_filter :require_non_empty_project
before_filter :assign_ref_vars
before_filter :edit_requirements, only: [:edit, :update]
def show