diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-07 14:46:17 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-07 14:46:17 +0000 |
| commit | c3da8849c364885841fddf592346974ff4148c8d (patch) | |
| tree | 32ee05526f2b193dbd92db8d13e84cf909f1777d /app/helpers/application_settings_helper.rb | |
| parent | 1a0bab0ab2896f021a5d3a80e84b5e9d6678f6c0 (diff) | |
| parent | c8fe0d6a8a76ee5865c71b5b6627608e5075797d (diff) | |
| download | gitlab-ce-c3da8849c364885841fddf592346974ff4148c8d.tar.gz | |
Merge branch 'master' into fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week
Diffstat (limited to 'app/helpers/application_settings_helper.rb')
| -rw-r--r-- | app/helpers/application_settings_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index 67d16306525..e635f608237 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -232,7 +232,8 @@ module ApplicationSettingsHelper :web_ide_clientside_preview_enabled, :diff_max_patch_bytes, :commit_email_hostname, - :protected_ci_variables + :protected_ci_variables, + :local_markdown_version ] end |