diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-11-06 06:10:33 +0000 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-11-06 06:10:33 +0000 |
| commit | 159ff7f17b81d9cf67cf5106bb77576d53bb8473 (patch) | |
| tree | 2b470e6e01d8f785a69648d500a199dd3b60f046 | |
| parent | ccf6f88abe0a529aeaaa6bb456d07806869bed68 (diff) | |
| download | gitlab-ce-cherry-pick-f90fc922.tar.gz | |
Revert schema and migration changescherry-pick-f90fc922
| -rw-r--r-- | db/migrate/20181022131445_add_index_to_namespace_trial_ends_on.rb | 17 | ||||
| -rw-r--r-- | db/schema.rb | 3 |
2 files changed, 1 insertions, 19 deletions
diff --git a/db/migrate/20181022131445_add_index_to_namespace_trial_ends_on.rb b/db/migrate/20181022131445_add_index_to_namespace_trial_ends_on.rb deleted file mode 100644 index 4dd8b1362a3..00000000000 --- a/db/migrate/20181022131445_add_index_to_namespace_trial_ends_on.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class AddIndexToNamespaceTrialEndsOn < ActiveRecord::Migration - include Gitlab::Database::MigrationHelpers - - DOWNTIME = false - - disable_ddl_transaction! - - def up - add_concurrent_index :namespaces, :trial_ends_on, where: "trial_ends_on IS NOT NULL" - end - - def down - remove_concurrent_index(:namespaces, :trial_ends_on) if index_exists?(:namespaces, :trial_ends_on) - end -end diff --git a/db/schema.rb b/db/schema.rb index a9d50e55a11..32d10e87e87 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: 20181022131445) do +ActiveRecord::Schema.define(version: 20181101144347) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -1373,7 +1373,6 @@ ActiveRecord::Schema.define(version: 20181022131445) do add_index "namespaces", ["path"], name: "index_namespaces_on_path_trigram", using: :gin, opclasses: {"path"=>"gin_trgm_ops"} add_index "namespaces", ["require_two_factor_authentication"], name: "index_namespaces_on_require_two_factor_authentication", using: :btree add_index "namespaces", ["runners_token"], name: "index_namespaces_on_runners_token", unique: true, using: :btree - add_index "namespaces", ["trial_ends_on"], name: "index_namespaces_on_trial_ends_on", where: "(trial_ends_on IS NOT NULL)", using: :btree add_index "namespaces", ["type"], name: "index_namespaces_on_type", using: :btree create_table "note_diff_files", force: :cascade do |t| |