Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
65337118
Commit
65337118
authored
Jul 06, 2012
by
Nihad Abbasov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
enable lockable strategy for users
parent
2abd054b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
7 deletions
+15
-7
app/models/user.rb
app/models/user.rb
+2
-2
config/initializers/devise.rb
config/initializers/devise.rb
+4
-4
db/migrate/20120706065612_add_lockable_to_users.rb
db/migrate/20120706065612_add_lockable_to_users.rb
+6
-0
db/schema.rb
db/schema.rb
+3
-1
No files found.
app/models/user.rb
View file @
65337118
class
User
<
ActiveRecord
::
Base
class
User
<
ActiveRecord
::
Base
include
Account
include
Account
devise
:database_authenticatable
,
:token_authenticatable
,
devise
:database_authenticatable
,
:token_authenticatable
,
:lockable
,
:recoverable
,
:rememberable
,
:trackable
,
:validatable
,
:omniauthable
:recoverable
,
:rememberable
,
:trackable
,
:validatable
,
:omniauthable
attr_accessible
:email
,
:password
,
:password_confirmation
,
:remember_me
,
:bio
,
attr_accessible
:email
,
:password
,
:password_confirmation
,
:remember_me
,
:bio
,
...
...
config/initializers/devise.rb
View file @
65337118
...
@@ -115,7 +115,7 @@ Devise.setup do |config|
...
@@ -115,7 +115,7 @@ Devise.setup do |config|
# Defines which strategy will be used to lock an account.
# Defines which strategy will be used to lock an account.
# :failed_attempts = Locks an account after a number of failed attempts to sign in.
# :failed_attempts = Locks an account after a number of failed attempts to sign in.
# :none = No lock strategy. You should handle locking by yourself.
# :none = No lock strategy. You should handle locking by yourself.
#
config.lock_strategy = :failed_attempts
config
.
lock_strategy
=
:failed_attempts
# Defines which key will be used when locking and unlocking an account
# Defines which key will be used when locking and unlocking an account
# config.unlock_keys = [ :email ]
# config.unlock_keys = [ :email ]
...
@@ -125,14 +125,14 @@ Devise.setup do |config|
...
@@ -125,14 +125,14 @@ Devise.setup do |config|
# :time = Re-enables login after a certain amount of time (see :unlock_in below)
# :time = Re-enables login after a certain amount of time (see :unlock_in below)
# :both = Enables both strategies
# :both = Enables both strategies
# :none = No unlock strategy. You should handle unlocking by yourself.
# :none = No unlock strategy. You should handle unlocking by yourself.
# config.unlock_strategy = :both
config
.
unlock_strategy
=
:time
# Number of authentication tries before locking an account if lock_strategy
# Number of authentication tries before locking an account if lock_strategy
# is failed attempts.
# is failed attempts.
# config.maximum_attempts = 2
0
config
.
maximum_attempts
=
1
0
# Time interval to unlock the account if :time is enabled as unlock_strategy.
# Time interval to unlock the account if :time is enabled as unlock_strategy.
# config.unlock_in = 1.hour
config
.
unlock_in
=
10
.
minutes
# ==> Configuration for :recoverable
# ==> Configuration for :recoverable
#
#
...
...
db/migrate/20120706065612_add_lockable_to_users.rb
0 → 100644
View file @
65337118
class
AddLockableToUsers
<
ActiveRecord
::
Migration
def
change
add_column
:users
,
:failed_attempts
,
:integer
,
:default
=>
0
add_column
:users
,
:locked_at
,
:datetime
end
end
db/schema.rb
View file @
65337118
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
#
#
# It's strongly recommended to check this file into your version control system.
# It's strongly recommended to check this file into your version control system.
ActiveRecord
::
Schema
.
define
(
:version
=>
20120
627145613
)
do
ActiveRecord
::
Schema
.
define
(
:version
=>
20120
706065612
)
do
create_table
"events"
,
:force
=>
true
do
|
t
|
create_table
"events"
,
:force
=>
true
do
|
t
|
t
.
string
"target_type"
t
.
string
"target_type"
...
@@ -169,6 +169,8 @@ ActiveRecord::Schema.define(:version => 20120627145613) do
...
@@ -169,6 +169,8 @@ ActiveRecord::Schema.define(:version => 20120627145613) do
t
.
integer
"theme_id"
,
:default
=>
1
,
:null
=>
false
t
.
integer
"theme_id"
,
:default
=>
1
,
:null
=>
false
t
.
string
"bio"
t
.
string
"bio"
t
.
boolean
"blocked"
,
:default
=>
false
,
:null
=>
false
t
.
boolean
"blocked"
,
:default
=>
false
,
:null
=>
false
t
.
integer
"failed_attempts"
,
:default
=>
0
t
.
datetime
"locked_at"
end
end
add_index
"users"
,
[
"email"
],
:name
=>
"index_users_on_email"
,
:unique
=>
true
add_index
"users"
,
[
"email"
],
:name
=>
"index_users_on_email"
,
:unique
=>
true
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment