2518 Commits

Author SHA1 Message Date
Lucas Mazza
755219ccfc Release v3.2.4 v3.2.4 2014-03-17 11:16:38 -03:00
Lucas Mazza
9044631f4c Merge pull request #2933 from weimeng/update-changel
Update CHANGELOG.md with missing 2.1.x minor versions
2014-03-17 10:59:33 -03:00
Wei-Meng Lee
a05d001c41 Update CHANGELOG.md with missing 2.1.x minor versions
Changelog for missing entries taken from https://github.com/plataformatec/devise/blob/v2.1.4/CHANGELOG.rdoc
2014-03-17 15:18:44 +08:00
Lucas Mazza
a8e1d42097 Bump mocha. 2014-03-12 14:40:11 -03:00
Lucas Mazza
0df786c849 Add README docs and a CHANGELOG entry for #2916 2014-03-09 20:54:41 -03:00
Lucas Mazza
ccfe389be1 Merge pull request #2916 from kayline/master
Add ability to generate only specified view directories
2014-03-09 20:49:27 -03:00
Molly Trombley-McCann and Shatarupa Nandi
a79e0f6bca Rename variable to views, change flag to -v 2014-03-06 13:41:11 -08:00
Molly Trombley-McCann
3640abc933 add description to view generator flag 2014-03-04 15:08:46 -08:00
Molly Trombley-McCann
09ebe833b3 Add a flag to views generator allowing user to specify which view directories to generate 2014-03-04 15:05:16 -08:00
Molly Trombley-McCann
4a0bc7692a Add a flag to views generator allowing user to specify which view directories to generate 2014-03-04 14:47:19 -08:00
Greg Cobb and Molly Trombley-McCann
0d06ed6c79 WIP 2014-03-03 09:30:00 -08:00
José Valim
71eb6176c3 Merge pull request #2913 from petervandenabeele/master
Note that the cost of bcrypt grows dramatically with number of stretches
2014-03-02 20:30:08 +01:00
Peter Vandenabeele
7e6dd5022b Clarify that this stretch behavior is for bcrypt
* other encryptors show a different behavior regarding the
  number of stretches
2014-03-02 20:23:57 +01:00
Peter Vandenabeele
286eefa9b4 Note that the cost of bcrypt grows dramatically with number of stretches
* this will avoid people (like me) loosing an hour trying to understand
  why doing it "a little bit safer" with 20 stretches suddenly takes
  60 seconds to do sign_up or sign_in. An example of such discussion is:
  http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-talk/399627
2014-03-02 18:57:32 +01:00
José Valim
5e00be4af8 Merge pull request #2912 from petervandenabeele/master
Fix typo in initializer template comment
2014-03-02 16:17:14 +01:00
Peter Vandenabeele
a89af190e2 Fix typo in initializer template comment 2014-03-02 15:22:59 +01:00
Lucas Mazza
aea82d0b03 Update remaning 1.8 hash syntax. 2014-02-25 14:25:55 -03:00
José Valim
3d9dea39b2 Merge pull request #2899 from justanshulsharma/master
Updated ruby 1.9 hash syntax
2014-02-25 18:03:16 +01:00
Anshul Sharma
dc1b399a8b Updated ruby 1.9 hash syntax 2014-02-25 22:12:55 +05:30
José Valim
a5ad61c167 Merge pull request #2884 from dlackty/fix-secret-token-not-found
Set default secret_key before eager load
2014-02-25 17:36:19 +01:00
Richard Lee
146a2e500e Set default secret_key before eager load 2014-02-25 17:56:34 +08:00
Lauro Caetano
4995d3c221 Merge pull request #2880 from dwbutler/issue_2875
Fix for #2875
2014-02-22 20:53:28 -03:00
David Butler
1987ffc171 Fix for #2875 2014-02-22 12:22:05 -08:00
José Valim
16b29baa5b Merge pull request #2876 from rbsec/master
Disable autocompletion on all password inputs
2014-02-22 09:16:25 +01:00
José Valim
49403267cf Merge pull request #2854 from aceofspades/omniauth_devise_route_context
Use _devise_route_context in omniauth url_helpers
2014-02-22 09:09:55 +01:00
Lucas Mazza
4d7473634e bcrypt-ruby is now bcrypt. 2014-02-21 18:33:59 -03:00
rbsec
13b50d63ca Set autocomplete=off on all password inputs 2014-02-21 10:37:17 +00:00
Lucas Mazza
b8f1d0d0c6 Release v3.2.3 v3.2.3 2014-02-20 15:30:48 -03:00
José Valim
60b6a80764 Merge pull request #2868 from rmm5t/patch-1
Update password_length docs in config template
2014-02-16 14:45:05 +01:00
Ryan McGeary
5f9838950a Remove password_length default docs in config template
The default specified in the docs does not match up with the default
specified in the config.

