summaryrefslogtreecommitdiff
path: root/app/controllers/projects/branches_controller.rb
diff options
context:
space:
mode:
authorJeff Stubler <brunsa2@gmail.com>2015-12-03 21:53:06 -0600
committerJeff Stubler <brunsa2@gmail.com>2015-12-03 21:53:06 -0600
commit932a7fd96f5977db6119205daa85495ea161dd68 (patch)
tree251f02d786fcec000bacfb3d19e063a636fc9635 /app/controllers/projects/branches_controller.rb
parent64ca9cf3e4a56a19f09160a91c5433d2ddb632cf (diff)
parente9d06903dab75129a0df63e686e18e85bfaeee8d (diff)
downloadgitlab-ce-932a7fd96f5977db6119205daa85495ea161dd68.tar.gz
Merge branch 'master' into diverging-branch-graphs
Diffstat (limited to 'app/controllers/projects/branches_controller.rb')
-rw-r--r--app/controllers/projects/branches_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index 87884420952..4db3b3bf23d 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -3,7 +3,7 @@ class Projects::BranchesController < Projects::ApplicationController
# Authorize
before_action :require_non_empty_project
before_action :authorize_download_code!
- before_action :authorize_push_code!, only: [:create, :destroy]
+ before_action :authorize_push_code!, only: [:new, :create, :destroy]
def index
@sort = params[:sort] || 'name'