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
714c062b
Commit
714c062b
authored
7 years ago
by
bitsapien
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed account confirmation line to e-mail text. This MR fixes issue #13637
added changelog
parent
76b2a127
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
app/views/devise/mailer/confirmation_instructions.html.haml
app/views/devise/mailer/confirmation_instructions.html.haml
+3
-2
changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml
...d/13637-show-account-confirmation-link-in-e-mail-text.yml
+5
-0
No files found.
app/views/devise/mailer/confirmation_instructions.html.haml
View file @
714c062b
-
confirmation_link
=
confirmation_url
(
@resource
,
confirmation_token:
@token
)
-
if
@resource
.
unconfirmed_email
.
present?
#content
=
email_default_heading
(
@resource
.
unconfirmed_email
)
%p
Click the link below to confirm your email address.
#cta
=
link_to
'Confirm your email address'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
=
link_to
confirmation_link
,
confirmation_link
-
else
#content
-
if
Gitlab
.
com?
...
...
@@ -12,4 +13,4 @@
=
email_default_heading
(
"Welcome,
#{
@resource
.
name
}
!"
)
%p
To get started, click the link below to confirm your account.
#cta
=
link_to
'Confirm your account'
,
confirmation_url
(
@resource
,
confirmation_token:
@token
)
=
link_to
confirmation_link
,
confirmation_link
This diff is collapsed.
Click to expand it.
changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml
0 → 100644
View file @
714c062b
---
title
:
Confirmation email shows link as text instead of human readable text
merge_request
:
14243
author
:
bitsapien
type
:
changed
This diff is collapsed.
Click to expand it.
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