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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b0e0bfc8
Commit
b0e0bfc8
authored
Apr 05, 2017
by
Alexis Reigel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use common layout for devise mailer
parent
2fbe116c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
23 deletions
+23
-23
app/mailers/devise_mailer.rb
app/mailers/devise_mailer.rb
+3
-1
app/views/devise/mailer/password_change.html.haml
app/views/devise/mailer/password_change.html.haml
+9
-10
app/views/devise/mailer/reset_password_instructions.html.haml
...views/devise/mailer/reset_password_instructions.html.haml
+11
-12
No files found.
app/mailers/devise_mailer.rb
View file @
b0e0bfc8
...
@@ -2,7 +2,9 @@ class DeviseMailer < Devise::Mailer
...
@@ -2,7 +2,9 @@ class DeviseMailer < Devise::Mailer
default
from:
"
#{
Gitlab
.
config
.
gitlab
.
email_display_name
}
<
#{
Gitlab
.
config
.
gitlab
.
email_from
}
>"
default
from:
"
#{
Gitlab
.
config
.
gitlab
.
email_display_name
}
<
#{
Gitlab
.
config
.
gitlab
.
email_from
}
>"
default
reply_to:
Gitlab
.
config
.
gitlab
.
email_reply_to
default
reply_to:
Gitlab
.
config
.
gitlab
.
email_reply_to
layout
'devise_mailer'
layout
'mailer'
helper
EmailsHelper
protected
protected
...
...
app/views/devise/mailer/password_change.html.haml
View file @
b0e0bfc8
.center
=
render
layout:
'layouts/mailer/default_content'
do
#content
Hello,
#{
@resource
.
name
}
!
%h2
Hello,
#{
@resource
.
name
}
!
%p
%p
The password for your GitLab account on
The password for your GitLab account on
#{
link_to
(
Gitlab
.
config
.
gitlab
.
url
,
Gitlab
.
config
.
gitlab
.
url
)
}
#{
link_to
(
Gitlab
.
config
.
gitlab
.
url
,
Gitlab
.
config
.
gitlab
.
url
)
}
...
...
app/views/devise/mailer/reset_password_instructions.html.haml
View file @
b0e0bfc8
.center
=
render
layout:
'layouts/mailer/default_content'
do
#content
Hello,
#{
@resource
.
name
}
!
%h2
Hello,
#{
@resource
.
name
}
!
%p
%p
Someone, hopefully you, has requested to reset the password for your
Someone, hopefully you, has requested to reset the password for your
GitLab account on
#{
link_to
(
Gitlab
.
config
.
gitlab
.
url
,
Gitlab
.
config
.
gitlab
.
url
)
}
.
GitLab account on
#{
link_to
(
Gitlab
.
config
.
gitlab
.
url
,
Gitlab
.
config
.
gitlab
.
url
)
}
.
...
...
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