github/devise
1
1
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2026-01-16 02:07:55 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,406 Commits 28 Branches 145 Tags
v3.2.0
Commit Graph

2406 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
José Valim
c840fc419f Update Rails 3.2 lock too v3.2.0 2013-11-06 21:50:04 +01:00
José Valim
9d872709c0 Release Devise 3.2.0 2013-11-06 21:39:16 +01:00
José Valim
27bcefcf54 Ensure timeoutable hook respects Devise.sign_out_all_scopes configuration 
Closes #2606
 2013-11-06 21:07:38 +01:00
José Valim
4f1bf8f3f9 Split out sign_in/out functionality so it can be reused in hooks 2013-11-06 20:55:26 +01:00
José Valim
d49f0a1184 Update CHANGELOG 2013-11-06 20:34:57 +01:00
José Valim
a7624c8f51 Merge pull request #2227 from AlexanderZaytsev/master 
Use mapping.fullpath in omniauth callbacks
 2013-11-06 11:32:21 -08:00
andrew morton
52a3768451 A GET to sign in shouldn't extend the session. 2013-11-06 20:20:22 +01:00
José Valim
f5f7e97d8b Merge pull request #2718 from ssendev/flashing_formats 
Separate redirects and flash messages in navigational_formats and flashing_formats
 2013-11-06 00:10:23 -08:00
José Valim
13117f01be Merge pull request #2562 from devolute/master 
passes headers through test helpers' response
 2013-11-05 23:59:11 -08:00
Kaworu
fe1fb1f7a2 Don't use config option for flashing_formats 2013-11-01 22:25:15 +01:00
Kaworu
c87809a0f5 Separate redirects and flash messages in navigational_formats and flashing_formats 2013-11-01 21:47:40 +01:00
José Valim
9eb0768cb9 Add Rails 4 related todo 2013-10-31 14:40:44 +01:00
José Valim
e445039716 Merge pull request #2717 from memberful/2716-splat-sanitize-params 
Splat the arguments to strong_parameters#permit, fixes #2716
 2013-10-31 14:40:28 +01:00
José Valim
69d28f9b0e Add config.last_attempt_warning to default config 2013-10-26 11:56:31 +02:00
José Valim
5cb575bd48 Merge pull request #2705 from 13k/master 
Fix configuration option name in CHANGELOG.
 2013-10-24 14:43:37 -07:00
Kiyoshi '13k' Murata
88de877f8b Fix configuration option name in CHANGELOG. 
[ci skip]
 2013-10-24 19:37:47 -02:00
José Valim
5a363f5fcb Merge pull request #2703 from bbenezech/master 
Add options for FailureApp's i18n_message. Similar #1633
 2013-10-24 09:10:19 -07:00
Benoit Bénézech
04e47687b2 remove respond_to in favor of an implementation that returns options 2013-10-24 17:29:53 +02:00
Benoit Bénézech
d5514bf916 Add options for FailureApp's i18n_message. Similar #1633 2013-10-24 16:49:13 +02:00
José Valim
93649e21d0 Merge pull request #2700 from obiwanchinobi/task/document-after-db-auth-hook 
Add documentation to the 'after_database_authentication' method.
 2013-10-23 23:35:47 -07:00
Dave Tong
8bef8b87f1 Add documentation to the 'after_database_authentication' method. 2013-10-24 08:25:00 +11:00
José Valim
fb530110c7 Merge pull request #2697 from Lightpower/feature/last_attempt_message 
Show last attempt message for last attempt, not for one-before-last one
 2013-10-22 01:33:37 -07:00
Vitaly Bezkrovny
bb810cfb8f * show message for last attempt, not for one-before-last one; 
* update test to check the message :invalid, :last_attempt, :locked
 2013-10-22 00:43:56 +03:00
