diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-01 18:12:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-01 18:12:53 +0300 |
| commit | 63fc59f6fdf8c61e7e342f89aecaf565b645960d (patch) | |
| tree | 340075f94a18cd02899e6f77f1651f63adccd353 /app/models/user_preference.rb | |
| parent | 6c7d90ede4d2890b2ca740239cd9a5338f12ba34 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/user_preference.rb')
| -rw-r--r-- | app/models/user_preference.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 337ae7125f3..7687430cfd1 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -23,7 +23,6 @@ class UserPreference < ApplicationRecord ignore_columns :experience_level, remove_with: '14.10', remove_after: '2021-03-22' default_value_for :tab_width, value: Gitlab::TabWidth::DEFAULT, allows_nil: false - default_value_for :timezone, value: Time.zone.tzinfo.name, allows_nil: false default_value_for :time_display_relative, value: true, allows_nil: false default_value_for :time_format_in_24h, value: false, allows_nil: false default_value_for :render_whitespace_in_code, value: false, allows_nil: false |