Lucas Mazza
08d8591dfd
Merge pull request #3038 from kushkella/non-bang-method-trackable
...
added non-bang version of update_tracked_fields
2014-05-24 00:58:06 -03:00
Lucas Mazza
09db3c65ec
Merge pull request #3041 from brentkearney/master
...
Getting Started instructions: clarification on dynamic method names
2014-05-24 00:40:01 -03:00
Brent Kearney
82b60fce15
Changed MODEL to model, as per request.
2014-05-23 15:15:41 -06:00
Brent Kearney
0e14ac3aa7
Updated Getting Started instructions to help avoid confusion around alternate devise MODEL names
2014-05-23 12:26:19 -06:00
Kush Kella
dd56dc7da6
added test for update_tracked_fields method
2014-05-22 11:11:13 -07:00
José Valim
9818038a72
Merge pull request #3029 from randoum/master
...
lock_access! better failure message
2014-05-22 10:20:41 +02:00
José Valim
6a783c9ec7
Merge pull request #3023 from jphenow/omniauth-cant-cleanup-csrf
...
Omniauth can't cleanup CSRF
2014-05-22 10:17:48 +02:00
Kush Kella
451be888cb
added non-bang version of update_tracked_fields
2014-05-21 16:18:35 -07:00
Jimmy Chen
72f5eae391
Document that we can configure Devise test helpers in spec_helper.rb
...
Closes #3006 [ci skip]
2014-05-21 20:07:07 -03:00
randoum
4ee2402cd7
lock_access! better failure message
2014-05-16 06:02:11 +08:00
randoum
d8ee3e49cb
lock_access! better failure message
2014-05-16 05:57:18 +08:00
Jon Phenow
d47c370916
* Allows CSRF cleanup to be turned off for certain strategy types
...
* Defaults Authenticatable CSRF cleanup
2014-05-15 09:16:31 -05:00
Lucas Mazza
2f6edfd0c5
Update dependencies.
2014-05-14 23:41:29 -03:00
Lucas Mazza
fa36464268
Silence the OmniAuth logger during tests.
2014-05-14 23:25:29 -03:00
Lauro Caetano
b51c3c1911
Merge pull request #3024 from diegosouzapb/master
...
Update README.md
2014-05-11 01:30:19 -03:00
Diego Souza Rodrigues
d1a9f220a1
Update README.md
...
The old Michael Hartl's online book link was broken. I guess this link is its substitute.
2014-05-11 01:11:48 -03:00
Carlos Antonio da Silva
6129215afe
Simplify test that verifies multiple warden blocks
2014-05-07 18:53:09 -03:00
Carlos Antonio da Silva
916e1d8da9
No need for instance vars on these tests
2014-05-07 18:50:50 -03:00
Carlos Antonio da Silva
1e8a387f34
Merge pull request #3020 from adrpac/master
...
Fix Rails 4 detection
2014-05-07 17:22:33 -03:00
Adrian Pacała
a2376d6ca1
Fix Rails 4 detection
2014-05-07 22:17:40 +02:00
José Valim
f611b63069
Merge pull request #3017 from adrpac/master
...
Use inet column type when generating migrations under PostgreSQL
2014-05-07 10:08:39 +02:00
Adrian Pacała
fa1a864731
Generate inet columns for Rails 4 only
2014-05-07 09:18:10 +02:00
Adrian Pacała
53504f7e28
Generate inet columns for postgresql
2014-05-07 08:50:21 +02:00
Lucas Mazza
a51036196a
Merge pull request #3013 from aditya-kapoor/split-send_reset_password_instructions
...
Split send_reset_password_instructions for better hooking
2014-05-05 17:45:09 -03:00
aditya-kapoor
2fc25a8c68
rename method + remove extra db call
2014-05-06 01:23:55 +05:30
aditya-kapoor
c8fcbde2af
split send_reset_password_instructions into two parts for better hooking
2014-05-05 13:41:08 +05:30
Lucas Mazza
a3fc587c24
Update Travis config to test on ruby 2.1.1 instead of 2.1.0
2014-05-04 22:45:07 -03:00
Lucas Mazza
3014bcbc45
Update Rails HEAD Gemfile dependencies.
2014-05-04 21:36:38 -03:00
Lucas Mazza
4110ab3228
Update 4-0-stable Gemfile dependencies.
2014-05-04 21:30:06 -03:00
Lucas Mazza
303145c8b7
Update 3-2-stable Gemfile dependencies.
2014-05-04 21:28:01 -03:00
Lucas Mazza
7bab20e55e
Update main Gemfile dependencies.
2014-05-04 21:21:45 -03:00
José Valim
873e57e97d
Merge pull request #3008 from weih/update-legacy-comment
...
Update legacy comment [ci skip]
2014-05-01 14:19:08 +02:00
Hao Wei
11c8875479
Update legacy comment
2014-05-01 19:49:37 +08:00
Lucas Mazza
1ad09f9cfc
Improve CHANGELOG and move assignment to outside the if statement.
2014-04-28 11:28:48 -03:00
Lucas Mazza
13a8ad81ee
Merge pull request #2997 from parallel588/master
...
fixed store location with bad URL
2014-04-28 11:26:56 -03:00
Lucas Mazza
b4c06d1ded
Merge pull request #3004 from kento1218/topic/confirmation-success-redirect
...
Fix Devise::ConfirmationsController#after_confirmation_path_for
2014-04-28 10:56:31 -03:00
kento1218
d63b6b7b9d
Fix Devise::ConfirmationsController#after_confirmation_path_for
...
after_confirmation_path_for checks whether the user already signed in
by calling signed_in? after confirmation succeeded.
Since it was called without scope specification, the user treated as
signed in inappropriately when the user signed in as another resource
(such as 'admin').
2014-04-28 20:44:00 +09:00
Lauro Caetano
1fbc165b98
Merge pull request #3001 from daniely/patch-1
...
Update README.md
2014-04-27 01:17:55 -03:00
daniely
9cafe0dff6
Update README.md
...
Correct grammar from "on progress" to "in progress"
2014-04-27 10:25:16 +08:00
Maxim Pechnikov
a841e6c4f0
fixed storing location with bad URL
2014-04-25 19:14:32 +04:00
José Valim
24327c7310
Merge pull request #2990 from westonplatter/master
...
remove new line to keep convention with other methods
2014-04-20 22:55:48 +02:00
Weston Platter
0b096c961a
remove new line to keep convention with other methods
2014-04-20 13:57:31 -06:00
José Valim
0a27a0da3b
Merge pull request #2985 from crismali/present-over-not-blank
...
Switched all instances of 'not blank?' to 'present?'
2014-04-18 08:41:02 +02:00
Michael Crismali
f37b10ef87
Switched all instances of 'not blank?' to 'present?'
2014-04-17 20:34:28 -05:00
Rafael Mendonça França
081ea9e0ba
Add CHANGELOG entry for #2978 [ci skip]
2014-04-15 18:47:16 -03:00
Rafael Mendonça França
f60892be23
Merge pull request #2978 from rossta/support_for_multiple_warden_config_blocks
...
Support multiple warden configuration blocks
2014-04-15 18:46:28 -03:00
Ross Kaffenberger
5f32cd25fd
support multiple warden configuration blocks
...
Changes the behavior of `Devise.warden` such that calling it multiple
times with different blocks will result in a call to each block on
`Devise.configure_warden!` rather than "last block wins". This is
especially used for plugins that wish to extend warden functionality
without clobbering base app configuration or vice versa.
2014-04-15 17:20:21 -04:00
Lucas Mazza
38e868dc79
Update Travis encrypted keys
2014-04-09 19:24:25 -03:00
Lucas Mazza
67613117aa
Merge pull request #2955 from lucasmazza/lm-cached-bundle
...
Cache bundle results on Travis to S3
2014-04-09 19:21:29 -03:00
José Valim
61c497d173
Merge pull request #2968 from plataformatec/sign_out_not_logged_in_user
...
Check if there is a logged user before logout.
2014-04-09 18:17:06 +02:00