José Valim
a8069be4c8 Improve devise_for docs to be make routes integration more explicit 2013-10-21 13:28:20 +02:00
Jay Hayes
2296d14803 Add entry to changelog 
[#2691]
[ci skip]

Signed-off-by: José Valim <jose.valim@plataformatec.com.br>

Conflicts:
	CHANGELOG.md
 2013-10-21 13:21:43 +02:00
Jay Hayes
21583cbf95 Update code comment to keep it up to date 
[#2691]
[ci skip]
 2013-10-21 13:21:11 +02:00
Jay Hayes
4861436298 Prevent mutation of orig values during case and wspace sanitizations 2013-10-21 13:21:05 +02:00
Vasiliy Ermolovich
844d467ab9 Update CHANGELOG [ci skip] 2013-10-20 17:55:51 +03:00
Vasiliy Ermolovich
520e2845ae Merge pull request #2689 from Lightpower/master 
* typo
 2013-10-16 14:53:38 -07:00
Vitaly Bezkrovny
aba19c1ca4 * typo 2013-10-16 23:57:11 +03:00
José Valim
986f52df2b Merge pull request #2687 from Lightpower/master 
Warning of the last attempt password entering
 2013-10-16 01:33:41 -07:00
Vitaly Bezkrovny
e20e446cf4 + last_attempt 
+ @@last_attempt_warning

+ last_attempt? method;
* send :last_attempt key if it is the last attempt

+ test for last attempt

* update test to make two asserts

* update message
 2013-10-15 01:53:56 +03:00
José Valim
e947a9cbec Merge pull request #2674 from jessy/master 
Fix #2673 email templates generated with the good @token
 2013-10-08 02:28:30 -07:00
Jessy Bernal
fa06b33dd3 Fix #2673 email templates generated with the good @token 2013-10-08 11:25:04 +02:00
José Valim
31971e69e6 Merge pull request #2669 from plataformatec/pr-2598-fixed 
Fixed version of PR #2598
 2013-10-06 04:22:45 -07:00
Vasiliy Ermolovich
fa16afd90a add CHANGELOG entry 2013-10-06 14:19:19 +03:00
Vasiliy Ermolovich
0d6493a9a5 proper hash comparing in Devise.bcrypt test 2013-10-06 14:19:08 +03:00
Aaron Patterson
5300bdabc8 add a class method so you can encrypt passwords from fixtures 2013-10-06 13:53:12 +03:00
José Valim
93f59dd63a Update CHANGELOG.md 2013-10-04 20:04:23 +02:00
José Valim
9281ac3958 Merge pull request #2663 from scaryzet/fix_expire_session_data_after_sign_in 
Fix expire_session_data_after_sign_in!
 2013-10-03 08:40:04 -07:00
Vasiliy Ermolovich
52300c033d Merge pull request #2662 from plataformatec/issue-2659 
do not define mailer if ActionMailer is not defined
 2013-10-03 08:17:18 -07:00
Vasiliy Ermolovich
036715facc do not define mailer if ActionMailer is not defined 
closes #2659
 2013-10-03 17:39:04 +03:00
Ivan Zhidkov
2351d0215a Fix expire_session_data_after_sign_in! 2013-10-03 18:34:39 +04:00
José Valim
eaad61b2da Make it clear a restart is required when setting the secret key 2013-10-01 17:12:08 +02:00
José Valim
c323065b57 Merge pull request #2634 from gregates/bug/confirmation_workflow 
Tweaks confirmation flow for signed_in users
 2013-09-16 07:17:46 -07:00
Greg Gates
989d7192fa Tweaks confirmation flow for signed_in users 
For #2627

When allow_unconfirmed_access_for > 0, users may
be already signed in at the time they confirm
their account. Consequently, the default
confirmation should be compatible with this
possibility. Additionally, they should not be
redirected to the sign in form after confirmation
in this case. So I've changed
ConfirmationsController#after_confirmation_path_for
to send the user to the root path when signed in,
or the sign in form otherwise.
 2013-09-16 10:12:15 -04:00
Vasiliy Ermolovich
acefa2f761 Merge pull request #2631 from vipulnsward/cleanup_tests 
Cleanup tests for unused variables
 2013-09-14 14:53:23 -07:00
Vipul A M
ae6a37f796 Cleanup tests for unused variables 2013-09-15 01:52:53 +05:30
Vasiliy Ermolovich
d75fd56f15 remove unused reset_password_token method 
closes #2621
 2013-09-14 12:30:23 +03:00
Vasiliy Ermolovich
4216c34538 fix markdown in CHANGELOG [ci skip] 
closes #2626
 2013-09-13 22:29:34 +03:00