summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authortiagonbotelho <tiagonbotelho@hotmail.com>2016-10-18 19:03:31 +0100
committertiagonbotelho <tiagonbotelho@hotmail.com>2016-11-07 15:56:18 +0000
commit011e561bfa227f3ecbafe5b1ffd51700c680a15f (patch)
tree58af709e0f38dbfd7d389e2c3ad5516507ca2946 /db
parent9d51421346178c9189ffb47189f51d573ab42822 (diff)
downloadgitlab-ce-011e561bfa227f3ecbafe5b1ffd51700c680a15f.tar.gz
implements reset incoming email token on issues modal and account page,use-separate-token-for-incoming-email
reactivates all tests and writes more tests for it
Diffstat (limited to 'db')
-rw-r--r--db/schema.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb
index fd82fb326a6..a82a26c6623 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: 20160819232256) do
+ActiveRecord::Schema.define(version: 20161103171205) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -1176,7 +1176,7 @@ ActiveRecord::Schema.define(version: 20160819232256) do
t.boolean "ldap_email", default: false, null: false
t.boolean "external", default: false
t.string "organization"
- t.string "incoming_email_token"
+ t.string "incoming_email_token"
end
add_index "users", ["admin"], name: "index_users_on_admin", using: :btree