Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-23 15:25:55 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-23 15:25:55 +0400
commit695fd3cf2c7e01d06e9c335cae208089a4c6bfbd (patch)
treeda03740535eb2c9d05262f5c760bba4b1346e06a /app/controllers/projects/protected_branches_controller.rb
parent8ae2d2152b197931725a3f4b9aa3697f37988c20 (diff)
Move protected branches to Project settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/projects/protected_branches_controller.rb')
-rw-r--r--app/controllers/projects/protected_branches_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index cfc1bd99a20..e39e97af8dd 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -1,9 +1,9 @@
class Projects::ProtectedBranchesController < Projects::ApplicationController
# Authorize
- before_filter :authorize_read_project!
before_filter :require_non_empty_project
+ before_filter :authorize_admin_project!
- before_filter :authorize_admin_project!, only: [:destroy, :create]
+ layout "project_settings"
def index
@branches = @project.protected_branches.to_a