Commit Graph

1571 Commits

Author SHA1 Message Date
José Valim
fff75b1904 Merge pull request #1579 from masterkain/patch-1
Fix typos in devise.rb
2012-01-17 14:18:10 -08:00
Claudio Poli
97c0339f66 Fix typos in devise.rb 2012-01-17 23:14:26 +01:00
Rafael Mendonça França
5b3f14df3b Fix README 2012-01-17 15:59:50 -02:00
José Valim
07cdba349d Merge pull request #1563 from asynchrony/handle_regexp_param_filtering
Allow regex to avoid string conversion for parameter filtering
2012-01-16 03:20:17 -08:00
José Valim
197e837e5b Merge pull request #1564 from pcantrell/patch-1
Grammar fix.
2012-01-11 23:09:17 -08:00
pcantrell
13bd4ce46a Grammar fix. 2012-01-11 23:18:04 -06:00
José Valim
a43d1af23e Merge pull request #1557 from plataformatec/rails-3-2-fixes
Rails 3.2 fixes
2012-01-10 12:26:58 -08:00
Rafael Mendonça França
cbf483143f Remove rubinius from travis-ci matrix 2012-01-10 11:59:59 -03:00
Rafael Mendonça França
cf5fbb9d65 Fix order specific test 2012-01-10 11:59:20 -03:00
Rafael Mendonça França
d699b80254 Do not use a local network ip as HTTP_X_FORWARDED_FOR header
If HTTP_X_FORWARDED_FOR is a local network IP the HTTP_CLIENT_IP
need to be set
2012-01-10 11:43:15 -03:00
Rafael Mendonça França
ead414d0a7 Use global Gemfile in travis-ci 2012-01-10 10:52:14 -03:00
Rafael Mendonça França
cfdabf874a Change gemspec to avoid subshells and remove unneeded files
More informations at http://tenderlovemaking.com/2011/12/05/profiling-rails-startup-with-dtrace/
2012-01-09 23:47:35 -03:00
Rafael Mendonça França
e954254abb Fix gemfiles 2012-01-09 23:18:03 -03:00
Rafael Mendonça França
93d4bb8361 Add travis-ci specific gemfiles 2012-01-09 22:59:13 -03:00
Rafael Mendonça França
edb0aac091 Whitespaces ✂️ 2012-01-09 18:11:10 -03:00
Rafael Mendonça França
9549a32500 Do not use deprecated ActiveSupport::Base64. Closes #1554 2012-01-09 18:10:49 -03:00
José Valim
a949f9eca2 FailureApp shuold always consider Devise.router_name, closes #1544 2012-01-03 20:32:51 +01:00
Carlos Antonio da Silva
f4bbad6323 Merge pull request #1543 from joliss/doc
Improve routing API docs
2012-01-03 06:39:41 -08:00
Jo Liss
8a4d4864ea Improve routing API docs 2012-01-03 15:33:19 +01:00
José Valim
a8de38d0b0 Fix http://@ from CHANGELOG 2012-01-02 23:18:57 +01:00
José Valim
18dc82c6b6 add a test that :module => :devise overrides previous configs. 2012-01-02 22:47:28 +01:00
José Valim
897c1c684e Allow router_name to be customizable via Devise.router_name, useful for engines 2012-01-02 22:43:07 +01:00
José Valim
1ebcb09fc1 Do not rely on root_path. Redirect to / if not available. 2012-01-02 22:43:07 +01:00
José Valim
0f11226ced Merge pull request #1540 from michaelklishin/master
Bring .travis.yml up to date
2012-01-02 13:21:51 -08:00
José Valim
dada404a6b Support 3.2 as well. 2012-01-02 22:19:05 +01:00
Michael Klishin
e4a37d6a5e Bring .travis.yml up to date
* rbx and rbx-2.0 are now both aliases for rbx-18mode (master in 1.8 mode)
 * 1.9.3 final is available
2012-01-03 01:14:59 +04:00
José Valim
66b93e8fd2 Clean up as we don't need to call render_with_scope anymore. 2012-01-02 22:12:09 +01:00
José Valim
d9df632671 Get rid of InternalHelpers, refactor scoped views for more performant behavior. 2012-01-02 22:01:28 +01:00
José Valim
aa2d15aa33 Move devise/shared/_links.erb to devise/_links.erb 2012-01-02 21:26:26 +01:00
José Valim
0b55ebb150 Remove 3.0 related code. 2012-01-02 21:04:54 +01:00
José Valim
7c11564613 Remove Rails 3.0 only code. 2012-01-02 20:43:39 +01:00
José Valim
c3f864f2b6 Allow parent controller to be customizable. 2012-01-02 20:39:22 +01:00
José Valim
a29a30effc Move InternalHelpers to parent controller. 2012-01-02 20:30:56 +01:00
José Valim
0af2722926 Let's depend on 3.1 forward. 2012-01-02 20:24:42 +01:00
José Valim
78efec09d5 Move notes to the top. 2012-01-02 20:24:42 +01:00
José Valim
1fdeadd113 Merge pull request #1188 from sj26/controller-inheritence
Make all controllers inherit from a single DeviseController
2012-01-02 11:24:33 -08:00
José Valim
a1464dbad7 Replace github.com/ by @ 2012-01-02 20:16:40 +01:00
José Valim
dd2a66d00c Update CHANGELOG. 2012-01-02 20:16:11 +01:00
José Valim
1152fda687 Only proxy to application controller if it exists. 2012-01-02 20:00:38 +01:00
José Valim
fd0e929087 Generate session routes for token authentication, but mark it as no_input. 2012-01-02 19:38:02 +01:00
José Valim
8b3e0e52f1 Generate routes again for token, closes #1526. 2012-01-02 19:27:05 +01:00
José Valim
8ff080fb99 Improve docs for params/http authenticatable. 2012-01-02 19:24:48 +01:00
José Valim
6bca228888 Merge pull request #1527 from joliss/generator
Use consistent number of hash signs
2012-01-02 10:21:41 -08:00
José Valim
fd1e588645 Merge pull request #1534 from jigyasa/master
Fix for a bug: Incorrect message for locked account
2012-01-02 10:04:17 -08:00
José Valim
024d9e6df7 Merge pull request #1537 from nashby/fix-issue-1530
regenerate confirmation token on reconfirmation
2011-12-31 04:03:14 -08:00
Vasiliy Ermolovich
aca8d3f34c regenerate confirmation token on reconfirmation, closes #1530 2011-12-31 14:22:58 +03:00
Jigyasa Makkar
e2030a740d Fixed a bug in lockable wherein when a user tries to login with correct password after being locked,
failed attempts count gets reset. When the user tries to login with an incorrect password next,
the message shown is for invalid password instead of locked account since this check
depended mainly on failed attempts count.
2011-12-29 23:57:39 +05:30
Jo Liss
27b745d04f Use consistent number of hash signs 2011-12-28 17:26:57 +01:00
José Valim
f712d07b23 Merge pull request #1516 from jm81/master
Move "include Devise::Models::Authenticatable" inside devise_modules_hook! call
2011-12-20 14:00:36 -08:00
Jared Morgan
f8ea5e0942 move include Devise::Models::Authenticatable inside devise_modules_hook! call
This allows alternate ORMs to run compatibility setup code before
Authenticatable is included.

The particular issue for dm-devise is that DataMapper does not have a
before_validation method, which is called when Authenticatable is included
(as of plataformatec/devise@bd27bf76). dm-devise adds before_validation in
it's devise_modules_hook!
2011-12-20 15:52:26 -06:00