diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-09 18:09:07 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-09 18:09:07 +0300 |
| commit | 07f3c9525c1df3ae1da995ea4fe6dd66bb61b9fd (patch) | |
| tree | c44dcf94b5f26a02945720ffbd10364ad5bdbeb6 /app/controllers | |
| parent | 963e09aecfb3cdd57babdd9b37c15e34601fdb42 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/profiles/preferences_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb index 931070ecdd4..7059e2a0371 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -48,6 +48,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController :first_day_of_week, :preferred_language, :time_display_relative, + :time_display_format, :show_whitespace_in_diffs, :view_diffs_file_by_file, :tab_width, |