diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 15:07:26 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 15:07:26 +0000 |
commit | 506159637da758f448818b834f8482238a9eb4eb (patch) | |
tree | e114c46da6c1b98451a228b7559f5a6039c5df29 /db | |
parent | 045c0f9554a99c80d0a127540da168e272a9f977 (diff) | |
download | gitlab-ce-506159637da758f448818b834f8482238a9eb4eb.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20191207104000_add_render_whitespace_in_code_to_user_preference.rb | 17 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/db/migrate/20191207104000_add_render_whitespace_in_code_to_user_preference.rb b/db/migrate/20191207104000_add_render_whitespace_in_code_to_user_preference.rb new file mode 100644 index 00000000000..83b44b98c67 --- /dev/null +++ b/db/migrate/20191207104000_add_render_whitespace_in_code_to_user_preference.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddRenderWhitespaceInCodeToUserPreference < ActiveRecord::Migration[5.1] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_column(:user_preferences, :render_whitespace_in_code, :boolean) + end + + def down + remove_column(:user_preferences, :render_whitespace_in_code) + end +end diff --git a/db/schema.rb b/db/schema.rb index 30e439b08c4..3cbeb00830a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -4038,6 +4038,7 @@ ActiveRecord::Schema.define(version: 2020_01_02_170221) do t.boolean "show_whitespace_in_diffs", default: true, null: false t.boolean "sourcegraph_enabled" t.boolean "setup_for_company" + t.boolean "render_whitespace_in_code" t.index ["user_id"], name: "index_user_preferences_on_user_id", unique: true end |