Atul Bhosale
48e26c5d0a
Update copyright notices to 2016 [ci skip]
2016-01-03 15:58:16 +05:30
Lucas Mazza
1d77099861
Merge pull request #3875 from james/master
...
Update controller generator templates for new ParameterSanitizer syntax
2015-12-27 22:53:01 -02:00
James Darling
924a989f37
Update controller generator templates for new ParameterSanitizer syntax
...
Devise::ParameterSanitizer has a new syntax for permitting additional
attributes to a model. This commit updates the generated controllers to
reflect that.
2015-12-28 00:45:03 +00:00
Lucas Mazza
6431445846
Cast the result of deperecated sanitization calls to a HWIA as well.
2015-12-21 09:57:20 -02:00
Lucas Mazza
8d57a54b2d
✂️ Remove custom Travis cache scripts.
2015-12-21 09:46:11 -02:00
Lucas Mazza
280d12b81c
Merge pull request #3856 from plataformatec/lm-sanitizer-cleanup
...
Remove `ParametersSanitizer` inheritance.
2015-12-21 09:40:59 -02:00
Lucas Mazza
00a0b8e516
Fix duplicated exclude entry.
2015-12-20 23:02:52 -02:00
Lucas Mazza
238ccb15b5
Test against the beta Rails release.
2015-12-20 22:56:13 -02:00
Lucas Mazza
ace7b55a1a
Merge pull request #3868 from twalpole/gemfile_update
...
update rails 5 gemfile with compatbile gem releases
2015-12-20 21:03:06 -02:00
Thomas Walpole
97ab41728e
update rails 5 gemfile with compatbile gem releases
2015-12-20 12:31:51 -08:00
Lucas Mazza
acd9f84802
Merge pull request #3866 from plataformatec/lm-remove-key-generator
...
Remove `KeyGenerator` implementation ported from Rails 4.x.
2015-12-18 15:18:15 -02:00
Lucas Mazza
a24ecc65f5
Remove KeyGenerator implementation ported from Rails 4.x.
2015-12-18 14:49:50 -02:00
Lucas Mazza
4e45a5fde4
Remove Rails version mention from the initializer template.
2015-12-18 14:47:32 -02:00
Lucas Mazza
9499736593
Remove safeguard against a previously broken NullSessionHash#reset_session.
...
This behavior was fixed on https://github.com/rails/rails/pull/12279 .
2015-12-18 14:47:32 -02:00
Lucas Mazza
df8b48646b
Remove ParametersSanitizer inheritance.
...
We no longer need to support the `BaseSanitizer` implementation for apps without
the Strong Parameters API, and this section is lacking a minimal set of
docs to document the expected behavior besides the `README` section.
2015-12-18 11:39:03 -02:00
Lucas Mazza
b4904a4ba2
Merge pull request #3865 from djsegal/rails5
...
Add #3732 helper logic to devise controller
2015-12-18 10:53:14 -02:00
djsegal
2006f87b58
Add #3732 helper logic to devise controller: #3864
2015-12-18 04:05:30 -05:00
Lucas Mazza
1ac4bdd090
Merge pull request #3857 from twalpole/test_fix
...
Fix Rails 5 test
2015-12-16 10:01:18 -02:00
Thomas Walpole
302c4e43bd
fix Rails 5 test
2015-12-15 10:32:24 -08:00
Lucas Mazza
f5926f6514
Do not send Travis notifications of Pull Requests.
2015-12-15 15:26:08 -02:00
Lucas Mazza
330e0f7165
Update lockfile.
2015-12-15 14:55:36 -02:00
Lucas Mazza
42376db763
Update Devise version on README [ci skip]
2015-12-15 11:52:26 -02:00
Lucas Mazza
1147badf7c
Update Rails dependency contrainst to support the stable 5.0.0 release.
2015-12-15 11:49:44 -02:00
Lucas Mazza
7b000390ac
Update CHANGELOG.md [ci skip]
2015-12-15 11:48:41 -02:00
Lucas Mazza
dd5de829c9
Merge pull request #3714 from twalpole/rails5
...
Rails 5 Support
2015-12-15 11:44:01 -02:00
Lucas Mazza
2f7834245b
Merge pull request #3835 from kv109/master
...
test for save in after_create hook breaks devise confirmation [3787]
2015-12-15 11:36:47 -02:00
Lucas Mazza
78d2654fb4
Merge pull request #3793 from chrismacias/save_in_after_create_hook_breaks_devise_confirmation
...
save in after_create hook breaks devise confirmation
2015-12-15 11:36:34 -02:00
José Valim
934dbd1f5a
Merge pull request #3854 from joshsoftware/reset_password_token_issue
...
Comparing times in UTC
2015-12-15 11:55:24 +01:00
Siva Gollapalli
23933d2fb0
FIX# Comparing times in UTC
2015-12-15 15:17:11 +05:30
José Valim
76bbbb8ed5
Merge pull request #3853 from betesh/betesh-patch-1
...
Removed unnecessary module fixes #3852
2015-12-15 09:35:12 +01:00
betesh
8701a88c94
Removed unnecessary module
2015-12-15 02:52:17 -05:00
Thomas Walpole
2024fca4df
Rails 5 compatability. Remove rails < 4.1 and Ruby < 2.1
2015-12-11 09:47:30 -08:00
Lucas Mazza
032eb145df
Release 3.5.3.
v3.5.3
2015-12-10 14:36:34 -02:00
José Valim
0d941b7ba5
Merge pull request #3847 from stanhu/reset-token-only-on-update
...
Only clear the reset token on an update
2015-12-09 20:28:06 +01:00
Stan Hu
f71d843f93
Only clear the reset token on an update
...
This solves the issue where a package might do:
```
user = User.new
user.email = 'test@test.com '
token = user.generate_reset_token
user.save
send_reset_email(token)
```
Since the save clears the reset token, the user will receive a stale token that no longer works.
Closes #3774
2015-12-09 11:14:50 -08:00
Lucas Mazza
7d825c93b6
Update CHANGELOG [ci skip].
2015-12-09 13:53:29 -02:00
José Valim
19b1e2a6bc
Merge pull request #3846 from seddy/make_email_optional_on_recoverable
...
Allow resources with no email field to be recoverable
2015-12-09 14:39:32 +01:00
José Valim
901919f25f
Revert "Merge pull request #3774 from stanhu/reset-token-only-if-not-persisted"
...
This reverts commit 15c38d918f , reversing
changes made to 508c3418f9 .
2015-12-09 14:21:09 +01:00
Lucas Mazza
15c38d918f
Merge pull request #3774 from stanhu/reset-token-only-if-not-persisted
...
Only clear the reset password token if the model has already been persisted
2015-12-09 10:54:36 -02:00
Lucas Mazza
508c3418f9
Merge pull request #3826 from andygeers/master
...
Don't error if resource doesn't need confirming
2015-12-09 10:52:35 -02:00
Ed Saunders
d98e98fe77
Add a test for when a recoverable resource has a non-AR email field
2015-12-08 16:01:39 +00:00
Ed Saunders
4a45eb9899
Allow resources with no email field to be recoverable
...
The current implementation is opinionated about the resource should have
an "email" column on it if it is to be recoverable, which isn't
necessarily the case. For example, developers may decide to pull emails
out into their own model or have some other way of communicating
password resets to their users (e.g. text message)
I'm not sure there's an easy test to put together for this case, as
minitest doesn't make it very easy to stub the "email_changed?" to raise
an error. Happy to look into building another model in the
"test/rails_app" if you want to have this properly tested though? Or for
a nice way to get calls to "email_changed?" to raise; minitest isn't
a test framework I'm overly familiar with :).
As a side note, it would be nice if the Validatable module also took
this into account, I may raise another PR for that.
This comes off the back of comments on this commit:
e641b4b7b9
2015-12-07 17:01:31 +00:00
José Valim
45fc964470
Merge pull request #3739 from stanhu/support-relative-urls-in-failure-app
...
Account for relative_url_root in FailureApp's recall method
2015-11-25 20:03:28 +01:00
Stan Hu
56fed052f8
Wrap logic for resetting token into instance method and add comments
2015-11-24 23:23:34 -08:00
Kacper Walanus
a0cd4655ba
test for save in after_create hook breaks devise confirmation [3787]
2015-11-24 01:54:03 +01:00
Andy Geers
d3f521925e
Write unit test for bug fix
2015-11-18 22:21:03 +00:00
Andy Geers
8a8887ea82
Don't error if resource doesn't need confirming
2015-11-18 22:21:03 +00:00
José Valim
d22ac4a4fb
Merge pull request #3813 from jlerpscher/set-minimum-password-length-on-failure
...
set minimum password length on reset failure
2015-11-10 09:37:59 -02:00
Julien Lerpscher
8426b12550
set minimum password length on reset failure
2015-11-10 12:17:29 +01:00
José Valim
57bf362b55
Merge pull request #3808 from blase/skip-timeoutable
...
Allow skipping the timeoutable hook
2015-11-04 18:15:03 -02:00