github/devise
1
1
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2026-04-28 03:00:29 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,479 Commits 33 Branches 149 Tags
2aedb1bf795947f189183fbd1e479719463f6395
Commit Graph

2479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rafael Mendonça França
2aedb1bf79 Merge pull request #2843 from willnet/patch-1 
Fix homepage's schema
 2014-01-25 21:37:43 -08:00
Shinichi Maeshima
9d87aa55bd Fix homepage's schema 2014-01-26 14:31:26 +09:00
José Valim
791657f3ef Merge pull request #2842 from slant/patch-1 
Correct misspelling
 2014-01-22 23:48:12 -08:00
Ryan L. Cross
8981c3ef9b Correct misspelling 2014-01-23 00:44:32 -07:00
José Valim
7a9ae13baa Merge pull request #2835 from plataformatec/secrets 
Add support for Rails 4.1 secrets.
 2014-01-22 05:33:11 -08:00
Lucas Mazza
eba91e6580 Read the secret_key value from Rails secret_key_base. 
It is possible to override this by setting the `secret_key` manually
on the `devise.rb` initializer on your application.
 2014-01-22 11:13:25 -02:00
José Valim
d5e0171cb4 Merge pull request #2832 from jwworth/master 
Fix typos
 2014-01-09 08:03:25 -08:00
Jake Worth
61e87be580 Fix typos 2014-01-09 10:00:27 -06:00
José Valim
e16278966f Merge pull request #2826 from tobinibot/fix-maximum-attempts 
Fix off-by-one error in Lockable module
 2014-01-06 23:43:55 -08:00
Tobin Juday
2ba8275dcc Fix off-by-one error in Lockable module 
When using the maximum_attempts config, Devise actually let you fail n
+ 1 times, not n times.

See https://github.com/plataformatec/devise/issues/2825 for details.
 2014-01-06 23:51:45 -05:00
Vasiliy Ermolovich
72a0d9e350 Merge pull request #2822 from plataformatec/rails-4.1 
Fix specs on Rails 4.1
 2014-01-04 10:14:57 -08:00
Vasiliy Ermolovich
6d51e67fac properly change devise config in specs 2014-01-04 19:19:13 +03:00
Lucas Mazza
7b66133861 Remove subscriber block so it won't leak across the test suite. 2014-01-04 19:01:05 +03:00
Vasiliy Ermolovich
49086d0294 remove warnings regarding number extensions 2014-01-04 18:54:19 +03:00
Vasiliy Ermolovich
1b1be514c8 make webrat compatible with rails 4.1 2014-01-04 18:53:40 +03:00
Vasiliy Ermolovich
9dbc60d36d update mocha 2014-01-04 18:52:54 +03:00
José Valim
3db4444da8 Update CHANGELOG.md 
The described change was actually introduced in 2.2.4, closes #2804
 2014-01-04 09:48:04 +01:00
José Valim
7a654cdd04 Merge pull request #2809 from moisesweb/mv_access_lock_without_email 
lock_access! without sending email
 2014-01-04 00:37:38 -08:00
Lucas Mazza
02c2ec69dd Remove platform constraints from the extra gemfiles. 2014-01-03 11:53:13 -02:00
Lucas Mazza
dd95f3f3f7 Support custom port for MongoDB config 2014-01-03 11:23:34 -02:00
Lucas Mazza
0cb74efd79 Remove platform constraint from Gemfile since we do not support 1.8 anymore. 2014-01-03 11:23:01 -02:00
Lucas Mazza
517bde86d2 Update bundler on Travis. 2014-01-03 10:12:30 -02:00
Lucas Mazza
2665afa36f 2014, folks. 2014-01-03 10:12:23 -02:00
Lucas Mazza
0b84a0e7c6 Merge pull request #2819 from salimane/pr_ruby_2_1_0 
Add Ruby 2.1.0 to .travis.yml
 2014-01-03 03:50:11 -08:00
Salimane Adjao Moustapha
db204f33e0 Add Ruby 2.1.0 to .travis.yml 2014-01-03 11:39:16 +01:00
Rafael Mendonça França
89ce9c922c Merge pull request #2818 from jrmyward/issue-2770 
Edit is now configurable for devise registrations via path_name.
 2014-01-02 19:13:03 -08:00
