diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 12:06:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-16 12:06:25 +0300 |
commit | d8211a0ed119eada7d292e974a8fc7b0cd982d3c (patch) | |
tree | a14bfca83dd6b71144959d7e7a6d058f5d8922a5 /app/controllers/profiles | |
parent | edd042071d1b5e6f494881dc2d9c39b46e42f74b (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 046ae5d9a51..42d4d785174 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -46,7 +46,8 @@ class Profiles::PreferencesController < Profiles::ApplicationController :first_day_of_week, :preferred_language, :time_display_relative, - :time_format_in_24h + :time_format_in_24h, + :show_whitespace_in_diffs ] end end |