Merge branch 'master' of github.com:diaspora/diaspora

db/migrate/0000_create_schema.rb

@@ -154,7 +154,10 @@ class CreateSchema < ActiveRecord::Migration
       t.string :email
 
       t.database_authenticatable
-      t.invitable
+
+      t.string   :invitation_token, :limit => 60
+      t.datetime :invitation_sent_at
+
       t.recoverable
       t.rememberable
       t.trackable

db/migrate/20110514182918_update_devise_invitable.rb

@@ -0,0 +1,13 @@
+class UpdateDeviseInvitable < ActiveRecord::Migration
+  def self.up
+    add_column(:users, :invitation_limit, :integer)
+    add_column(:users, :invited_by_id, :integer)
+    add_column(:users, :invited_by_type, :string)
+  end
+
+  def self.down
+    remove_column(:users, :invited_by_type)
+    remove_column(:users, :invited_by_id)
+    remove_column(:users, :invitation_limit)
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110513175000) do
+ActiveRecord::Schema.define(:version => 20110514182918) do
 
   create_table "aspect_memberships", :force => true do |t|
     t.integer  "aspect_id",  :null => false
@@ -359,9 +359,6 @@ ActiveRecord::Schema.define(:version => 20110513175000) do
     t.string   "encrypted_password",     :limit => 128, :default => "",    :null => false
     t.string   "invitation_token",       :limit => 60
     t.datetime "invitation_sent_at"
-    t.integer  "invitation_limit"
-    t.integer  "invited_by_id"
-    t.string   "invited_by_type"
     t.string   "reset_password_token"
     t.string   "remember_token"
     t.datetime "remember_created_at"
@@ -375,6 +372,9 @@ ActiveRecord::Schema.define(:version => 20110513175000) do
     t.string   "mongo_id"
     t.string   "invitation_service",     :limit => 127
     t.string   "invitation_identifier",  :limit => 127
+    t.integer  "invitation_limit"
+    t.integer  "invited_by_id"
+    t.string   "invited_by_type"
   end
 
   add_index "users", ["email"], :name => "index_users_on_email"