Jeremy Ward
9d0d15b814 Updated documentation to use 1.9 hash syntax. 2014-01-02 19:02:36 -08:00
Jeremy Ward
b50fa74596 Edit is now configurable for devise registrations via path_name. 2014-01-02 17:49:37 -08:00
Moises Vargas M
be236fa6dd lock_access! without sending email 2013-12-24 11:51:24 -05:00
José Valim
01e029fd9b Merge pull request #2806 from keating/master 
revise readme
 2013-12-21 03:21:03 -08:00
keating
4652b3efa0 revise readme 2013-12-21 19:09:09 +08:00
José Valim
29da146c07 Merge pull request #2802 from schneems/schneems/raise_controller_omniauthable 
[close #2755] Raise incompatible route error
 2013-12-20 00:53:23 -08:00
schneems
a00921f417 [close #2755] Raise incompatible route error 
Right now if you try to use a route that you have defined in your `omniauth_callbacks` but you have not declared that resource to be `omniauthable` you will get a weird route missing error which causes the user to look in the routes for the fix:

```ruby
devise_for  :users, controllers: {omniauth_callbacks: "users/omniauth_callbacks"}
```

This PR checks to see if the mapping of `:user` has the module `omniauthable` included in it when `omniauth_callbacks` is specified in the route. If it does not, an instructional error is raised:

```
Mapping omniauth_callbacks on a resource that is not omniauthable
Please add `devise :omniauthable` to the `User` model
```
 2013-12-18 19:19:25 -06:00
Rafael Mendonça França
71c43926e0 Add security related email address 2013-12-16 17:49:21 -02:00
Erich Kist
380ab682c5 Update travis to run with Rails 3.2-stable, 4.0-stable and master 2013-12-10 19:09:49 -02:00
José Valim
714176994b Merge pull request #2784 from yokomizor/remove_authentication_token_stuffs 
Remove authentication some authentication token stuffs
 2013-12-10 06:44:46 -08:00
Rogério Yokomizo
8ca34aa41e Remove authentication some authentication token stuffs 
Since we don't have authentication token, we don't have to check if
password is "X".

:authentication_token don't have to be in the blacklist for
serialization too.
 2013-12-10 12:30:28 -02:00
José Valim
3adeba38f5 Merge pull request #2763 from paulanunda/master 
Fixed small grammatical error in en.yml
 2013-12-09 21:50:20 -08:00
Luiz H. D. Costa
5b6f1e8f80 Merge pull request #2774 from yokomizor/fix_typo 
Fix typo
 2013-12-05 04:45:29 -08:00
Rogério Yokomizo
16ec143228 fix typo and some clarification 2013-12-05 10:39:42 -02:00
José Valim
c67de7e91c Merge pull request #2772 from sferik/gender_neutral_pronouns 
Remove a couple more gendered pronouns
 2013-12-05 00:09:48 -08:00
Erik Michaels-Ober
3f03ec02ad Cleanup trailing whitespace 2013-12-05 09:03:32 +01:00
Erik Michaels-Ober
4e7cd18a04 Remove a couple more gendered pronouns 2013-12-05 09:03:28 +01:00
Rafael Mendonça França
01f4a8f441 Merge pull request #2767 from bartoszkopinski/master 
Removing regexp anchors in routing constraints
 2013-12-02 12:39:27 -08:00
Bartosz Kopiński
53893edec8 Removing regexp anchors in routing constraints 
They're not allowed according to:
http://guides.rubyonrails.org/routing.html#segment-constraints
 2013-12-02 21:27:23 +01:00
José Valim
7d11427116 Merge pull request #2766 from sferik/gender_neutral_pronouns 
Removed use of gendered pronouns
 2013-12-02 01:22:46 -08:00
Erik Michaels-Ober
26e85c44e2 Removed use of gendered pronouns 2013-12-02 10:02:17 +01:00
Paul Anunda
43282f738e Fixed small grammatical error in en.yml 2013-11-28 10:29:50 -06:00
Vasiliy Ermolovich
c2718806a7 Merge pull request #2761 from reu/patch-1 
Small typo. [ci skip]
 2013-11-28 03:01:49 -08:00
Rodrigo Navarro
3e3a3ad102 Small typo. 2013-11-28 09:00:59 -02:00