diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-29 15:42:59 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-29 15:42:59 +0000 |
| commit | e79f91df8c2a38238ebe5c76862d2f35307bb7f5 (patch) | |
| tree | 14f6370b8a79f4cf6de1652f763da9fbd49f6faf /app/helpers | |
| parent | 58c50d40524e0b0c23d4c5d7782583e3742047ba (diff) | |
| parent | 1c5106fadfe59ec4af7235b94d424e4367185c2e (diff) | |
| download | gitlab-ce-e79f91df8c2a38238ebe5c76862d2f35307bb7f5.tar.gz | |
Merge branch '46758-fallout-of-cacheable-attribute' into 'master'
Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache
Closes #46758
See merge request gitlab-org/gitlab-ce!19144
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index b948e431882..adc423af9e1 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -204,7 +204,7 @@ module ApplicationSettingsHelper :pages_domain_verification_enabled, :password_authentication_enabled_for_web, :password_authentication_enabled_for_git, - :performance_bar_allowed_group_id, + :performance_bar_allowed_group_path, :performance_bar_enabled, :plantuml_enabled, :plantuml_url, |