diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-12-14 10:35:40 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-12-14 10:35:40 +0000 |
commit | c81023435795766411c5954a4676ebb215af40a6 (patch) | |
tree | 4b71817f8c5d6986c28b70353459a544fe444519 /config | |
parent | e81ae1e68c03de4442265e4699710421e2f2755c (diff) | |
parent | baa38f0dc1a0e1af84cd06a35450d772eee2d1c4 (diff) | |
download | gitlab-ce-c81023435795766411c5954a4676ebb215af40a6.tar.gz |
Merge branch 'ci-project-migrate' into 'master'
Ci Project migrate
- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.
In 8.4 or 8.5 we can remove redundant tables and columns.
See merge request !1987
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 55 |
1 files changed, 21 insertions, 34 deletions
diff --git a/config/routes.rb b/config/routes.rb index a104e686ac6..50836d63fa5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,43 +24,10 @@ Rails.application.routes.draw do resource :lint, only: [:show, :create] resources :projects do - collection do - post :add - get :disabled - end - member do get :status, to: 'projects#badge' get :integration - post :toggle_shared_runners - end - - resources :runner_projects, only: [:create, :destroy] - end - - resource :user_sessions do - get :auth - get :callback - end - - namespace :admin do - resources :runners, only: [:index, :show, :update, :destroy] do - member do - put :assign_all - get :resume - get :pause - end - end - - resources :events, only: [:index] - - resources :projects do - resources :runner_projects end - - resources :builds, only: :index - - resource :application_settings, only: [:show, :update] end root to: 'projects#index' @@ -271,6 +238,8 @@ Rails.application.routes.draw do member do put :transfer end + + resources :runner_projects end end @@ -280,6 +249,19 @@ Rails.application.routes.draw do resources :labels + resources :runners, only: [:index, :show, :update, :destroy] do + member do + get :resume + get :pause + end + end + + resources :builds, only: :index do + collection do + post :cancel_all + end + end + root to: 'dashboard#index' end @@ -595,7 +577,6 @@ Rails.application.routes.draw do 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] - resource :ci_settings, only: [:edit, :update, :destroy] resources :builds, only: [:index, :show] do collection do @@ -674,7 +655,13 @@ Rails.application.routes.draw do get :resume get :pause end + + collection do + post :toggle_shared_runners + end end + + resources :runner_projects, only: [:create, :destroy] end end end |