diff options
| author | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-05 09:51:50 +0200 |
|---|---|---|
| committer | Martin Wortschack <mwortschack@gitlab.com> | 2018-09-05 09:51:50 +0200 |
| commit | cc05ab032a8722fae6896db7c1c234468a6ac909 (patch) | |
| tree | 76ab3542828a59225baea137fe1a8b78df718aaa | |
| parent | 3bb720ef65e9678b96decd6815838054189f6f68 (diff) | |
| download | gitlab-ce-cc05ab032a8722fae6896db7c1c234468a6ac909.tar.gz | |
adds 'Geo' sub page to application settings
| -rw-r--r-- | app/views/admin/application_settings/geo.html.haml | 6 | ||||
| -rw-r--r-- | app/views/layouts/nav/sidebar/_admin.html.haml | 5 | ||||
| -rw-r--r-- | config/routes/admin.rb | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/geo.html.haml b/app/views/admin/application_settings/geo.html.haml new file mode 100644 index 00000000000..d06d249bda5 --- /dev/null +++ b/app/views/admin/application_settings/geo.html.haml @@ -0,0 +1,6 @@ +- breadcrumb_title "Settings" +- page_title "Settings" +- @content_class = "limit-container-width" unless fluid_layout +- expanded = Rails.env.test? + += render_if_exists 'admin/application_settings/geo', expanded: expanded diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml index 396c904c1be..cceea58b98e 100644 --- a/app/views/layouts/nav/sidebar/_admin.html.haml +++ b/app/views/layouts/nav/sidebar/_admin.html.haml @@ -245,6 +245,11 @@ %span = _('Network') %li.divider.fly-out-top-item + = nav_link(path: 'application_settings#geo') do + = link_to geo_admin_application_settings_path, title: _('Geo') do + %span + = _('Geo') + %li.divider.fly-out-top-item = nav_link(path: 'application_settings#preferences') do = link_to preferences_admin_application_settings_path, title: _('Preferences') do %span diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 4aa56837587..7489b01ded6 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -110,7 +110,7 @@ namespace :admin do put :reset_runners_token put :reset_health_check_token put :clear_repository_check_states - get :integrations, :repository, :templates, :ci_cd, :reporting, :metrics_and_profiling, :network, :preferences + get :integrations, :repository, :templates, :ci_cd, :reporting, :metrics_and_profiling, :network, :geo, :preferences end resources :labels |