diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-12-06 18:53:24 -0600 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-12-06 18:53:24 -0600 |
| commit | 950b9130adcb4d2fa45bd1757c1b3dc50f1df9a4 (patch) | |
| tree | a39525f22b03ba9587bcd3efc7d846e0b4406db6 /db | |
| parent | 9a78524f465488b2b5daa3fbdb2ec7c71c9641a6 (diff) | |
| download | gitlab-ce-950b9130adcb4d2fa45bd1757c1b3dc50f1df9a4.tar.gz | |
Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"
This reverts commit 1e8f1de034aa9b6a60b640b2b091f60c4d3ba365, reversing
changes made to 62d971129da99936a3cdc04f3740d26f16a0c7a6.
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20181129104854_add_token_encrypted_to_ci_builds.rb | 11 | ||||
| -rw-r--r-- | db/migrate/20181129104944_add_index_to_ci_builds_token_encrypted.rb | 17 | ||||
| -rw-r--r-- | db/schema.rb | 2 |
3 files changed, 0 insertions, 30 deletions
diff --git a/db/migrate/20181129104854_add_token_encrypted_to_ci_builds.rb b/db/migrate/20181129104854_add_token_encrypted_to_ci_builds.rb deleted file mode 100644 index 11b98203793..00000000000 --- a/db/migrate/20181129104854_add_token_encrypted_to_ci_builds.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -class AddTokenEncryptedToCiBuilds < ActiveRecord::Migration[5.0] - include Gitlab::Database::MigrationHelpers - - DOWNTIME = false - - def change - add_column :ci_builds, :token_encrypted, :string - end -end diff --git a/db/migrate/20181129104944_add_index_to_ci_builds_token_encrypted.rb b/db/migrate/20181129104944_add_index_to_ci_builds_token_encrypted.rb deleted file mode 100644 index f90aca008e5..00000000000 --- a/db/migrate/20181129104944_add_index_to_ci_builds_token_encrypted.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -class AddIndexToCiBuildsTokenEncrypted < ActiveRecord::Migration[5.0] - include Gitlab::Database::MigrationHelpers - - DOWNTIME = false - - disable_ddl_transaction! - - def up - add_concurrent_index :ci_builds, :token_encrypted, unique: true, where: 'token_encrypted IS NOT NULL' - end - - def down - remove_concurrent_index :ci_builds, :token_encrypted - end -end diff --git a/db/schema.rb b/db/schema.rb index d7124100621..fc73d30fb1f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -345,7 +345,6 @@ ActiveRecord::Schema.define(version: 20181203002526) do t.boolean "protected" t.integer "failure_reason" t.datetime_with_timezone "scheduled_at" - t.string "token_encrypted" t.index ["artifacts_expire_at"], name: "index_ci_builds_on_artifacts_expire_at", where: "(artifacts_file <> ''::text)", using: :btree t.index ["auto_canceled_by_id"], name: "index_ci_builds_on_auto_canceled_by_id", using: :btree t.index ["commit_id", "stage_idx", "created_at"], name: "index_ci_builds_on_commit_id_and_stage_idx_and_created_at", using: :btree @@ -362,7 +361,6 @@ ActiveRecord::Schema.define(version: 20181203002526) do t.index ["stage_id"], name: "index_ci_builds_on_stage_id", using: :btree t.index ["status", "type", "runner_id"], name: "index_ci_builds_on_status_and_type_and_runner_id", using: :btree t.index ["token"], name: "index_ci_builds_on_token", unique: true, using: :btree - t.index ["token_encrypted"], name: "index_ci_builds_on_token_encrypted", unique: true, where: "(token_encrypted IS NOT NULL)", using: :btree t.index ["updated_at"], name: "index_ci_builds_on_updated_at", using: :btree t.index ["user_id"], name: "index_ci_builds_on_user_id", using: :btree end |