Merge branch 'ldap_migration'

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb

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"