diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:08:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:08:01 +0300 |
| commit | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (patch) | |
| tree | 55f2a32e5fd3d67597fc8c6cc2a01793ee15c87a /app/controllers/admin | |
| parent | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 54c9bde067d..2192bcc96ee 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -244,6 +244,8 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController def render_update_error action = valid_setting_panels.include?(action_name) ? action_name : :general + flash[:alert] = _('Application settings update failed') + render action end |