summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-07-13 20:09:50 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-07-19 05:30:12 -0700
commit8bd7f6da6f50bd75a66e33ebe09536fd7f10bea6 (patch)
tree9b562ab27a017b962c6a9c063618b7ab49956e23 /config
parent4db94cb9d779b0a0a3d5681846a68e0fd2d66b21 (diff)
downloadgitlab-ce-8bd7f6da6f50bd75a66e33ebe09536fd7f10bea6.tar.gz
Remove builds settings from project settings; add builds settings route; add new controller action; put badge stuff under builds settings controller action
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 3160fd767b8..d09c021dac7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -89,7 +89,7 @@ Rails.application.routes.draw do
mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\/(info\/lfs|gitlab-lfs)/.match(request.path_info) }, via: [:get, :post, :put]
# Help
-
+
get 'help' => 'help#index'
get 'help/*path' => 'help#show', as: :help_page
get 'help/shortcuts'
@@ -744,6 +744,7 @@ Rails.application.routes.draw do
resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do
collection do
post :cancel_all
+ get :settings
end
member do