Nick Borromeo
a6b754b697
Fix gemspec so that MIT license will be visible when running the -d flag
2013-04-30 10:23:50 -07:00
José Valim
b451fc0aad
Merge pull request #2391 from stereoscott/patch-1
...
Fix spelling error in doc block
2013-04-28 22:20:59 -07:00
Scott M
2f28e48f54
Fix spelling error in doc block
2013-04-29 01:52:37 -03:00
Carlos Antonio da Silva
76e4967ca1
Update travis-ci link in README [ci skip]
2013-04-28 13:06:08 -03:00
Vasiliy Ermolovich
dceb788c6b
fix OrderedHash initialization
2013-04-23 10:37:10 +03:00
Vasiliy Ermolovich
fae8e977e8
use ordered hash to fix tests on ruby 1.8
2013-04-22 22:42:49 +03:00
Vasiliy Ermolovich
0a588fab3a
update CHANGELOG [ci skip]
2013-04-22 17:51:54 +03:00
Vasiliy Ermolovich
bbf57214ac
Merge pull request #2384 from worker8/after_reset_password_redirect_path
...
Add ability to override the redirect path after user has reset their password
2013-04-22 07:36:41 -07:00
Tan Jun Rong
804fbdf6d5
Fix spelling error, 'reseting' to 'resetting'
2013-04-22 22:25:40 +08:00
Tan Jun Rong
e4987e8bb7
Fix resource_name to resource
2013-04-22 21:40:52 +08:00
Tan Jun Rong
9d5a9c8a61
Add ability to override the redirect path after user has reset their password
2013-04-22 20:22:53 +08:00
Carlos Antonio da Silva
c8aa5f3e62
Bump webrat to 0.7.3
2013-04-19 20:38:39 -03:00
Carlos Antonio da Silva
df4b282566
Set variable to false instead of nil
2013-04-19 19:59:08 -03:00
Carlos Antonio da Silva
b8c5d76c5a
Merge pull request #2380 from vipulnsward/fix_warnings
...
fix some warnings
2013-04-19 15:53:43 -07:00
Vipul A M
b871bd5036
fix some warning
2013-04-19 19:08:20 +05:30
José Valim
c439b80524
Merge pull request #2381 from vipulnsward/enable_warinings
...
enable warnings by default
2013-04-18 13:40:01 -07:00
Rafael Mendonça França
704221d48f
Merge pull request #2379 from vipulnsward/remove_unused_vars
...
Remove unused variables and fix typos
2013-04-18 06:38:32 -07:00
Vipul A M
da70348662
enable warnings by default
2013-04-18 11:07:36 +05:30
Vipul A M
2e6457006e
Remove unused variables and fix typos
2013-04-18 10:24:38 +05:30
Carlos Antonio da Silva
1f68309c47
✂️ changelog [ci skip]
2013-04-15 15:50:06 -03:00
Lucas Mazza
93013c2e89
Merge pull request #2366 from hauleth/extract-lookup-for-i18n
...
Extract get_message
2013-04-14 08:21:19 -07:00
José Valim
b3edfeab73
Update README.md
2013-04-13 23:35:58 -07:00
José Valim
2dfa7e1761
Update CHANGELOG
2013-04-13 22:10:48 -07:00
José Valim
5bf4f57fcf
Tidy up devise configuration
2013-04-13 22:07:54 -07:00
José Valim
1b8fd7c2ff
Merge pull request #2271 from robhurring/master
...
Allowing http token auth to set the token_authentication_key if missing from params
2013-04-13 21:39:36 -07:00
Carlos Antonio da Silva
fa5ae57ce4
Use instance_eval instead of Proc#bind
...
Keep the implementation more similar to how it works in Action Mailer,
and avoid deprecation warnings with Proc#bind being raised in rails4
branch.
2013-04-13 11:35:51 -03:00
Carlos Antonio da Silva
d89dad5728
Bundle update for both Rails 3.1 and 3.2, update mocha, fix failing tests
2013-04-13 11:08:27 -03:00
Carlos Antonio da Silva
32a141d2a9
Fix typo in test descriptions
2013-04-13 10:54:52 -03:00
Carlos Antonio da Silva
36557ef641
✂️ [ci skip]
2013-04-13 10:53:49 -03:00
José Valim
aa24335656
Merge pull request #2371 from tomasv/custom-devise-mailer-default-proc-fix
...
Fix devise sender bug with custom devise mailers.
2013-04-12 08:37:31 -07:00
Tomas Varneckas
1acd3d1790
Fix devise sender bug with custom devise mailers.
...
The devise sender detection must take into account that the default
sender set in the custom devise mailer can be a proc.
2013-04-12 16:48:48 +03:00
Łukasz Niemier
95f56258d7
Rename get_message to find_message and fix set_flash_message
2013-04-07 08:52:11 +02:00
Łukasz Niemier
8e9ad4626e
Extract get_message
2013-04-06 18:46:21 +02:00
José Valim
2de7cbae25
Merge pull request #2363 from eloyesp/documenting_protected_methods
...
Generate documentation for protected methods.
2013-04-04 06:52:08 -07:00
Eloy Espinaco
37473cdaf7
Add config to customize documentation.
2013-04-04 09:48:33 -03:00
Lucas Mazza
bf30d79aca
Update rubygems url inside Gemfile.lock
2013-04-03 10:22:46 -03:00
José Valim
148fa99dce
Merge pull request #2330 from pungoyal/master
...
Language copy changes
2013-04-01 12:20:02 -07:00
Vasiliy Ermolovich
72cbafa322
Merge pull request #2340 from scottjacobsen/master
...
s/reseting/resetting
[ci skip]
2013-03-22 00:17:20 -07:00
Scott Jacobsen
4549d8c65f
Update recoverable.rb
...
Fix type-o.
2013-03-21 18:49:19 -06:00
Vasiliy Ermolovich
6c566c1ca4
Merge pull request #2331 from yxhuvud/master
...
License information to gemspec.
[ci skip]
2013-03-16 09:06:04 -07:00
linus
41aed807fc
Add license to gemspec.
2013-03-16 09:29:46 +01:00
Puneet Goyal
ddea9359a6
Removing an extra full stop
2013-03-15 15:19:52 +05:30
Puneet Goyal
5d87e150f7
removing an extra full stop
2013-03-15 15:18:45 +05:30
José Valim
d90e365636
Merge pull request #2315 from neo/http_auth_key
...
Allow explicit configuration of http auth key
2013-03-07 09:43:08 -08:00
Lucas Mazza
22442907af
Fix send_devise_notification arity in the documentation.
...
[ci skip]
2013-03-05 15:55:19 -03:00
robhurring
10f58b636f
update devise config template with new allow_token_authenticatable_via_headers options
2013-03-04 17:38:36 -05:00
robhurring
2d14bd2826
removing params hash merging of token and mimicking http basic auth flow
2013-03-04 17:33:27 -05:00
Matt Jones + Tony Schneider
f4ceecece4
Allow explicit configuration of http auth key
...
- Fix basic auth case in which authorized_keys is configured as hash
- Duplicate existing functionality when http_auth_key is not explicitly
set
2013-03-04 12:23:05 -05:00
José Valim
359fdd840c
Merge pull request #2311 from pixeltrix/improve-delayed-email-documentation
...
Improve documentation on sending delayed emails
2013-03-01 06:49:39 -08:00
Andrew White
c6578250d2
Improve documentation on sending delayed emails
...
There are a couple of gotchas in the existing documentation
about the `send_devise_notification` hook.
1. The `after_commit` callback can be called multiple times
so you should clear the array otherwise any additional
invocations will trigger extra copies of the email.
2. The `after_commit` callback is only called when a record
is created or updated so you need to check for `new_record?`
or `changed?` before adding it to `pending_notifications`
otherwise it's okay to send it immediately.
The `new_record? || changed?` condition is necessary because
the latter isn't always true for new records, e.g:
>> User.new.changed?
=> false
[ci skip]
2013-03-01 14:32:15 +00:00
