José Valim
9327cf8af5
Merge pull request #1903 from zamith/master
...
Routes for engines
2012-06-08 10:05:56 -07:00
Zamith
512b52e23a
Adding option to change omniauth path prefix
2012-06-08 17:50:33 +01:00
José Valim
5df7105301
Merge pull request #1902 from gbataille/master
...
Redirect to sign_in page when trying to access password#edit without a reset password token
2012-06-08 01:19:05 -07:00
Gregory Bataille
a84fdb771f
Merge branches 'master' and 'no_token'
2012-06-08 10:08:50 +02:00
Gregory Bataille
ff75341c75
Redirect to sign in page when trying to access password#edit without a
...
reset_password_token (i.e. not coming from a reset password email)
2012-06-08 10:08:35 +02:00
Carlos Antonio da Silva
f0d48a96ca
Fix rdoc rake task [ci skip]
2012-06-07 22:48:15 -03:00
José Valim
215fdf119e
Better error message when mapping can't be found
2012-06-07 14:34:13 +03:00
José Valim
985b646ee1
Update README.md, closes #1895
2012-06-07 14:31:43 +03:00
José Valim
622e480c4b
Merge pull request #1892 from clody69/master
...
Fixed User model generation for Mongoid
2012-06-07 01:09:54 -07:00
José Valim
2e78a46c52
Merge pull request #1896 from Antiarchitect/patch-1
...
In addition to #1722 . expire_auth_token_on_timeout added to Timeoutable configuration block.
2012-06-07 01:09:05 -07:00
Andrey Voronkov
b1b6e53d6f
In addition to #1722 . expire_auth_token_on_timeout added to Timeoutable configuration block.
2012-06-07 09:32:44 +04:00
José Valim
65325f7f81
Merge pull request #1894 from wtn/master
...
#update_with_password should use mass assignment options when password is not valid
2012-06-05 01:15:51 -07:00
William T Nelson
9bd82e5a24
use mass assignment options when password is not valid
2012-06-04 22:52:09 -05:00
Claudio Riva
0689b4558e
Update master
2012-06-03 22:24:31 +03:00
Rafael Mendonça França
dbea934701
Update README.md [ci skip]
2012-05-29 17:28:57 -03:00
Rafael Mendonça França
8e4d5fb38f
Merge pull request #1882 from GeekOnCoffee/patch-1
...
URLs that aren't links aren't nice
2012-05-29 13:26:56 -07:00
Andrew Hooker
e324ee9823
URLs that aren't links aren't nice
2012-05-29 15:24:34 -05:00
José Valim
54e9cabf5d
Update README.md
2012-05-29 16:46:58 +03:00
José Valim
7a3f6fb53d
Merge pull request #1880 from brynary/codeclimate-badge
...
Add Code Climate badge to README
2012-05-29 05:54:49 -07:00
Bryan Helmkamp
59a9576498
Add Code Climate badge to README
2012-05-29 08:46:48 -04:00
José Valim
57eb3886ba
Refactor router.rb a bit based on Code Climate feedback: https://codeclimate.com/github/plataformatec/devise/Devise
2012-05-29 11:29:09 +02:00
Rafael Mendonça França
fe9e6db0e2
Merge pull request #1876 from shaliko/master
...
Remove not used variables
2012-05-26 09:36:30 -07:00
Shaliko Usubov
db8eeb6c6e
Remove not used variables
2012-05-26 20:31:42 +04:00
José Valim
2b7328535d
Check for the request before checking for the mapping, closes #1859
2012-05-25 09:39:50 +02:00
José Valim
d4e5424360
Simplify validation logic inside strategies
2012-05-22 14:10:06 +02:00
José Valim
d67d992749
Merge pull request #1865 from nirvdrum/patch-1
...
Simple compose VS comprise grammar fix.
2012-05-21 03:33:57 -07:00
Kevin Menard
b6c7aafe55
Simple compose VS comprise grammar fix.
2012-05-20 23:04:53 -03:00
José Valim
9829384829
Merge pull request #1864 from nashby/update-views
...
use implicit partials rendering and update simple_form templates
2012-05-20 12:17:19 -07:00
Vasiliy Ermolovich
1d79c1982a
use implicit partials rendering
...
make simple_form templates consistent with templates
that generates by simple_form itself
612c0067cf
2012-05-20 22:01:11 +03:00
José Valim
f6259531c3
Update CHANGELOG.rdoc
2012-05-17 13:25:07 +03:00
José Valim
ed03039d19
Merge pull request #1857 from pomnikita/master
...
Remove devise/schema from autoloads
2012-05-17 02:27:30 -07:00
Nikita Pomyashchiy
b6abc4623b
Remove autoload of deprecated devise/schema
2012-05-17 13:13:19 +04:00
Carlos Antonio da Silva
d1949b7b42
Fix indent, remove not used variable
2012-05-15 17:22:52 -03:00
Carlos Antonio da Silva
b6e30427a3
Pass the block argument straight to the assertion methods in test helpers
2012-05-15 17:19:21 -03:00
Carlos Antonio da Silva
96e0dcf5d5
Remove not used variable, fix indent
2012-05-15 17:14:05 -03:00
Carlos Antonio da Silva
ab48435211
Remove warning with shadowing variable
2012-05-15 15:27:46 -03:00
Carlos Antonio da Silva
8bcb05d6c0
Cache constant on check fields
2012-05-15 15:20:01 -03:00
Carlos Antonio da Silva
6b363d6af9
Build only one model instance for checking fields
2012-05-15 15:12:18 -03:00
Carlos Antonio da Silva
2fd2a8662d
Define the accessor right away instead of open + send
2012-05-15 15:05:21 -03:00
Rodrigo Flores
f1db0809b1
Bumping to 2.1.0
2012-05-15 14:14:41 -03:00
Rodrigo Flores
30ca072f50
Fixing README to reflect 2.1.0 release
2012-05-15 14:14:40 -03:00
José Valim
85ea53198a
Merge pull request #1853 from adzap/master
...
Add resource_params controller method as helper to allow overriding params used to build resource
2012-05-15 01:21:18 -07:00
Adam Meehan
7ec4c1424d
Add resource_params internal helper to param filtering
...
In light of recent discussions around mass assignment security and
the alternate solution of using the controller to filter params, not the model,
a hook/helper is needed to be able to override how the params are filtered
before they are used to build the resource.
2012-05-15 18:07:02 +10:00
Rodrigo Flores
f95513e86b
Merge branch 'asanghi-fixes'
2012-05-14 17:53:52 -03:00
Rodrigo Flores
8baacecdcf
Fixing tests
2012-05-14 17:53:34 -03:00
Aditya Sanghi
ff6e30cec4
Minor updates suggested to default language in locales. Be consistent with "email" and "e-mail"; email address exists "in" our database not "on" our database.
2012-05-14 17:44:51 -03:00
Rodrigo Flores
308275c8a8
Fixing a phrase on README
2012-05-14 10:37:30 -03:00
Rodrigo Flores
5ed6534aa3
Adding a line break on resource generator after attr_accessible
...
Fixes issue #1851
2012-05-14 10:26:30 -03:00
Rodrigo Flores
120ca0e3a5
Merge branch 'fork-readme-rdoc-links'
2012-05-10 10:40:38 -03:00
Hosam Aly
d193802613
Added links to module RDocs, except for Encryptable which I couldn't find.
2012-05-10 10:40:27 -03:00
