diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-01 15:22:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-01 15:22:20 +0000 |
| commit | 06f736847bb6a7f577a8f121f94e4cc7ddb51856 (patch) | |
| tree | 900541f271b709007f2df1accc15a4956825281f /app/controllers | |
| parent | 7c9f5b5d627c9eb1a9791613a531122db9a1f81d (diff) | |
| download | gitlab-ce-06f736847bb6a7f577a8f121f94e4cc7ddb51856.tar.gz | |
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, 0 insertions, 1 deletions
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb index b7e8432c039..64971e01a31 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -48,7 +48,6 @@ class Profiles::PreferencesController < Profiles::ApplicationController :first_day_of_week, :preferred_language, :time_display_relative, - :time_format_in_24h, :show_whitespace_in_diffs, :view_diffs_file_by_file, :tab_width, |