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

Merge branch 'master' into simplify_controllers2

Browse source 
Conflicts:
	app/controllers/commits_controller.rb
	app/controllers/refs_controller.rb
This commit is contained in:
Cyril 2012-09-27 12:25:52 +02:00
commit e563e948bb
108 changed files with 1762 additions and 652 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/protected_branches_controller.rb
View file

@ -4,7 +4,6 @@ class ProtectedBranchesController < ProjectController
before_filter :require_non_empty_project
before_filter :authorize_admin_project!, only: [:destroy, :create]
before_filter :render_full_content
def index
@branches = @project.protected_branches.all