diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-22 12:07:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-22 12:07:34 +0300 |
| commit | 672f729cf283c4495ccf5071007e25b33c30daff (patch) | |
| tree | 587af1b51e3f94762d59038b65377fa8c9955bcd /db | |
| parent | f9a4c3a3b853533336efabf7631c7981c8ac7673 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/post_migrate/20230518121320_remove_time_format_in_24h_column.rb | 15 | ||||
| -rw-r--r-- | db/schema_migrations/20230518121320 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/db/post_migrate/20230518121320_remove_time_format_in_24h_column.rb b/db/post_migrate/20230518121320_remove_time_format_in_24h_column.rb new file mode 100644 index 00000000000..60abf4b6d8b --- /dev/null +++ b/db/post_migrate/20230518121320_remove_time_format_in_24h_column.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class RemoveTimeFormatIn24hColumn < Gitlab::Database::Migration[2.1] + enable_lock_retries! + + def up + remove_column :user_preferences, :time_format_in_24h + end + + def down + # rubocop:disable Migration/SchemaAdditionMethodsNoPost + add_column :user_preferences, :time_format_in_24h, :boolean + # rubocop:enable Migration/SchemaAdditionMethodsNoPost + end +end diff --git a/db/schema_migrations/20230518121320 b/db/schema_migrations/20230518121320 new file mode 100644 index 00000000000..333985c9b5e --- /dev/null +++ b/db/schema_migrations/20230518121320 @@ -0,0 +1 @@ +34f1874ef8bab4bee142d12e78c84697e8889e6fc6d5b4dfbcdc6e7ed16861b5
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index d1132f0066f..18ca4d27da1 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -23548,7 +23548,6 @@ CREATE TABLE user_preferences ( first_day_of_week integer, timezone character varying, time_display_relative boolean, - time_format_in_24h boolean, projects_sort character varying(64), show_whitespace_in_diffs boolean DEFAULT true NOT NULL, sourcegraph_enabled boolean, |