Merge branch 'remove_admin_settings_geo_navigation' into 'master'

Remove Admin -> Settings -> Geo navigation

Closes #36896

See merge request gitlab-org/gitlab!21005

app/views/layouts/nav/sidebar/_admin.html.haml

@@ -271,11 +271,6 @@
               = link_to network_admin_application_settings_path, title: _('Network'), data: { qa_selector: 'admin_settings_network_item' } do
                 %span
                   = _('Network')
-            - if template_exists?('admin/geo/settings/show')
-              = nav_link do
-                = link_to geo_admin_application_settings_path, title: _('Geo') do
-                  %span
-                    = _('Geo')
             = nav_link(path: 'application_settings#preferences') do
               = link_to preferences_admin_application_settings_path, title: _('Preferences'), data: { qa_selector: 'admin_settings_preferences_link' } do
                 %span

changelogs/unreleased/remove_admin_settings_geo_navigation.yml

+---
+title: Remove Admin -> Settings -> Geo navigation
+merge_request: 21005
+author: Lee Tickett
+type: other

ee/app/controllers/ee/admin/application_settings_controller.rb

@@ -65,11 +65,6 @@ module EE
         attrs
       end
 
-      def geo_redirection
-        redirect_to admin_geo_settings_url, notice: 'You were automatically redirected to <strong>Admin Area > Geo > Settings</strong><br /> '\
-                                                    'From GitLab 13.0 on, this will be the only place for Geo settings and <strong>Admin Area > Settings > Geo</strong> will be removed.'.html_safe
-      end
-
       def seat_link_payload
         data = ::Gitlab::SeatLinkData.new
 

ee/config/routes/admin.rb

@@ -30,7 +30,7 @@ namespace :admin do
   resource :application_settings, only: [] do
     get :seat_link_payload
     match :templates, via: [:get, :patch]
-    get :geo, to: "application_settings#geo_redirection"
+    get :geo, to: "geo/settings#show"
   end
 
   namespace :geo do

ee/spec/controllers/admin/application_settings_controller_spec.rb

@@ -224,22 +224,6 @@ describe Admin::ApplicationSettingsController do
         end
       end
     end
-
-    describe 'GET #geo_redirection' do
-      subject { get :geo_redirection }
-
-      it 'redirects the user to the admin_geo_settings_url' do
-        subject
-
-        expect(response).to redirect_to(admin_geo_settings_url)
-      end
-
-      it 'fires a notice about the redirection' do
-        subject
-
-        expect(response).to set_flash[:notice]
-      end
-    end
   end
 
   describe 'GET #seat_link_payload' do

ee/spec/routing/admin_routing_spec.rb

@@ -72,7 +72,7 @@ describe 'EE-specific admin routing' do
 
   describe Admin::ApplicationSettingsController, 'routing' do
     it 'redirects #geo to #geo_redirection' do
-      expect(get('/admin/application_settings/geo')).to route_to('admin/application_settings#geo_redirection')
+      expect(get('/admin/application_settings/geo')).to route_to('admin/geo/settings#show')
     end
 
     it 'routes to #templates' do