diff --git a/config/routes.rb b/config/routes.rb index 87d32e3d89a9a114bc67ec911d491b4bd1bf2bf9..ef718c7618af31655f06963d04c55c718acff3e9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -180,6 +180,7 @@ get 'jwks' => 'doorkeeper/openid_connect/discovery#keys' draw :snippets + draw :profile # Product analytics collector match '/collector/i', to: ProductAnalytics::CollectorApp.new, via: :all @@ -266,7 +267,6 @@ draw :uploads draw :explore draw :admin - draw :profile draw :dashboard draw :user draw :project @@ -274,13 +274,6 @@ # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/210024 scope as: 'deprecated' do draw :snippets - end - - # Serve profile routes under /-/ scope. - # To ensure an old unscoped routing is used for the UI we need to - # add prefix 'as' to the scope routing and place it below original routing. - # Issue https://gitlab.com/gitlab-org/gitlab/-/issues/210024 - scope '-', as: :scoped do draw :profile end diff --git a/ee/spec/serializers/dashboard_operations_project_entity_spec.rb b/ee/spec/serializers/dashboard_operations_project_entity_spec.rb index 9959661ce11e92b259eea737a8cb68399b78e9d1..cd182a32a905affacaf7b286a056cc8cd6d3f73d 100644 --- a/ee/spec/serializers/dashboard_operations_project_entity_spec.rb +++ b/ee/spec/serializers/dashboard_operations_project_entity_spec.rb @@ -99,7 +99,7 @@ let(:user) { build(:user, :admin) } it 'shows the profile upgrade path' do - expect(subject[:upgrade_path]).to eq '/profile/billings' + expect(subject[:upgrade_path]).to eq '/-/profile/billings' end end diff --git a/spec/features/profiles/account_spec.rb b/spec/features/profiles/account_spec.rb index e8caa2159a45f0a4d55827db55ff49798ce9ccd1..13ec12c50ead533de14fb45ffb078c9b7fa64d90 100644 --- a/spec/features/profiles/account_spec.rb +++ b/spec/features/profiles/account_spec.rb @@ -33,7 +33,7 @@ end it 'allows the user to disconnect when there is an existing identity' do - expect(page).to have_link('Disconnect Twitter', href: '/profile/account/unlink?provider=twitter') + expect(page).to have_link('Disconnect Twitter', href: '/-/profile/account/unlink?provider=twitter') end it 'shows active for a provider that is not allowed to unlink' do