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
a6045df7
Commit
a6045df7
authored
Sep 06, 2017
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move #cta properly under #content
parent
b1e68922
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
app/views/devise/mailer/_confirmation_instructions_account.html.haml
...evise/mailer/_confirmation_instructions_account.html.haml
+4
-4
app/views/devise/mailer/_confirmation_instructions_secondary.html.haml
...ise/mailer/_confirmation_instructions_secondary.html.haml
+5
-5
No files found.
app/views/devise/mailer/_confirmation_instructions_account.html.haml
View file @
a6045df7
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
#content
#content
=
email_default_heading
(
@resource
.
unconfirmed_email
)
=
email_default_heading
(
@resource
.
unconfirmed_email
)
%p
Click the link below to confirm your email address.
%p
Click the link below to confirm your email address.
#cta
#cta
=
link_to
'Confirm your email address'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
=
link_to
'Confirm your email address'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
-
else
-
else
#content
#content
-
if
Gitlab
.
com?
-
if
Gitlab
.
com?
...
@@ -11,5 +11,5 @@
...
@@ -11,5 +11,5 @@
-
else
-
else
=
email_default_heading
(
"Welcome,
#{
@resource
.
name
}
!"
)
=
email_default_heading
(
"Welcome,
#{
@resource
.
name
}
!"
)
%p
To get started, click the link below to confirm your account.
%p
To get started, click the link below to confirm your account.
#cta
#cta
=
link_to
'Confirm your account'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
=
link_to
'Confirm your account'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
app/views/devise/mailer/_confirmation_instructions_secondary.html.haml
View file @
a6045df7
#content
#content
=
email_default_heading
(
"
#{
@resource
.
user
.
name
}
, you've added an additional email!"
)
=
email_default_heading
(
"
#{
@resource
.
user
.
name
}
, you've added an additional email!"
)
%p
Click the link below to confirm your email address (
#{
@resource
.
email
}
)
%p
Click the link below to confirm your email address (
#{
@resource
.
email
}
)
#cta
#cta
=
link_to
'Confirm your email address'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
=
link_to
'Confirm your email address'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
%p
%p
If this email was added in error, you can remove it here:
If this email was added in error, you can remove it here:
=
link_to
"Emails"
,
profile_emails_url
=
link_to
"Emails"
,
profile_emails_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