setup the controller, still need to make the person
This commit is contained in:
parent
4ecda6ab8f
commit
ddb98502b9
3 changed files with 9 additions and 1 deletions
|
|
@ -21,6 +21,8 @@ class User
|
||||||
key :username, :unique => true
|
key :username, :unique => true
|
||||||
key :serialized_private_key, String
|
key :serialized_private_key, String
|
||||||
|
|
||||||
|
key :invitation_token, String
|
||||||
|
key :invitation_sent_at, DateTime
|
||||||
key :friend_ids, Array
|
key :friend_ids, Array
|
||||||
key :pending_request_ids, Array
|
key :pending_request_ids, Array
|
||||||
key :visible_post_ids, Array
|
key :visible_post_ids, Array
|
||||||
|
|
|
||||||
|
|
@ -44,6 +44,11 @@ Devise.setup do |config|
|
||||||
# Setup a pepper to generate the encrypted password.
|
# Setup a pepper to generate the encrypted password.
|
||||||
config.pepper = "065eb8798b181ff0ea2c5c16aee0ff8b70e04e2ee6bd6e08b49da46924223e39127d5335e466207d42bf2a045c12be5f90e92012a4f05f7fc6d9f3c875f4c95b"
|
config.pepper = "065eb8798b181ff0ea2c5c16aee0ff8b70e04e2ee6bd6e08b49da46924223e39127d5335e466207d42bf2a045c12be5f90e92012a4f05f7fc6d9f3c875f4c95b"
|
||||||
|
|
||||||
|
# ==> Configuration for :invitable
|
||||||
|
# Time interval where the invitation token is valid (default: 0).
|
||||||
|
# If invite_for is 0 or nil, the invitation will never expire.
|
||||||
|
# config.invite_for = 2.weeks
|
||||||
|
|
||||||
# ==> Configuration for :confirmable
|
# ==> Configuration for :confirmable
|
||||||
# The time you want to give your user to confirm his account. During this time
|
# The time you want to give your user to confirm his account. During this time
|
||||||
# he will be able to access your application without confirming. Default is nil.
|
# he will be able to access your application without confirming. Default is nil.
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,8 @@ Diaspora::Application.routes.draw do
|
||||||
resources :albums
|
resources :albums
|
||||||
|
|
||||||
devise_for :users, :controllers => {:registrations => "registrations",
|
devise_for :users, :controllers => {:registrations => "registrations",
|
||||||
:password => "devise/passwords"}
|
:password => "devise/passwords",
|
||||||
|
:invitation => "invitations"}
|
||||||
# added public route to user
|
# added public route to user
|
||||||
match 'public/:username', :to => 'users#public'
|
match 'public/:username', :to => 'users#public'
|
||||||
match 'users/export', :to => 'users#export'
|
match 'users/export', :to => 'users#export'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue