diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 12:11:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 12:11:03 +0000 |
| commit | 027f19b39c73b3b98e7cf305fead871626e8b717 (patch) | |
| tree | d97ff241c76a5655f8f58444ccf76695b1b89bcf /db | |
| parent | a7b422860c90eecd1b98845d234a8347686fbdcf (diff) | |
| download | gitlab-ce-027f19b39c73b3b98e7cf305fead871626e8b717.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
| -rw-r--r-- | db/post_migrate/20220916054103_remove_experience_level_column.rb | 13 | ||||
| -rw-r--r-- | db/schema_migrations/20220916054103 | 1 | ||||
| -rw-r--r-- | db/structure.sql | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/db/post_migrate/20220916054103_remove_experience_level_column.rb b/db/post_migrate/20220916054103_remove_experience_level_column.rb new file mode 100644 index 00000000000..dff5a9a6580 --- /dev/null +++ b/db/post_migrate/20220916054103_remove_experience_level_column.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class RemoveExperienceLevelColumn < Gitlab::Database::Migration[2.0] + enable_lock_retries! + + def up + remove_column :user_preferences, :experience_level + end + + def down + add_column :user_preferences, :experience_level, :integer, limit: 2 + end +end diff --git a/db/schema_migrations/20220916054103 b/db/schema_migrations/20220916054103 new file mode 100644 index 00000000000..ab7f027f7ce --- /dev/null +++ b/db/schema_migrations/20220916054103 @@ -0,0 +1 @@ +d410d105f8af6948dba3efc37469048435237c1e21faa10e66836c85acf33728
\ No newline at end of file diff --git a/db/structure.sql b/db/structure.sql index b3125fd31c3..1a466f713b4 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -22144,7 +22144,6 @@ CREATE TABLE user_preferences ( setup_for_company boolean, render_whitespace_in_code boolean, tab_width smallint, - experience_level smallint, view_diffs_file_by_file boolean DEFAULT false NOT NULL, gitpod_enabled boolean DEFAULT false NOT NULL, markdown_surround_selection boolean DEFAULT true NOT NULL, |