Lucas Mazza
bdf9c25f3b
Release 3.4.0
v3.4.0
2014-10-03 14:28:15 -03:00
Lucas Mazza
9b49e89ebd
Update CHANGELOG [ci skip]
2014-10-03 14:20:31 -03:00
Lucas Mazza
8e5c098e3a
Merge pull request #3153 from plataformatec/lm-rails-4-2
...
Rails 4.2 compatibility
2014-10-03 14:07:59 -03:00
Lucas Mazza
547e18e24e
Merge pull request #3239 from plataformatec/lm-last_attempt_warning
...
Use the `last_attempt_warning` configuration with the lockable unauthenticated_message message.
2014-10-03 14:04:56 -03:00
José Valim
5ee215bcae
Merge pull request #3242 from wasabhi/master
...
Use spec/rails_helper.rb for rspec-rails config.
2014-10-03 18:59:27 +02:00
Abhinav
6445e07791
Use spec/rails_helper.rb for rspec-rails config.
2014-10-03 10:13:36 -06:00
Lucas Mazza
fa7714218e
Update CHANGELOG
2014-10-03 09:49:48 -03:00
Lucas Mazza
6405c96213
last_attempt_warning should be true for now on.
2014-10-03 09:49:29 -03:00
Lucas Mazza
1d8890b773
Merge branch 'master' into lm-rails-4-2
2014-10-03 09:41:23 -03:00
Lucas Mazza
fd565c7efb
Merge pull request #3241 from plataformatec/revert-3195-master
...
Revert "Removes reloading of routes when eager loading ..."
2014-10-03 09:39:09 -03:00
Lucas Mazza
c411ebcad6
Revert "Removes reloading of routes when eager loading ..."
2014-10-03 09:35:05 -03:00
Lucas Mazza
8b15184a25
Use the last_attempt_warning configuration with the lockable unauthenticated_message message.
...
This configuration was added in #2687 but it was never used in the real code that
defines what message should be used by the app.
2014-10-02 18:50:48 -03:00
Lucas Mazza
ed109ac3d5
Merge swap usage into a single method call.
2014-10-02 18:42:46 -03:00
Lucas Mazza
6f8a383ff6
Merge pull request #3221 from timoschilling/auth_keys_text
...
fix and optimice authentication_keys
2014-09-29 17:43:13 -03:00
Lucas Mazza
ee69d41fc1
Remove ActiveSupport test order deprecation warning
2014-09-29 17:42:08 -03:00
Lucas Mazza
1ed93cacd8
Update Rails dependency
2014-09-29 17:38:16 -03:00
Lucas Mazza
7eeaac9db1
Merge branch 'master' into lm-rails-4-2
2014-09-29 17:30:30 -03:00
José Valim
64b4905410
Merge pull request #3229 from yandy/patch-1
...
fix path bug
2014-09-29 09:30:11 +02:00
Michael Ding
002b4c6c01
fix argument bug
...
when `is_navigational_format?` returns false, Exception will be throw:
ArgumentError (Nil location provided. Can't build URI.)
2014-09-29 14:36:05 +08:00
Timo Schilling
0f240ab68f
code cleanup FailureApp
2014-09-24 15:51:51 +02:00
Timo Schilling
d546665102
use I18n "support.array.words_connector" as connector
2014-09-24 14:13:37 +02:00
Timo Schilling
d3c53904c7
use auth keys from scope instead of global config
2014-09-24 14:05:38 +02:00
José Valim
9f63850279
Merge pull request #3218 from timoschilling/fix_3201
...
use authentication_keys in flash message (fix #3201 )
2014-09-24 08:15:40 +02:00
Timo Schilling
6b0d11ed7a
use authentication_keys in flash message, instead of static ‘username’ ( fix #3201 )
2014-09-23 18:42:11 +02:00
José Valim
258a29636b
Merge pull request #3216 from vasinov/master
...
Update README.md
2014-09-22 09:35:25 +02:00
Vasily Vasinov
c811ea2edb
Update README.md
...
Added the security shield from Hakiri.
2014-09-21 21:41:42 -06:00
Lucas Mazza
dce67416c5
Merge pull request #3162 from plataformatec/lm-sanitizer-to-hash
...
Do not pass down 'ActionController::Parameters' to outside the controller
2014-09-18 18:45:05 -03:00
Lucas Mazza
c043eca2b2
Silence controller generator warning output
2014-09-18 18:24:26 -03:00
Lucas Mazza
39ed332299
Ensure that we sanitize any AC::Parameters in find_or_initialize_with_errors.
...
As we are already slicing the Hash, we must be sure that this method will send
a "safe" object down to the other finder methods that will use the Hash entries
to do the querying.
2014-09-18 18:21:05 -03:00
Lucas Mazza
8482e485d1
Merge branch 'master' into lm-rails-4-2
2014-09-18 17:46:14 -03:00
Lucas Mazza
952c162bee
Update CHANGELOG
2014-09-18 17:25:13 -03:00
Lucas Mazza
131013ac56
Controller templates should have the .rb extension, not .erb.
2014-09-18 17:21:25 -03:00
Lucas Mazza
79a4b93993
Point users to the canonical Omniauth docs in our README, not the wiki.
2014-09-18 17:18:11 -03:00
Lucas Mazza
9fe1561b56
Merge pull request #3169 from Chun-Yang/master
...
Create controller generator for devise (rails generator devise:controllers users -c sessions)
2014-09-18 17:17:17 -03:00
José Valim
a5158939de
Update CHANGELOG
2014-09-18 20:28:24 +02:00
José Valim
7029a5aaa8
Decouple validation from remember_me in authentication strategies
...
Closes #3118
2014-09-18 20:04:12 +02:00
José Valim
73c406b481
Fix docs for http_authenticatable_on_xhr, closes #3112
2014-09-18 19:50:58 +02:00
José Valim
432a172533
Set null: false explicitly in timestamps
2014-09-18 19:50:58 +02:00
José Valim
1581a34ee4
Merge pull request #3195 from fgro/master
...
Removes reloading of routes when eager loading ...
2014-09-18 19:44:45 +02:00
José Valim
32b5299547
Merge pull request #3171 from micat/find_scope-should-accept-string
...
Url helpers raise "undefined method `router_name' for nil:NilClass"
2014-09-18 19:41:49 +02:00
Lucas Mazza
ce6e369ba8
Remove test ordering setup
...
We can now run the test suite on random order.
2014-09-11 17:41:40 -03:00
Lucas Mazza
8a8e8c6519
Simplify the setup code for the Devise Helper tests so no locales or translations are leaked between tests.
2014-09-11 17:01:07 -03:00
Lucas Mazza
48f03d8cc4
Ensure that the I18n backend is always initialized when we store custom translations.
...
Depending on the test order, there might a moment when a test reloads the I18n
backend and another tries to store a translation, but since the backend wasn't
re-initialized the custom translations would be overriden when i18n loads the
translations from the en.yml file.
2014-09-11 15:19:41 -03:00
José Valim
13c99d8162
Merge pull request #3205 from pjungwir/consistent-failed-login-messages
...
All causes of failed login should have the same error message
2014-09-11 17:47:50 +02:00
Paul A. Jungwirth
6e0c287391
All causes of failed login should have the same error message
2014-09-11 08:38:14 -07:00
Chun-Yang
439112adf3
change before_action to before_filter to make it backward compatible to rails 3.2
2014-09-09 20:40:05 -05:00
Chun-Yang
17f6c76dc7
simplify sanitizer in *_params function
2014-09-09 20:35:46 -05:00
Chun-Yang
6003c69818
change indentation
2014-09-09 20:31:48 -05:00
Lucas Mazza
a6f3f8cb4a
Split up mailer classes into their own files.
2014-09-08 18:01:39 -03:00
Lucas Mazza
716d128e27
Restore global allow_unconfirmed_access_for after test
2014-09-08 17:38:06 -03:00