diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-04-20 21:51:44 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2018-04-20 21:51:44 +0900 |
commit | 0a6b7caac8e23974385c9e4a900dd7eea07c44fd (patch) | |
tree | 6679b0f192947bd9f2a13a13e412567b7b59f9e3 /db | |
parent | 1e817e0018af2c3fbb622ec74f02ae255e7be95f (diff) | |
parent | ef55bbd25400349aa9ec35e269f408f94ce5f890 (diff) | |
download | gitlab-ce-0a6b7caac8e23974385c9e4a900dd7eea07c44fd.tar.gz |
Merge branch 'master' into live-trace-v2
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20180330121048_add_issue_due_to_notification_settings.rb | 9 | ||||
-rw-r--r-- | db/migrate/20180418053107_add_index_to_ci_job_artifacts_file_store.rb | 15 | ||||
-rw-r--r-- | db/schema.rb | 4 |
3 files changed, 27 insertions, 1 deletions
diff --git a/db/migrate/20180330121048_add_issue_due_to_notification_settings.rb b/db/migrate/20180330121048_add_issue_due_to_notification_settings.rb new file mode 100644 index 00000000000..c64a481fcf0 --- /dev/null +++ b/db/migrate/20180330121048_add_issue_due_to_notification_settings.rb @@ -0,0 +1,9 @@ +class AddIssueDueToNotificationSettings < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + add_column :notification_settings, :issue_due, :boolean + end +end diff --git a/db/migrate/20180418053107_add_index_to_ci_job_artifacts_file_store.rb b/db/migrate/20180418053107_add_index_to_ci_job_artifacts_file_store.rb new file mode 100644 index 00000000000..1084ca14a34 --- /dev/null +++ b/db/migrate/20180418053107_add_index_to_ci_job_artifacts_file_store.rb @@ -0,0 +1,15 @@ +class AddIndexToCiJobArtifactsFileStore < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + disable_ddl_transaction! + + def up + add_concurrent_index :ci_job_artifacts, :file_store + end + + def down + remove_index :ci_job_artifacts, :file_store if index_exists?(:ci_job_artifacts, :file_store) + end +end diff --git a/db/schema.rb b/db/schema.rb index 16753af746c..842d40073ac 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180406204716) do +ActiveRecord::Schema.define(version: 20180418053107) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -367,6 +367,7 @@ ActiveRecord::Schema.define(version: 20180406204716) do end add_index "ci_job_artifacts", ["expire_at", "job_id"], name: "index_ci_job_artifacts_on_expire_at_and_job_id", using: :btree + add_index "ci_job_artifacts", ["file_store"], name: "index_ci_job_artifacts_on_file_store", using: :btree add_index "ci_job_artifacts", ["job_id", "file_type"], name: "index_ci_job_artifacts_on_job_id_and_file_type", unique: true, using: :btree add_index "ci_job_artifacts", ["project_id"], name: "index_ci_job_artifacts_on_project_id", using: :btree @@ -1334,6 +1335,7 @@ ActiveRecord::Schema.define(version: 20180406204716) do t.boolean "failed_pipeline" t.boolean "success_pipeline" t.boolean "push_to_merge_request" + t.boolean "issue_due" end add_index "notification_settings", ["source_id", "source_type"], name: "index_notification_settings_on_source_id_and_source_type", using: :btree |