summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-11-08 10:47:45 +0000
committerDouwe Maan <douwe@gitlab.com>2016-11-08 10:47:45 +0000
commit9c3f3e9e359740b10edafaa1b06b0ff3e2070820 (patch)
tree01846d1a63bd1177b68377822fcb23b86e176cf2 /db
parent8f85bd5789d50c080a7214981cc0a45fcb382bef (diff)
parent011e561bfa227f3ecbafe5b1ffd51700c680a15f (diff)
downloadgitlab-ce-9c3f3e9e359740b10edafaa1b06b0ff3e2070820.tar.gz
Merge branch 'use-separate-token-for-incoming-email' into 'master'
Use separate email-friendly token for incoming email See merge request !5914
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20160819232256_add_incoming_email_token_to_users.rb16
-rw-r--r--db/schema.rb2
2 files changed, 18 insertions, 0 deletions
diff --git a/db/migrate/20160819232256_add_incoming_email_token_to_users.rb b/db/migrate/20160819232256_add_incoming_email_token_to_users.rb
new file mode 100644
index 00000000000..f2cf956adc9
--- /dev/null
+++ b/db/migrate/20160819232256_add_incoming_email_token_to_users.rb
@@ -0,0 +1,16 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddIncomingEmailTokenToUsers < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+
+ # Set this constant to true if this migration requires downtime.
+ DOWNTIME = false
+
+ disable_ddl_transaction!
+
+ def change
+ add_column :users, :incoming_email_token, :string
+ add_concurrent_index :users, :incoming_email_token
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 60e7b26e29e..62c325a52d7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1183,6 +1183,7 @@ ActiveRecord::Schema.define(version: 20161106185620) do
t.boolean "ldap_email", default: false, null: false
t.boolean "external", default: false
t.string "organization"
+ t.string "incoming_email_token"
end
add_index "users", ["admin"], name: "index_users_on_admin", using: :btree
@@ -1192,6 +1193,7 @@ ActiveRecord::Schema.define(version: 20161106185620) do
add_index "users", ["current_sign_in_at"], name: "index_users_on_current_sign_in_at", using: :btree
add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
add_index "users", ["email"], name: "index_users_on_email_trigram", using: :gin, opclasses: {"email"=>"gin_trgm_ops"}
+ add_index "users", ["incoming_email_token"], name: "index_users_on_incoming_email_token", using: :btree
add_index "users", ["name"], name: "index_users_on_name", using: :btree
add_index "users", ["name"], name: "index_users_on_name_trigram", using: :gin, opclasses: {"name"=>"gin_trgm_ops"}
add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree