summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorDrew Blessing <drew.blessing@me.com>2014-04-14 20:12:07 -0500
committerDrew Blessing <drew.blessing@me.com>2014-05-13 06:41:36 -0500
commit5f25cdfe19c7c0a8c1ada592307e9017e2a754e1 (patch)
tree82e2dde5c25c8dc9b6fa56dc1f2440910b2c1412 /app/controllers/application_controller.rb
parent172ad9624599647df5682f7f2a9d2d74d947d068 (diff)
downloadgitlab-ce-5f25cdfe19c7c0a8c1ada592307e9017e2a754e1.tar.gz
Implement Merge Request Labels
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a3f39c23e08..2730e9942ec 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -117,6 +117,11 @@ class ApplicationController < ActionController::Base
return access_denied! unless can?(current_user, :push_code, project)
end
+ def authorize_labels!
+ # Labels should be accessible for issues and/or merge requests
+ authorize_read_issue! || authorize_read_merge_request!
+ end
+
def access_denied!
render "errors/access_denied", layout: "errors", status: 404
end