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
path: root/config
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-07-20 16:59:43 +0300
committerRémy Coutable <remy@rymai.me>2016-07-20 16:59:43 +0300
commit6623d36b65a87f8db9d35a83f832ee2e0564f8b1 (patch)
tree65b290a14f3530df312114292ff8f48a964a0aba /config
parentf3d03af4215763d6c51c4b26702200ba679baded (diff)
parent545cecb28c02a2350b6ecb7a8c0080f9663734d3 (diff)
Merge branch '15343-build-settiings' into 'master'
Resolve "Move Build badges settings to Builds page (or Builds settings)" ## What does this MR do? Removes pipeline settings section from project settings & creates a new pipelines settings page Adds builds badge to pipelines settings page & removes badge page ## Are there points in the code the reviewer needs to double check? All Rails updates -> particularly `builds_controller.rb` and `routes` Spacing needs to be updated across all settings pages and will be in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/issues/19827) ## What are the relevant issue numbers? Closes #15343 Part of #18920 ## Screenshots (if relevant) ![Screen_Shot_2016-07-19_at_5.47.29_AM](/uploads/48e6d203de4cbe0b697280128695d980/Screen_Shot_2016-07-19_at_5.47.29_AM.png) ![Screen_Shot_2016-07-14_at_9.25.13_AM](/uploads/59118440f3e7bb903f44260abb119376/Screen_Shot_2016-07-14_at_9.25.13_AM.png) See merge request !5244
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 2a9fe30b0e6..21f3585bacd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -732,6 +732,10 @@ Rails.application.routes.draw do
resources :triggers, only: [:index, :create, :destroy]
resources :pipelines, only: [:index, :new, :create, :show] do
+ collection do
+ resource :pipelines_settings, path: 'settings', only: [:show, :update]
+ end
+
member do
post :cancel
post :retry