diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-02 11:46:37 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-02 11:46:37 +0400 |
| commit | 31892227d7611c1818dbe94b360327e714106297 (patch) | |
| tree | cc1125ef5edf745a2399f976879370fc1fd2baad /config/initializers/devise.rb | |
| parent | 90f9c3fbc7e14801fcb787940ec77371e17fc753 (diff) | |
| parent | df9caf0b94d88e1b85e2117818b1288ae9308197 (diff) | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqv6.4.0.pre1
Diffstat (limited to 'config/initializers/devise.rb')
| -rw-r--r-- | config/initializers/devise.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index dcf829c38e8..5da8932a651 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -74,8 +74,8 @@ Devise.setup do |config| # config.pepper = "2ef62d549c4ff98a5d3e0ba211e72cff592060247e3bbbb9f499af1222f876f53d39b39b823132affb32858168c79c1d7741d26499901b63c6030a42129924ef" # ==> Configuration for :confirmable - # 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 0.days + # The time you want to give a user to confirm their account. During this time + # they will be able to access your application without confirming. Default is 0.days # When confirm_within is zero, the user won't be able to sign in without confirming. # You can use this to let your user access some features of your application # without confirming the account, but blocking it after a certain period |