summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-10-04 10:08:38 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-10-04 10:08:38 +0000
commit8ec0eda9cca95b7a8fd352e9cf38982ab177cfce (patch)
treeb950dadd39c36f902867a08805cbbeefed8b4387 /config
parentf3b3ee78df2331aff6e2428476f1f5af36334cb4 (diff)
parent5a60a54679ecc25c910385947811bcbd0d1b792f (diff)
downloadgitlab-ce-8ec0eda9cca95b7a8fd352e9cf38982ab177cfce.tar.gz
Merge branch '41922-simplify-runner-registration-token-resetting' into 'master'
Simplify runner registration token resetting Closes #41922 See merge request gitlab-org/gitlab-ce!21658
Diffstat (limited to 'config')
-rw-r--r--config/routes/admin.rb2
-rw-r--r--config/routes/group.rb4
-rw-r--r--config/routes/project.rb1
3 files changed, 5 insertions, 2 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 7489b01ded6..7cdaa2daa14 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -107,7 +107,7 @@ namespace :admin do
resource :application_settings, only: [:show, :update] do
resources :services, only: [:index, :edit, :update]
get :usage_data
- put :reset_runners_token
+ put :reset_registration_token
put :reset_health_check_token
put :clear_repository_check_states
get :integrations, :repository, :templates, :ci_cd, :reporting, :metrics_and_profiling, :network, :geo, :preferences
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 893ec8a4e58..602bbe837cf 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -27,7 +27,9 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
as: :group,
constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do
namespace :settings do
- resource :ci_cd, only: [:show], controller: 'ci_cd'
+ resource :ci_cd, only: [:show], controller: 'ci_cd' do
+ put :reset_registration_token
+ end
end
resource :variables, only: [:show, :update]
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 8a5310b5c23..ef1bc4bbf42 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -437,6 +437,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
get :members, to: redirect("%{namespace_id}/%{project_id}/project_members")
resource :ci_cd, only: [:show, :update], controller: 'ci_cd' do
post :reset_cache
+ put :reset_registration_token
end
resource :integrations, only: [:show]
resource :repository, only: [:show], controller: :repository do