Merge branch 'master' into 6-0-dev

Conflicts:
	VERSION
	db/schema.rb

2 files changed, 6 insertions, 0 deletions

diff --git a/db/migrate/20130326142630_add_index_to_users_authentication_token.rb b/db/migrate/20130326142630_add_index_to_users_authentication_token.rb
new file mode 100644
index 00000000000..d42ef113738
--- /dev/null
+++ b/db/migrate/20130326142630_add_index_to_users_authentication_token.rb
@@ -0,0 +1,5 @@
+class AddIndexToUsersAuthenticationToken < ActiveRecord::Migration
+  def change
+    add_index :users, :authentication_token, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 500828a97e2..ef9dcfcdcc0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -295,6 +295,7 @@ ActiveRecord::Schema.define(:version => 20130621195223) do
   end
 
   add_index "users", ["admin"], :name => "index_users_on_admin"
+  add_index "users", ["authentication_token"], :name => "index_users_on_authentication_token", :unique => true
   add_index "users", ["email"], :name => "index_users_on_email", :unique => true
   add_index "users", ["name"], :name => "index_users_on_name"
   add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true