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
Boxiang Sun
gitlab-ce
Commits
ed9543ff
Commit
ed9543ff
authored
Feb 28, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update devise gem
parent
00ae65b1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
Gemfile.lock
Gemfile.lock
+4
-4
config/initializers/devise.rb
config/initializers/devise.rb
+1
-1
config/locales/devise.en.yml
config/locales/devise.en.yml
+1
-0
No files found.
Gemfile.lock
View file @
ed9543ff
...
@@ -128,7 +128,7 @@ GEM
...
@@ -128,7 +128,7 @@ GEM
daemons (1.1.9)
daemons (1.1.9)
database_cleaner (0.9.1)
database_cleaner (0.9.1)
debug_inspector (0.0.2)
debug_inspector (0.0.2)
devise (2.1.
2
)
devise (2.1.
3
)
bcrypt-ruby (~> 3.0)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
orm_adapter (~> 0.1)
railties (~> 3.1)
railties (~> 3.1)
...
@@ -219,7 +219,7 @@ GEM
...
@@ -219,7 +219,7 @@ GEM
multi_json (~> 1.0)
multi_json (~> 1.0)
multi_xml
multi_xml
httpauth (0.2.0)
httpauth (0.2.0)
i18n (0.6.
1
)
i18n (0.6.
4
)
journey (1.0.4)
journey (1.0.4)
jquery-atwho-rails (0.1.7)
jquery-atwho-rails (0.1.7)
jquery-rails (2.1.3)
jquery-rails (2.1.3)
...
@@ -343,7 +343,7 @@ GEM
...
@@ -343,7 +343,7 @@ GEM
rb-fsevent (0.9.2)
rb-fsevent (0.9.2)
rb-inotify (0.8.8)
rb-inotify (0.8.8)
ffi (>= 0.5.0)
ffi (>= 0.5.0)
rdoc (3.12.
1
)
rdoc (3.12.
2
)
json (~> 1.4)
json (~> 1.4)
redcarpet (2.2.2)
redcarpet (2.2.2)
redis (3.0.2)
redis (3.0.2)
...
@@ -428,7 +428,7 @@ GEM
...
@@ -428,7 +428,7 @@ GEM
eventmachine (>= 0.12.6)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
rack (>= 1.0.0)
thor (0.17.0)
thor (0.17.0)
tilt (1.3.
3
)
tilt (1.3.
4
)
timers (1.1.0)
timers (1.1.0)
treetop (1.4.12)
treetop (1.4.12)
polyglot
polyglot
...
...
config/initializers/devise.rb
View file @
ed9543ff
...
@@ -99,7 +99,7 @@ Devise.setup do |config|
...
@@ -99,7 +99,7 @@ Devise.setup do |config|
# ==> Configuration for :validatable
# ==> Configuration for :validatable
# Range for password length. Default is 6..128.
# Range for password length. Default is 6..128.
#
config.password_length = 6..128
config
.
password_length
=
6
..
128
# Email regex used to validate email formats. It simply asserts that
# Email regex used to validate email formats. It simply asserts that
# an one (and only one) @ exists in the given string. This is mainly
# an one (and only one) @ exists in the given string. This is mainly
...
...
config/locales/devise.en.yml
View file @
ed9543ff
...
@@ -17,6 +17,7 @@ en:
...
@@ -17,6 +17,7 @@ en:
unauthenticated
:
'
You
need
to
sign
in
before
continuing.'
unauthenticated
:
'
You
need
to
sign
in
before
continuing.'
unconfirmed
:
'
You
have
to
confirm
your
account
before
continuing.'
unconfirmed
:
'
You
have
to
confirm
your
account
before
continuing.'
locked
:
'
Your
account
is
locked.'
locked
:
'
Your
account
is
locked.'
not_found_in_database
:
'
Invalid
email
or
password.'
invalid
:
'
Invalid
email
or
password.'
invalid
:
'
Invalid
email
or
password.'
invalid_token
:
'
Invalid
authentication
token.'
invalid_token
:
'
Invalid
authentication
token.'
timeout
:
'
Your
session
expired,
please
sign
in
again
to
continue.'
timeout
:
'
Your
session
expired,
please
sign
in
again
to
continue.'
...
...
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