summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-12 14:26:46 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-12 14:26:46 +0300
commit474023b71a4aaf2a9072a94cf9f5018d7d9bc2ba (patch)
treefb2d96abce589281f90988b133d9a379490e95f9 /db
parent1a1e42ad3115f132947a0399a2c44c734f09b010 (diff)
downloadgitlab-ce-474023b71a4aaf2a9072a94cf9f5018d7d9bc2ba.tar.gz
Fix Gemfile.lock
Diffstat (limited to 'db')
-rw-r--r--db/schema.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb
index 6606e13d3d1..c89d22d241c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -492,12 +492,12 @@ ActiveRecord::Schema.define(version: 20150509180749) do
t.string "bitbucket_access_token"
t.string "bitbucket_access_token_secret"
t.string "location"
+ t.string "public_email", default: "", null: false
t.string "encrypted_otp_secret"
t.string "encrypted_otp_secret_iv"
t.string "encrypted_otp_secret_salt"
t.boolean "otp_required_for_login"
t.text "otp_backup_codes"
- t.string "public_email", default: "", null: false
end
add_index "users", ["admin"], name: "index_users_on_admin", using: :btree