diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /config/routes/project.rb | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'config/routes/project.rb')
-rw-r--r-- | config/routes/project.rb | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 2e61bc8175e..21dfe173715 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -37,6 +37,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end + namespace :security do + resource :configuration, only: [:show], controller: :configuration + end + resources :artifacts, only: [:index, :destroy] resources :packages, only: [:index, :show, :destroy], module: :packages @@ -83,10 +87,15 @@ 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' resources :daily_build_group_report_results, only: [:index], constraints: { format: /(csv|json)/ } + namespace :prometheus_metrics do + resources :histograms, only: [:create], constraints: { format: 'json' } + end end namespace :settings do @@ -132,7 +141,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do end end - resources :project_members, except: [:show, :new, :edit], constraints: { id: %r{[a-zA-Z./0-9_\-#%+]+} }, concerns: :access_requestable do + resources :project_members, except: [:show, :new, :edit], constraints: { id: %r{[a-zA-Z./0-9_\-#%+:]+} }, concerns: :access_requestable do collection do delete :leave @@ -219,7 +228,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :starrers, only: [:index] resources :forks, only: [:index, :new, :create] - resources :group_links, only: [:create, :update, :destroy], constraints: { id: /\d+/ } + resources :group_links, only: [:create, :update, :destroy], constraints: { id: /\d+|:id/ } resource :import, only: [:new, :create, :show] resource :avatar, only: [:show, :destroy] |