diff options
| author | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-07-05 23:50:24 -0700 |
|---|---|---|
| committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2012-07-05 23:50:24 -0700 |
| commit | 2abd054b0c3c3f1116840cf51444fc63e49057f6 (patch) | |
| tree | eb372bdd01a68ff2405166230e63cf253710973f /config | |
| parent | 7f207d4a872cb55d302608a2739e94fc59ef1ff1 (diff) | |
| download | gitlab-ce-2abd054b0c3c3f1116840cf51444fc63e49057f6.tar.gz | |
update devise
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/devise.rb | 8 | ||||
| -rw-r--r-- | config/locales/devise.en.yml | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index cb1ae0ac0be..a778be5f929 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -93,10 +93,6 @@ Devise.setup do |config| # If true, extends the user's remember period when remembered via cookie. # config.extend_remember_period = false - # If true, uses the password salt as remember token. This should be turned - # to false if you are not using database authenticatable. - config.use_salt_as_remember_token = true - # Options to be passed to the created cookie. For instance, you can set # :secure => true in order to force SSL only cookies. # config.cookie_options = {} @@ -160,9 +156,9 @@ Devise.setup do |config| # Defines name of the authentication token params key config.token_authentication_key = :private_token - # If true, authentication through token does not store user in session and needs + # Authentication through token does not store user in session and needs # to be supplied on each request. Useful if you are using the token as API token. - config.stateless_token = true + config.skip_session_storage << :token_auth # ==> Scopes configuration # Turn scoped views on. Before rendering "sessions/new", it will first check for diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index b18263510f8..a78cb6b670b 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -35,13 +35,11 @@ en: confirmed: 'Your account was successfully confirmed. You are now signed in.' registrations: signed_up: 'Welcome! You have signed up successfully.' - inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.' updated: 'You updated your account successfully.' destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.' - reasons: - inactive: 'inactive' - unconfirmed: 'unconfirmed' - locked: 'locked' + signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.' + signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.' + signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.' unlocks: send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.' unlocked: 'Your account was successfully unlocked. You are now signed in.' |