diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-18 22:00:14 +0300 |
| commit | 05f0ebba3a2c8ddf39e436f412dc2ab5bf1353b2 (patch) | |
| tree | 11d0f2a6ec31c7793c184106cedc2ded3d9a2cc5 /config/routes | |
| parent | ec73467c23693d0db63a797d10194da9e72a74af (diff) | |
Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/group.rb | 3 | ||||
| -rw-r--r-- | config/routes/import.rb | 2 | ||||
| -rw-r--r-- | config/routes/uploads.rb | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb index 819db0bb6b1..582f8bf9471 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -124,9 +124,8 @@ constraints(::Constraints::GroupUrlConstrainer.new) do resources :email_campaigns, only: :index namespace :observability do - get 'dashboards' get 'explore' - get 'manage' + get 'datasources' end namespace :harbor do diff --git a/config/routes/import.rb b/config/routes/import.rb index 004839d22a7..b319e6ca223 100644 --- a/config/routes/import.rb +++ b/config/routes/import.rb @@ -12,8 +12,6 @@ end namespace :import do resources :history, only: [:index], controller: :history - resources :available_namespaces, only: [:index], controller: :available_namespaces - namespace :url do post :validate end diff --git a/config/routes/uploads.rb b/config/routes/uploads.rb index 7b598e84975..52c67a705dc 100644 --- a/config/routes/uploads.rb +++ b/config/routes/uploads.rb @@ -4,7 +4,7 @@ scope path: :uploads do # Note attachments and User/Group/Project/Topic avatars get "-/system/:model/:mounted_as/:id/:filename", to: "uploads#show", - constraints: { model: %r{note|user|group|project|projects\/topic}, mounted_as: /avatar|attachment/, filename: %r{[^/]+} } + constraints: { model: %r{note|user|group|project|projects\/topic|achievements\/achievement}, mounted_as: /avatar|attachment/, filename: %r{[^/]+} } # show uploads for models, snippets (notes) available for now get '-/system/:model/:id/:secret/:filename', @@ -19,7 +19,7 @@ scope path: :uploads do # Appearance get "-/system/:model/:mounted_as/:id/:filename", to: "uploads#show", - constraints: { model: /appearance/, mounted_as: /logo|header_logo|favicon/, filename: /.+/ }, + constraints: { model: /appearance/, mounted_as: /logo|header_logo|pwa_icon|favicon/, filename: /.+/ }, as: 'appearance_upload' # create uploads for models, snippets (notes) available for now |