diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 18:07:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 18:07:26 +0300 |
| commit | 506159637da758f448818b834f8482238a9eb4eb (patch) | |
| tree | e114c46da6c1b98451a228b7559f5a6039c5df29 /app/controllers/profiles | |
| parent | 045c0f9554a99c80d0a127540da168e272a9f977 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/preferences_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb index 214640a5295..2166dd7dad7 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -48,7 +48,8 @@ class Profiles::PreferencesController < Profiles::ApplicationController :time_display_relative, :time_format_in_24h, :show_whitespace_in_diffs, - :sourcegraph_enabled + :sourcegraph_enabled, + :render_whitespace_in_code ] end end |