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
Tatuya Kamada
gitlab-ce
Commits
108be8a6
Commit
108be8a6
authored
Jul 10, 2014
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to accomodate devise deprecations and backward incompatible changes.
parent
1e3fce1a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
5 deletions
+8
-5
app/controllers/application_controller.rb
app/controllers/application_controller.rb
+2
-2
app/views/devise/mailer/confirmation_instructions.html.erb
app/views/devise/mailer/confirmation_instructions.html.erb
+1
-1
app/views/devise/mailer/reset_password_instructions.html.erb
app/views/devise/mailer/reset_password_instructions.html.erb
+1
-1
app/views/devise/mailer/unlock_instructions.html.erb
app/views/devise/mailer/unlock_instructions.html.erb
+1
-1
config/locales/devise.en.yml
config/locales/devise.en.yml
+3
-0
No files found.
app/controllers/application_controller.rb
View file @
108be8a6
...
@@ -246,8 +246,8 @@ class ApplicationController < ActionController::Base
...
@@ -246,8 +246,8 @@ class ApplicationController < ActionController::Base
end
end
def
configure_permitted_parameters
def
configure_permitted_parameters
devise_parameter_sanitizer
.
for
(
:sign_in
)
{
|
u
|
u
.
permit
(
:username
,
:email
,
:password
,
:login
,
:remember_me
)
}
devise_parameter_sanitizer
.
sanitize
(
:sign_in
)
{
|
u
|
u
.
permit
(
:username
,
:email
,
:password
,
:login
,
:remember_me
)
}
devise_parameter_sanitizer
.
for
(
:sign_up
)
{
|
u
|
u
.
permit
(
:username
,
:email
,
:name
,
:password
,
:password_confirmation
)
}
devise_parameter_sanitizer
.
sanitize
(
:sign_up
)
{
|
u
|
u
.
permit
(
:username
,
:email
,
:name
,
:password
,
:password_confirmation
)
}
end
end
def
hexdigest
(
string
)
def
hexdigest
(
string
)
...
...
app/views/devise/mailer/confirmation_instructions.html.erb
View file @
108be8a6
...
@@ -6,4 +6,4 @@
...
@@ -6,4 +6,4 @@
<p>
You can confirm your account through the link below:
</p>
<p>
You can confirm your account through the link below:
</p>
<%
end
%>
<%
end
%>
<p>
<%=
link_to
'Confirm my account'
,
confirmation_url
(
@resource
,
confirmation_token:
@
resource
.
confirmation_
token
)
%>
</p>
<p>
<%=
link_to
'Confirm my account'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
%>
</p>
app/views/devise/mailer/reset_password_instructions.html.erb
View file @
108be8a6
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<p>
Someone has requested a link to change your password, and you can do this through the link below.
</p>
<p>
Someone has requested a link to change your password, and you can do this through the link below.
</p>
<p>
<%=
link_to
'Change my password'
,
edit_password_url
(
@resource
,
reset_password_token:
@
resource
.
reset_password_
token
)
%>
</p>
<p>
<%=
link_to
'Change my password'
,
edit_password_url
(
@resource
,
reset_password_token:
@token
)
%>
</p>
<p>
If you didn't request this, please ignore this email.
</p>
<p>
If you didn't request this, please ignore this email.
</p>
<p>
Your password won't change until you access the link above and create a new one.
</p>
<p>
Your password won't change until you access the link above and create a new one.
</p>
app/views/devise/mailer/unlock_instructions.html.erb
View file @
108be8a6
...
@@ -4,4 +4,4 @@
...
@@ -4,4 +4,4 @@
<p>
Click the link below to unlock your account:
</p>
<p>
Click the link below to unlock your account:
</p>
<p>
<%=
link_to
'Unlock my account'
,
unlock_url
(
@resource
,
unlock_token:
@
resource
.
unlock_
token
)
%>
</p>
<p>
<%=
link_to
'Unlock my account'
,
unlock_url
(
@resource
,
unlock_token:
@token
)
%>
</p>
config/locales/devise.en.yml
View file @
108be8a6
...
@@ -25,6 +25,9 @@ en:
...
@@ -25,6 +25,9 @@ en:
sessions
:
sessions
:
signed_in
:
'
Signed
in
successfully.'
signed_in
:
'
Signed
in
successfully.'
signed_out
:
'
Signed
out
successfully.'
signed_out
:
'
Signed
out
successfully.'
users_sessions
:
user
:
signed_in
:
'
Signed
in
successfully.'
passwords
:
passwords
:
send_instructions
:
'
You
will
receive
an
email
with
instructions
about
how
to
reset
your
password
in
a
few
minutes.'
send_instructions
:
'
You
will
receive
an
email
with
instructions
about
how
to
reset
your
password
in
a
few
minutes.'
updated
:
'
Your
password
was
changed
successfully.
You
are
now
signed
in.'
updated
:
'
Your
password
was
changed
successfully.
You
are
now
signed
in.'
...
...
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