summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-04-04 12:32:50 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-04-06 19:56:34 +0200
commita3a93ba4b08176b8d63ed5f6ca95dfa78e7dda0b (patch)
tree8eaa43fe3d2fb5057321cb31ce7c66018204f1a6
parent97a2de9e03f9ad947642ded3b4f4e7761fcaa9c3 (diff)
downloadgitlab-ce-a3a93ba4b08176b8d63ed5f6ca95dfa78e7dda0b.tar.gz
Expose project badges in project settings menu
-rw-r--r--app/controllers/projects/badges_controller.rb2
-rw-r--r--app/views/layouts/nav/_project_settings.html.haml7
2 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb
index b96555a153a..6e442d66adc 100644
--- a/app/controllers/projects/badges_controller.rb
+++ b/app/controllers/projects/badges_controller.rb
@@ -1,4 +1,6 @@
class Projects::BadgesController < Projects::ApplicationController
+ layout 'project_settings'
+ before_action :authorize_admin_project!, only: [:index]
before_action :no_cache_headers, except: [:index]
def index
diff --git a/app/views/layouts/nav/_project_settings.html.haml b/app/views/layouts/nav/_project_settings.html.haml
index dc3050f02e5..d429a928464 100644
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
@@ -51,8 +51,13 @@
= icon('code fw')
%span
Variables
- = nav_link path: 'triggers#index' do
+ = nav_link(controller: :triggers) do
= link_to namespace_project_triggers_path(@project.namespace, @project), title: 'Triggers' do
= icon('retweet fw')
%span
Triggers
+ = nav_link(controller: :badges) do
+ = link_to namespace_project_badges_path(@project.namespace, @project), title: 'Badges' do
+ = icon('star-half-empty fw')
+ %span
+ Badges