diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-13 17:18:02 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-13 17:18:02 +0300 |
commit | 4ab717ea6a65beca3e069ca8590c22c49085dc8c (patch) | |
tree | 80f163711240e5f6b7288be276c05f2df80a39ca /db/schema.rb | |
parent | ecb58dacd614de66c00c8df673abb96fafa5d452 (diff) | |
parent | f39b150a02836f620fe77e1731064b5e6e01b5b1 (diff) |
Merge branch 'ldap_migration'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
db/schema.rb
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/db/schema.rb b/db/schema.rb index 2974d3754f3..48f1b2ac2cc 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -460,6 +460,7 @@ ActiveRecord::Schema.define(version: 20150411180045) do t.integer "notification_level", default: 1, null: false t.datetime "password_expires_at" t.integer "created_by_id" + t.datetime "last_credential_check_at" t.string "avatar" t.string "confirmation_token" t.datetime "confirmed_at" @@ -467,7 +468,6 @@ ActiveRecord::Schema.define(version: 20150411180045) do t.string "unconfirmed_email" t.boolean "hide_no_ssh_key", default: false t.string "website_url", default: "", null: false - t.datetime "last_credential_check_at" t.string "github_access_token" t.string "gitlab_access_token" t.string "notification_email" |