diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 12:08:59 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 12:08:59 +0000 |
| commit | 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (patch) | |
| tree | 651b5fca7ea0460e3ce7c687cfa9e3a3b37eefc8 /app/controllers | |
| parent | b4ded0ba7b4d2cdbed5b1f331cf2083a25ee4d7c (diff) | |
| download | gitlab-ce-7351a484d79236b7e9d47c86f2fcc970b7ae10b0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index f4e79ae6060..00771aff26c 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -37,10 +37,6 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController define_method(action) { perform_update if submitted? } end - def show - render :general - end - def update perform_update end @@ -73,7 +69,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController RepositoryCheck::ClearWorker.perform_async redirect_to( - admin_application_settings_path, + general_admin_application_settings_path, notice: _('Started asynchronous removal of all repository check states.') ) end @@ -256,7 +252,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController session[:ask_for_usage_stats_consent] = current_user.requires_usage_stats_consent? end - redirect_path = referer_path(request) || admin_application_settings_path + redirect_path = referer_path(request) || general_admin_application_settings_path respond_to do |format| if successful |