Merge branch 'ashmckenzie/master-fixes' into 'master'

Master fixes

See merge request gitlab-org/gitlab-ee!13118

config/routes/project.rb

@@ -539,21 +539,26 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       resources :audit_events, only: [:index]
       ## EE-specific
 
-      namespace :settings 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]
+      scope '-' do
+        namespace :settings do
+          get :members, to: redirect("%{namespace_id}/%{project_id}/project_members")
 
-        resource :slack, only: [:destroy, :edit, :update] do
-          get :slack_auth
-        end
+          resource :ci_cd, only: [:show, :update], controller: 'ci_cd' do
+            post :reset_cache
+            put :reset_registration_token
+          end
+
+          resource :operations, only: [:show, :update]
+          resource :integrations, only: [:show]
 
-        resource :repository, only: [:show], controller: :repository do
-          post :create_deploy_token, path: 'deploy_token/create'
-          post :cleanup
+          resource :slack, only: [:destroy, :edit, :update] do
+            get :slack_auth
+          end
+
+          resource :repository, only: [:show], controller: :repository do
+            post :create_deploy_token, path: 'deploy_token/create'
+            post :cleanup
+          end
         end
       end
 
@@ -571,10 +576,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       ## EE-specific
       resources :managed_licenses, only: [:index, :show, :new, :create, :edit, :update, :destroy]
       ## EE-specific
-
-      namespace :settings do
-        resource :operations, only: [:show, :update]
-      end
     end
 
     resources(:projects,

ee/spec/helpers/ee/version_check_helper_spec.rb

@@ -22,7 +22,7 @@ describe EE::VersionCheckHelper do
       end
 
       it 'links to an ee-tag' do
-        expect(helper.link_to_version).to include('https://gitlab.com/gitlab-org/gitlab-ee/tags/v8.0.2-ee')
+        expect(helper.link_to_version).to include('https://gitlab.com/gitlab-org/gitlab-ee/-/tags/v8.0.2-ee')
       end
     end
   end