Navigation Menu

Skip to content

Commit

Permalink
Merge pull request #420 from ZachBeta/master
Browse files Browse the repository at this point in the history
Updated for 2014 :-)
  • Loading branch information
scambra committed Jan 3, 2014
2 parents 154fc51 + 4f8ccb3 commit 96f107e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions README.rdoc
Expand Up @@ -63,7 +63,7 @@ or for a model that already exists, define a migration to add DeviseInvitable to
def change
add_column :users, :invitation_token, :string
add_column :users, :invitation_created_at, :datetime
add_column :users, :invitation_sent_at, :datetime
add_column :users, :invitation_sent_at, :datetime
add_column :users, :invitation_accepted_at, :datetime
add_column :users, :invitation_limit, :integer
add_column :users, :invited_by_id, :integer
Expand All @@ -81,7 +81,7 @@ If you previously used devise_invitable with a :limit on :invitation_token, remo
def up
change_column :users, :invitation_token, :string, :limit => nil
end

def down
change_column :users, :invitation_token, :string, :limit => 60
end
Expand Down Expand Up @@ -196,8 +196,8 @@ Here is an example of what your application controller might need to include in
:invitation_token)
end
end


== Usage

=== Send an invitation
Expand All @@ -214,7 +214,7 @@ If you want to create the invitation but not send it, you can set <tt>skip_invit
end
# => the record will be created, but the invitation email will not be sent

When skip_invitation is used, you must also then set the invitation_sent_at field when the user is sent their
When skip_invitation is used, you must also then set the invitation_sent_at field when the user is sent their
token. Failure to do so will yield "Invalid invitation token" errors when the user attempts to accept the invite.
You can set it like so:

Expand Down Expand Up @@ -374,4 +374,4 @@ Special thanks to rymai[http://github.com/rymai] for the Rails 3 support, his fo

== Copyright

Copyright (c) 2012 Sergio Cambra. See LICENSE for details.
Copyright (c) 2014 Sergio Cambra. See LICENSE for details.

0 comments on commit 96f107e

Please sign in to comment.