José Valim
6448490de5
Edited lib/generators/templates/devise.rb via GitHub
2011-08-05 20:45:39 +03:00
José Valim
98651dae9d
Merge pull request #1241 from dbloete/patch-1
...
Speed up tests by defaulting to 1 stretch in test env
2011-08-05 10:43:54 -07:00
José Valim
bf57ef400d
Merge pull request #1247 from michaelklishin/patch-1
...
It is #rbxday, lets test against Rubinius 2.0 preview, too
2011-08-05 09:36:31 -07:00
Michael Klishin
27cae04446
It is #rbxday, lets test against Rubinius 2.0 preview, too
2011-08-05 20:34:33 +04:00
José Valim
430eadc1b2
Merge pull request #1245 from michaelklishin/patch-1
...
Disable testing against JRuby, it has known issues on travis-ci.org.
2011-08-05 09:31:36 -07:00
Michael Klishin
e954737a92
Disable testing against JRuby, it has known issues on travis-ci.org.
...
We will figure out JRuby issues with the JRuby core team and let you know
2011-08-05 16:26:11 +04:00
José Valim
191d5222e7
Merge pull request #1244 from ches/docs
...
Doc tweaks
2011-08-05 05:22:24 -07:00
Ches Martin
e77af4b40f
Doc: DB authenticatable schema no longer includes salt
2011-08-05 20:13:01 +08:00
Ches Martin
da3c47259d
Doc: DB authenticatable schema no longer includes salt
2011-08-05 17:33:50 +07:00
Ches Martin
c95575b284
Doc: DatabaseAuthenticatable still uses pepper option
2011-08-05 17:08:26 +07:00
José Valim
7a5086a2be
Merge pull request #1242 from ches/mongoid-fixes
...
Fix failing Mongoid tests
2011-08-04 13:38:57 -07:00
Ches Martin
c3a665320e
Merge branch 'master' into mongoid-fixes
...
* master:
Untrack Gemfile.lock
Conflicts:
Gemfile.lock
2011-08-05 03:19:05 +07:00
Dennis Reimann
372dfecf05
Added a comment about the stretch change
2011-08-04 23:00:12 +03:00
Dennis Reimann
68bd6809a7
Speed up tests by defaulting to 1 stretch in test env
2011-08-04 22:50:06 +03:00
Ches Martin
7bfdd07a71
Initializer caveats warning for Mongoid < 2.1
2011-08-05 02:41:31 +07:00
Ches Martin
6bc93173f1
Restore forlorn Mongoid generator tests
2011-08-05 02:40:42 +07:00
Ches Martin
55af9f8a40
Fix failing Mongoid tests
...
- attr_accessible not set for test user model, making Serializable tests
inaccurate
- Mongoid does not `include_root_in_json` by default, so enable this for
consistency with AR tests
- Mark tests pending for Mongoid < 2.1 that fail there due to known bugs
- Add `:mongoid` key for i18n model labels
- Remove outdated shim of `update_attribute` that caused mass assignment
security to be applied (ugh, that took awhile to find)
2011-08-05 01:38:42 +07:00
José Valim
866b35d27c
Merge pull request #1239 from ches/gemfile-lock
...
Untrack Gemfile.lock
2011-08-04 04:16:50 -07:00
Ches Martin
5374119f18
Untrack Gemfile.lock
...
Gemfile.lock is for app deployment, not public library development:
http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
2011-08-04 11:33:53 +07:00
José Valim
919404df53
Merge pull request #1228 from dasil003/master
...
Set up Recoverable to automatically confirm! if Comfirmable
2011-08-02 12:41:09 -07:00
Gabe da Silveira
fd07c74578
Refactor to use method and override
2011-08-02 12:08:38 -07:00
José Valim
560961e3fc
Merge pull request #1233 from asanghi/master
...
sign_in should return true and assert that. fixes #1232
2011-08-02 03:04:51 -07:00
Aditya Sanghi
873e49ab66
sign_in should return true in case user is already signed in and assert that.
2011-08-02 14:35:46 +05:30
José Valim
0f8f786f9f
Use a default key on inactive reason.
2011-08-02 11:18:23 +03:00
José Valim
7b3e267729
Merge pull request #1231 from hck/master
...
added I18n support to inactive_message in RegistrationsController
2011-08-02 01:14:16 -07:00
hck
7264bb55b2
added I18n support to inactive_message in RegistrationsController
2011-08-02 08:11:25 +03:00
Gabe da Silveira
ed6dfed67f
Resetting password should confirm implicitly
2011-07-29 14:26:19 -07:00
Gabe da Silveira
3488066031
Spelling correction
2011-07-29 14:17:31 -07:00
José Valim
bc9ea93f50
Merge pull request #1224 from gtalton/patch-2
...
Edited lib/devise/rails/routes.rb via GitHub
2011-07-29 03:18:40 -07:00
Gerald Talton
1920b79a0d
Edited lib/devise/rails/routes.rb via GitHub
2011-07-28 15:23:23 -05:00
José Valim
9131570703
Merge pull request #1221 from hazah/master
...
Change :except to :only for registration routes
2011-07-26 10:45:36 -07:00
=
770c1a973f
Changed :except to :only for devise_registration method of the routing mapper.
2011-07-26 13:42:00 -04:00
José Valim
b7b21a0b72
Merge pull request #1211 from mathieuravaux/master
...
Issue #1206 fix ((TokenAuthenticatable#params_auth_hash behavior)
2011-07-25 05:11:26 -07:00
Mathieu Ravaux
4d91fb4910
Untangled the logic in Devise::Strategies::TokenAuthenticatable#params_auth_hash
2011-07-25 09:10:25 +02:00
Rafael Mendonça França
4ce9d6f29a
Merge pull request #1212 from mattupstate/patch-1
...
Typo in doc comment
2011-07-23 15:06:02 -07:00
Matt Wright
d2a4c503f7
Typo in doc comment
2011-07-23 15:03:10 -07:00
Mathieu Ravaux
a2700bc17f
Fixed issue #1206 : TokenAuthenticatable#params_auth_hash behaving in an unexpected way for the authentication token lookup
2011-07-23 17:45:45 +02:00
José Valim
0a04d73883
Merge pull request #1198 from andriytyurnikov/issue_1197
...
div instead of p in forms
2011-07-14 05:47:46 -07:00
Andriy Tyurnikov
502dae3c1f
div instead of p in forms
2011-07-14 15:43:10 +03:00
José Valim
e9c766277d
Merge pull request #1194 from waynn/patch-1
...
quick typo fix
2011-07-11 11:37:18 -07:00
Waynn Lue
762f3907fa
quick typo fix
2011-07-11 11:30:52 -07:00
José Valim
3698b64a10
Merge pull request #1190 from joliss/whitespace
...
Remove whitespace from generator template
2011-07-08 11:25:35 -07:00
Jo Liss
2a6c160d39
Remove whitespace from generator template
2011-07-08 18:41:16 +02:00
José Valim
795754cd60
Merge pull request #1189 from netmute/master
...
Add ability to override redirect_to path after account confirmation.
2011-07-08 03:27:21 -07:00
Simon Ernst
517343ddb5
Add ability to override redirect_to path after account confirmation.
2011-07-08 11:21:01 +02:00
Rodrigo Flores
90a5e2f9af
Added rdoc on the Gemfile
2011-07-02 01:33:34 -03:00
Rodrigo Flores
93180fbb6d
Removed a rdoc deprecation warning
2011-07-01 20:37:21 -03:00
José Valim
04cb78947a
Edited CHANGELOG.rdoc via GitHub
2011-07-01 04:23:31 -07:00
José Valim
5423f2d5cb
Properly deprecate setup_mail
2011-07-01 04:23:12 -07:00
José Valim
51d15b7293
Add more missing :require => true
2011-06-30 15:29:35 -03:00
