José Valim
86f0bff332
Apparently Rails 3.1 does not like @headers as ivar
v2.2.0.rc
2012-12-13 09:59:36 +01:00
José Valim
30ab6f923d
Release 2.2.0.rc
2012-12-13 09:20:46 +01:00
José Valim
839e8fc8ac
Show if there is an e-mail waiting for confirmation, closes #2060
2012-12-13 09:13:33 +01:00
José Valim
4c83743263
unconfirmed_email now uses the proper e-mail on salutation, related to #2060
2012-12-13 09:02:59 +01:00
José Valim
e1fde192f2
Update CHANGELOG
2012-12-13 08:43:43 +01:00
José Valim
73389ea491
Merge pull request #2174 from rykov/master
...
Adding the Gem Version badge to README
2012-12-11 10:44:32 -08:00
Michael Rykov
eeb6a30752
Add 'Gem Version' badge to README.md
2012-12-11 10:39:47 -08:00
Lucas Mazza
01669c7374
Display the build status just for the master branch [ci skip].
2012-12-10 10:59:50 -02:00
Carlos Antonio da Silva
ac3a25bf2e
Remove nothing raised assertion
...
Let the test raise if that is the case, no need for assert that nothing
was raised.
Hopefully fix the build ✨
2012-12-04 17:49:26 -02:00
Carlos Antonio da Silva
0652117c79
Bundle update
2012-12-04 17:37:32 -02:00
Carlos Antonio da Silva
2261005ed5
Refactor a bit to avoid two model attributes lookup
...
Tidy up tests a bit.
2012-12-04 17:37:12 -02:00
José Valim
e80e0c9a89
Merge pull request #2135 from latortuga/2129-make-validatable-affect-virtual-attributes
...
Make validatable callbacks affect virtual attributes
2012-12-02 01:43:48 -08:00
Drew Ulmer
79e9d6e564
Allow validation callbacks to apply to virtual attributes
2012-12-01 21:06:33 -06:00
Drew Ulmer
0c6f2adf14
Add failing test for #2129
2012-12-01 21:06:11 -06:00
Drew Ulmer
77ec1b08cd
Move test models into their own file so they can be used elsewhere
2012-12-01 21:06:03 -06:00
Carlos Antonio da Silva
2be9fb292e
Merge pull request #2165 from asanghi/master
...
Reverting part of #2164 which was a mistake [ci skip]
2012-12-01 10:58:39 -08:00
Aditya Sanghi
88dba417ef
reverting part of #2164 which was a mistake
2012-12-02 00:24:09 +05:30
José Valim
b98f021d0f
Merge pull request #2164 from asanghi/master
...
Minor grammar updates
2012-11-30 03:25:51 -08:00
Aditya Sanghi
c026b5a3f6
minor documentation grammar update
2012-11-30 16:42:18 +05:30
José Valim
3696cbf33e
Merge pull request #2148 from kukula/master
...
Fix default email_regexp config to not allow spaces
2012-11-21 02:58:30 -08:00
José Valim
cbfdcbeaed
Merge pull request #2147 from gabetax/signin_nonexistent_error
...
Support alternate sign in error message when email record does not exist
2012-11-19 15:56:18 -08:00
Gabe Martin-Dempesy
130d684198
Change failure key for missing database resource to :invalid_email
2012-11-19 15:49:21 -08:00
Anatoliy Kukul
f0f3e15c08
add test for Devise.email_regexp
2012-11-19 17:38:22 +02:00
José Valim
19a1ea5211
Update README.md
2012-11-19 14:02:43 +01:00
José Valim
6c2c808478
Merge pull request #2143 from luisico/display-invalid-confirmation-token-error
...
Invalid confirmation token message not shown with simple_form
2012-11-19 05:02:06 -08:00
Anatoliy Kukul
adc9a45f05
Used other regxp
2012-11-19 13:58:19 +02:00
Anatoliy Kukul
50186474d4
Fix default email_regexp config to not allow spaces
...
Default email_regexp config accepted emails with spaces. e.g.: "test user@test server.com" http://rubular.com/r/jXGS8pmumd
Changed regexp to not allow spaces in email. e.g.: http://rubular.com/r/tTD9PytGEp
2012-11-19 13:40:54 +02:00
Gabe Martin-Dempesy
ffab77c35e
Fix typo on nonexistent error
2012-11-18 15:19:15 -08:00
Gabe Martin-Dempesy
cde2229e59
Support alternate sign in error message when email record does not exist
...
By default, the nonexistent error is still identical to the :invalid
message, and must be customized by the developer to implement.
2012-11-18 15:08:57 -08:00
José Valim
397fce1f9d
Merge pull request #2144 from jm81/master
...
Use correct current_password in RegistrationTest of invalid confirmation
2012-11-15 10:56:49 -08:00
Jared Morgan
f044916f94
Use correct current_password in RegistrationTest of invalid confirmation
...
In DatabaseAuthenticatable#update_with_password, password is now deleted if
the current_password is invalid. dm-validations will not check the
confirmation in that case, so this test was failing in dm-devise.
2012-11-15 12:21:11 -06:00
Luis Gracia
0415564a7d
Show invalid unlock token message
...
Attribute unlock token is not present in the simple_form template,
therefore not being displayed by #error_notification.
This fix explicitily call #full_error on :unlock_token.
2012-11-13 15:01:32 -05:00
Luis Gracia
ed6f2abc23
Show invalid confirmation token message
...
fixes #2143
Attribute confirmation token is not present in the simple_form template,
therefore not being displayed by #error_notification.
This fix explicitily call #full_error on :confirmation_token.
2012-11-12 20:05:42 -05:00
Lucas Mazza
96a0477555
Remove 1.9.2 + Mongoid from the build matrix.
...
http://mongoid.org/en/mongoid/docs/tips.html#ruby
2012-11-12 15:07:29 -02:00
Lucas Mazza
da5464acf6
Update Travis CI configuration:
...
* `DEVISE_ORM=mongoid` is part of the build matrix, except
for 1.8.7 and REE rubies;
* `language` key added (Thanks to travis-lint).
2012-11-12 09:12:17 -02:00
Lucas Mazza
1c8fc18fad
Update Gemfile.rails-3.1.x.
2012-11-12 09:11:55 -02:00
José Valim
fbf667e009
Update CHANGELOG
2012-11-10 21:07:34 +01:00
José Valim
071ba358a9
Update README.md
2012-11-10 20:51:20 +01:00
José Valim
ef4db2e93d
Merge pull request #2138 from nashby/patch-1
...
update README
2012-11-10 11:49:15 -08:00
José Valim
6a2ef52aa0
Merge pull request #2139 from durran/mongoid-3-test-fixes
...
Fix spec failures for Mongoid 3.
2012-11-10 11:49:05 -08:00
Durran Jordan
d821275588
Fix spec failures for Mongoid 3.
...
This has no actual changes to Devise itself, just fixes the failing
tests when running against Mongoid 3 instead of Mongoid 2.
Mocha has been locked at 0.10.0 since 0.12.0 raises an error when trying
to set an expectation on a frozen object.
Tests were updated to work with both AR and Mongoid, some cases the XML
serialization was slightly different but both were outputting correct
and valid XML, and the id/_id field mismatch is now handled.
An active field was missing from the test models for Mongoid, and the
invalid :null => true options in field were removed.
2012-11-10 20:02:58 +01:00
Vasiliy Ermolovich
59966e817c
update README
...
closes #2128
2012-11-10 20:35:43 +03:00
José Valim
b1df686a2e
Merge pull request #2137 from nashby/indifferent
...
remove useless test
2012-11-08 11:25:08 -08:00
Vasiliy Ermolovich
ae426dcc1c
remove useless test
2012-11-08 22:22:03 +03:00
José Valim
1646684af9
Merge pull request #2134 from marcinb/master
...
unlock user after password re-set
2012-11-07 14:15:00 -08:00
Marcin Balinski
ac58c28617
Unlock user when re-setting password and unlock strategy is :email or :both
2012-11-07 10:45:46 +01:00
José Valim
7d72121bd7
Merge pull request #2132 from nashby/issue-2130
...
update_with_password doesn't change encrypted password when it is invalid
2012-11-06 13:13:50 -08:00
Vasiliy Ermolovich
10235f9d72
update_with_password doesn't change encrypted password when it is invalid
...
closes #2130
2012-11-06 21:05:17 +03:00
José Valim
5d311e7557
Merge pull request #2126 from nashby/issue-2122
...
don't delete the return to url from session if the requested format is not navigational
2012-11-04 23:49:42 -08:00
Vasiliy Ermolovich
5d86327e4d
move is_navigational_format? and request_format methods to helpers
2012-11-05 09:54:22 +03:00