diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-29 11:43:27 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-29 11:43:27 +0000 |
| commit | bdf466858653c3599f4c9bc0c514fb25018f77aa (patch) | |
| tree | 279f4a68d93b984f9b3ed7484c6b4bac5bb8d6de /config | |
| parent | 958af6f5c220731a2ee274c343d818751d388762 (diff) | |
| parent | 2a0d4e7200d3e985552d887b9c9e14db073c70ab (diff) | |
| download | gitlab-ce-bdf466858653c3599f4c9bc0c514fb25018f77aa.tar.gz | |
Merge branch 'move-triggers-page' into 'master'
Move CI triggers page to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Part of #2594
See merge request !1461
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index 776b606bf7d..f7317fb5d9f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -53,8 +53,6 @@ Gitlab::Application.routes.draw do end end - resources :triggers, only: [:index, :create, :destroy] - resources :runner_projects, only: [:create, :destroy] resources :events, only: [:index] @@ -591,6 +589,7 @@ Gitlab::Application.routes.draw do resources :tags, only: [:index, :new, :create, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } resources :protected_branches, only: [:index, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex } resource :variables, only: [:show, :update] + resources :triggers, only: [:index, :create, :destroy] resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do member do |