diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-18 18:15:16 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-18 18:15:16 +0300 |
commit | 9ee9d3012b3747270beb6dec6200d632d8afd0e3 (patch) | |
tree | 13dd297abb01c7b45261289c1f97a63dcd0a9fc3 /config | |
parent | 00cfeb7c25bdbd460efb83ad846cb924e73ee150 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/feature_flags/development/nuget_symbolfiles_endpoint.yml | 8 | ||||
-rw-r--r-- | config/feature_flags/development/user_approval_rules_removal.yml | 2 | ||||
-rw-r--r-- | config/routes/profile.rb | 6 | ||||
-rw-r--r-- | config/routes/user_settings.rb | 7 | ||||
-rw-r--r-- | config/routes/well_known.rb | 2 |
5 files changed, 9 insertions, 16 deletions
diff --git a/config/feature_flags/development/nuget_symbolfiles_endpoint.yml b/config/feature_flags/development/nuget_symbolfiles_endpoint.yml deleted file mode 100644 index a8512c7190a..00000000000 --- a/config/feature_flags/development/nuget_symbolfiles_endpoint.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: nuget_symbolfiles_endpoint -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/134564 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/433528 -milestone: '16.7' -type: development -group: group::package registry -default_enabled: false diff --git a/config/feature_flags/development/user_approval_rules_removal.yml b/config/feature_flags/development/user_approval_rules_removal.yml index eedec32b65a..96025a8c163 100644 --- a/config/feature_flags/development/user_approval_rules_removal.yml +++ b/config/feature_flags/development/user_approval_rules_removal.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/434141 milestone: '16.7' type: development group: group::code review -default_enabled: false +default_enabled: true diff --git a/config/routes/profile.rb b/config/routes/profile.rb index 57a5977ef0f..eed42105db1 100644 --- a/config/routes/profile.rb +++ b/config/routes/profile.rb @@ -34,12 +34,6 @@ resource :profile, only: [:show, :update] do end end - resource :password, only: [:new, :create, :edit, :update] do - member do - put :reset - end - end - resource :slack, only: [:edit] do member do get :slack_link diff --git a/config/routes/user_settings.rb b/config/routes/user_settings.rb index 2074d62abe4..e815e29d323 100644 --- a/config/routes/user_settings.rb +++ b/config/routes/user_settings.rb @@ -6,6 +6,11 @@ namespace :user_settings do get :applications, to: '/oauth/applications#index' end resources :active_sessions, only: [:index, :destroy] + resource :password, only: [:new, :create, :edit, :update] do + member do + put :reset + end + end resources :personal_access_tokens, only: [:index, :create] do member do put :revoke @@ -26,4 +31,6 @@ resource :profile, only: [] do get :active_sessions, to: redirect(path: '-/user_settings/active_sessions') get :personal_access_tokens, to: redirect(path: '-/user_settings/personal_access_tokens') end + get 'password/new', to: redirect(path: '-/user_settings/password/new') + get "password/edit", to: redirect(path: '-/user_settings/password/edit') end diff --git a/config/routes/well_known.rb b/config/routes/well_known.rb index 09bcae38cff..89880f98591 100644 --- a/config/routes/well_known.rb +++ b/config/routes/well_known.rb @@ -1,4 +1,4 @@ # frozen_string_literal: true -get '/.well-known/change-password', to: redirect('-/profile/password/edit'), status: 302 +get '/.well-known/change-password', to: redirect('-/user_settings/password/edit'), status: 302 get '/.well-known/security.txt', to: 'well_known#security_txt' |