diff options
Diffstat (limited to 'config/routes')
-rw-r--r-- | config/routes/admin.rb | 3 | ||||
-rw-r--r-- | config/routes/directs.rb | 5 | ||||
-rw-r--r-- | config/routes/directs/milestone.rb | 11 | ||||
-rw-r--r-- | config/routes/import.rb | 1 | ||||
-rw-r--r-- | config/routes/issues.rb | 6 | ||||
-rw-r--r-- | config/routes/profile.rb | 10 | ||||
-rw-r--r-- | config/routes/project.rb | 10 |
7 files changed, 38 insertions, 8 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 2f4e286f5eb..9181c1c94cf 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -155,6 +155,7 @@ namespace :admin do member do get :preview_sign_in delete :logo + delete :pwa_icon delete :header_logos delete :favicon end @@ -165,7 +166,7 @@ namespace :admin do resources :labels - resources :runners, only: [:index, :show, :edit, :update, :destroy] do + resources :runners, only: [:index, :new, :show, :edit, :update, :destroy] do member do post :resume post :pause diff --git a/config/routes/directs.rb b/config/routes/directs.rb new file mode 100644 index 00000000000..f28750b5c2e --- /dev/null +++ b/config/routes/directs.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +# Custom URL definitions for the Community Edition. + +draw 'directs/milestone' diff --git a/config/routes/directs/milestone.rb b/config/routes/directs/milestone.rb new file mode 100644 index 00000000000..5a8086cca25 --- /dev/null +++ b/config/routes/directs/milestone.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +# @!method milestone_path(milestone, options = {}) +# @!method milestone_url(milestone, options = {}) +direct(:milestone) do |milestone, *args| + if milestone.group_milestone? + [milestone.group, milestone, *args] + elsif milestone.project_milestone? + [milestone.project, milestone, *args] + end +end diff --git a/config/routes/import.rb b/config/routes/import.rb index b319e6ca223..2513cd04cfb 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -22,6 +22,7 @@ namespace :import do get :callback get :realtime_changes post :cancel + post :cancel_all end resource :gitea, only: [:create, :new], controller: :gitea do diff --git a/config/routes/issues.rb b/config/routes/issues.rb index cc4399693ed..25e59022272 100644 --- a/config/routes/issues.rb +++ b/config/routes/issues.rb @@ -21,6 +21,12 @@ resources :issues, concerns: :awardable, constraints: { id: /\d+/ } do post :bulk_update post :import_csv post :export_csv + + scope :incident do + get '/:id', + to: 'incidents#show', + as: :incident + end end resources :issue_links, only: [:index, :create, :destroy], as: 'links', path: 'links' diff --git a/config/routes/profile.rb b/config/routes/profile.rb index 91f6eb678e4..bee1a0f108e 100644 --- a/config/routes/profile.rb +++ b/config/routes/profile.rb @@ -38,7 +38,15 @@ resource :profile, only: [:show, :update] do end end resource :preferences, only: [:show, :update] - resources :keys, only: [:index, :show, :create, :destroy] + + resources :saved_replies, only: [:index], action: :index + + resources :keys, only: [:index, :show, :create, :destroy] do + member do + delete :revoke + end + end + resources :gpg_keys, only: [:index, :create, :destroy] do member do put :revoke diff --git a/config/routes/project.rb b/config/routes/project.rb index 798829484da..cf19111b2e2 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -92,8 +92,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - get :learn_gitlab, action: :index, controller: 'learn_gitlab' - namespace :ci do resource :lint, only: [:show, :create] resource :pipeline_editor, only: [:show], controller: :pipeline_editor, path: 'editor' @@ -375,8 +373,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - get 'issues/incident/:id' => 'incidents#show', as: :issues_incident - namespace :error_tracking do resources :projects, only: :index end @@ -477,6 +473,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :experiments, only: [:index, :show], controller: 'experiments' resources :candidates, only: [:show], controller: 'candidates', param: :iid end + + namespace :airflow do + resources :dags, only: [:index, :show], controller: 'dags' + end end # End of the /-/ scope. @@ -592,8 +592,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end scope :service_ping, controller: :service_ping do - post :web_ide_clientside_preview # rubocop:todo Cop/PutProjectRoutesUnderScope - post :web_ide_clientside_preview_success # rubocop:todo Cop/PutProjectRoutesUnderScope post :web_ide_pipelines_count # rubocop:todo Cop/PutProjectRoutesUnderScope end |