nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sarah Mei 2011-05-14 12:59:38 -07:00
commit fd728bbf2a
3 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
db/migrate/0000_create_schema.rb
View file

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

13
db/migrate/20110514182918_update_devise_invitable.rb Normal file
View file

@ -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

8
db/schema.rb
View file

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