BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
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
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
devise_mailer.rb
app/mailers/devise_mailer.rb
+3
-1
password_change.html.haml
app/views/devise/mailer/password_change.html.haml
+2
-3
reset_password_instructions.html.haml
...views/devise/mailer/reset_password_instructions.html.haml
+2
-3
No files found.
app/mailers/devise_mailer.rb
View file @
b0e0bfc8
...
...
@@ -2,7 +2,9 @@ class DeviseMailer < Devise::Mailer
default
from:
"
#{
Gitlab
.
config
.
gitlab
.
email_display_name
}
<
#{
Gitlab
.
config
.
gitlab
.
email_from
}
>"
default
reply_to:
Gitlab
.
config
.
gitlab
.
email_reply_to
layout
'devise_mailer'
layout
'mailer'
helper
EmailsHelper
protected
...
...
app/views/devise/mailer/password_change.html.haml
View file @
b0e0bfc8
.center
#content
%h2
Hello,
#{
@resource
.
name
}
!
=
render
layout:
'layouts/mailer/default_content'
do
Hello,
#{
@resource
.
name
}
!
%p
The password for your GitLab account on
#{
link_to
(
Gitlab
.
config
.
gitlab
.
url
,
Gitlab
.
config
.
gitlab
.
url
)
}
...
...
app/views/devise/mailer/reset_password_instructions.html.haml
View file @
b0e0bfc8
.center
#content
%h2
Hello,
#{
@resource
.
name
}
!
=
render
layout:
'layouts/mailer/default_content'
do
Hello,
#{
@resource
.
name
}
!
%p
Someone, hopefully you, has requested to reset the password for your
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