From 5ff65e174279d5aa5ed306e7e5ed1720f7d4cfc7 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 12 Nov 2019 16:06:44 +0200 Subject: [PATCH 1/3] Move some project routes under - scope Signed-off-by: Dmitriy Zaporozhets --- config/routes/project.rb | 52 +++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/config/routes/project.rb b/config/routes/project.rb index dacc433784d945..1e732f541f1f42 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -191,6 +191,31 @@ get 'proxy/:datasource_id/*proxy_path', to: 'grafana_api#proxy' get :metrics_dashboard, to: 'grafana_api#metrics_dashboard' end + + resource :mattermost, only: [:new, :create] + resource :variables, only: [:show, :update] + resources :triggers, only: [:index, :create, :edit, :update, :destroy] + + resource :mirror, only: [:show, :update] do + member do + get :ssh_host_keys, constraints: { format: :json } + post :update_now + end + end + + resource :cycle_analytics, only: [:show] + + namespace :cycle_analytics do + scope :events, controller: 'events' do + get :issue + get :plan + get :code + get :test + get :review + get :staging + get :production + end + end end # End of the /-/ scope. @@ -235,8 +260,6 @@ end end - resource :mattermost, only: [:new, :create] - namespace :prometheus do resources :metrics, constraints: { id: %r{[^\/]+} }, only: [:index, :new, :create, :edit, :update, :destroy] do get :active_common, on: :collection @@ -364,17 +387,6 @@ put '/service_desk' => 'service_desk#update', as: :service_desk_refresh end - resource :variables, only: [:show, :update] - - resources :triggers, only: [:index, :create, :edit, :update, :destroy] - - resource :mirror, only: [:show, :update] do - member do - get :ssh_host_keys, constraints: { format: :json } - post :update_now - end - end - Gitlab.ee do resources :push_rules, constraints: { id: /\d+/ }, only: [:update] end @@ -463,20 +475,6 @@ end end - resource :cycle_analytics, only: [:show] - - namespace :cycle_analytics do - scope :events, controller: 'events' do - get :issue - get :plan - get :code - get :test - get :review - get :staging - get :production - end - end - namespace :serverless do scope :functions do get '/:environment_id/:id', to: 'functions#show' -- GitLab From b5a7c9253299b1845f647fd6eee9c5ee8780163a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 13 Nov 2019 13:33:14 +0200 Subject: [PATCH 2/3] Add compatibility with old routes Signed-off-by: Dmitriy Zaporozhets --- config/routes/project.rb | 3 ++- spec/javascripts/ci_variable_list/ajax_variable_list_spec.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config/routes/project.rb b/config/routes/project.rb index 1e732f541f1f42..3f913683b0085c 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -676,7 +676,8 @@ :network, :graphs, :autocomplete_sources, :project_members, :deploy_keys, :deploy_tokens, :labels, :milestones, :services, :boards, :releases, - :forks, :group_links, :import, :avatar) + :forks, :group_links, :import, :avatar, :mirror, + :cycle_analytics, :mattermost, :variables, :triggers) end end end diff --git a/spec/javascripts/ci_variable_list/ajax_variable_list_spec.js b/spec/javascripts/ci_variable_list/ajax_variable_list_spec.js index b2fe315f6c62de..b53e30b68966be 100644 --- a/spec/javascripts/ci_variable_list/ajax_variable_list_spec.js +++ b/spec/javascripts/ci_variable_list/ajax_variable_list_spec.js @@ -3,7 +3,7 @@ import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; import AjaxFormVariableList from '~/ci_variable_list/ajax_variable_list'; -const VARIABLE_PATCH_ENDPOINT = 'http://test.host/frontend-fixtures/builds-project/variables'; +const VARIABLE_PATCH_ENDPOINT = 'http://test.host/frontend-fixtures/builds-project/-/variables'; const HIDE_CLASS = 'hide'; describe('AjaxFormVariableList', () => { -- GitLab From 3d3b5b0cc15ae324029e823e7de4d8b2a04b87a4 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 13 Nov 2019 13:37:53 +0200 Subject: [PATCH 3/3] Add changelog entry Signed-off-by: Dmitriy Zaporozhets --- changelogs/unreleased/dz-move-project-routes.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/dz-move-project-routes.yml diff --git a/changelogs/unreleased/dz-move-project-routes.yml b/changelogs/unreleased/dz-move-project-routes.yml new file mode 100644 index 00000000000000..713f6d90f3207f --- /dev/null +++ b/changelogs/unreleased/dz-move-project-routes.yml @@ -0,0 +1,5 @@ +--- +title: Move some project routes under - scope +merge_request: 19954 +author: +type: deprecated -- GitLab