See
cc8636cfed/lib/devise.rb (L127)

Changing the docs to read 6..128 with the config setting to 8..128 is
feared to cause confusion, so removing the default clause instead.
2014-02-16 08:19:47 -05:00
José Valim
0ece5d5190 Merge pull request #2869 from leriksen/master
Additional documentation on permitted scalars and nested parameter configuration
2014-02-16 10:04:26 +01:00
leriksen
058eac640f Additional documentation on simple scalars and nested types 2014-02-16 12:06:55 +11:00
José Valim
cc8636cfed Merge pull request #2866 from guilhermesimoes/readme-update
Readme update
2014-02-15 00:09:44 +01:00
Guilherme Simoes
e18b822567 Update README.md
The updates are:

* Indicate that it is possible to pass a block to `super` to add custom
  behaviour to some Devise controller actions without completely
  overriding them.

* Move mailer configuration out of the section "Controller filters and
  helpers".

* Consistently use Ruby 1.9's hash syntax, highlight code and capitalize
  "Devise".

* Wording improvements
2014-02-14 22:54:30 +00:00
Lucas Mazza
93bdee2640 Merge branch 'lm-migration-extension' 2014-02-11 11:00:16 -02:00
Lucas Mazza
e57b672e90 Ensure that migrations are created with the .rb extension.
Since rails/rails#13612 the generator won't always add the `.rb`
extension when creating migrations with the `migration_template`
method.
2014-02-11 10:19:05 -02:00
Lucas Mazza
e9351b7c15 Merge pull request #2857 from albertodotcom/patch-2
Update README.md
2014-02-10 23:57:45 -02:00
Alberto Forni
7c3e08d92d Update README.md
Substitute ; with .
2014-02-11 10:47:51 +11:00
Doug Puchalski
46c01d642b Use _devise_route_context in omniauth url_helpers 2014-02-02 16:45:26 -08:00
Rafael Mendonça França
2aedb1bf79 Merge pull request #2843 from willnet/patch-1
Fix homepage's schema
2014-01-25 21:37:43 -08:00
Shinichi Maeshima
9d87aa55bd Fix homepage's schema 2014-01-26 14:31:26 +09:00
José Valim
791657f3ef Merge pull request #2842 from slant/patch-1
Correct misspelling
2014-01-22 23:48:12 -08:00
Ryan L. Cross
8981c3ef9b Correct misspelling 2014-01-23 00:44:32 -07:00
José Valim
7a9ae13baa Merge pull request #2835 from plataformatec/secrets
Add support for Rails 4.1 secrets.
2014-01-22 05:33:11 -08:00
Lucas Mazza
eba91e6580 Read the secret_key value from Rails secret_key_base.
It is possible to override this by setting the `secret_key` manually
on the `devise.rb` initializer on your application.
2014-01-22 11:13:25 -02:00
José Valim
d5e0171cb4 Merge pull request #2832 from jwworth/master
Fix typos
2014-01-09 08:03:25 -08:00
Jake Worth
61e87be580 Fix typos 2014-01-09 10:00:27 -06:00
José Valim
e16278966f Merge pull request #2826 from tobinibot/fix-maximum-attempts
Fix off-by-one error in Lockable module
2014-01-06 23:43:55 -08:00
Tobin Juday
2ba8275dcc Fix off-by-one error in Lockable module
When using the maximum_attempts config, Devise actually let you fail n
+ 1 times, not n times.

See https://github.com/plataformatec/devise/issues/2825 for details.
2014-01-06 23:51:45 -05:00
Vasiliy Ermolovich
72a0d9e350 Merge pull request #2822 from plataformatec/rails-4.1
Fix specs on Rails 4.1
2014-01-04 10:14:57 -08:00