diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-28 16:47:18 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-28 16:47:18 +0200 |
| commit | b65641959165e8d7daf47f921b058a647189a060 (patch) | |
| tree | f6d14d73b63006ca4b917adda6694d4285743fe3 /config | |
| parent | d8e631c1e5de535864f36e985e9bfbc4a8482916 (diff) | |
| parent | c876bfa0f28ddae7fbca314505f5b150b9cec194 (diff) | |
| download | gitlab-ce-b65641959165e8d7daf47f921b058a647189a060.tar.gz | |
Merge branch 'move-runners-page'
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/config/routes.rb b/config/routes.rb index 0792cb559e5..201add02335 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -55,13 +55,6 @@ Gitlab::Application.routes.draw do resources :triggers, only: [:index, :create, :destroy] - resources :runners, only: [:index, :edit, :update, :destroy, :show] do - member do - get :resume - get :pause - end - end - resources :runner_projects, only: [:create, :destroy] resources :events, only: [:index] @@ -653,8 +646,14 @@ Gitlab::Application.routes.draw do get ":secret/:filename", action: :show, as: :show, constraints: { filename: /[^\/]+/ } end end - end + resources :runners, only: [:index, :edit, :update, :destroy, :show] do + member do + get :resume + get :pause + end + end + end end end |