summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-17 07:27:41 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-09-17 07:27:41 +0000
commitefa90d0a14805d48a0693cbd5f05bbe008ee6b6e (patch)
tree11d7f7d7f9e3a05ca7383abb1b3526060eb19621
parent480e713c8f1cb240d00b1b2659ef206a164e3733 (diff)
parentb71a9fcdebe722442e404334954be1908de22a22 (diff)
downloadgitlab-ce-efa90d0a14805d48a0693cbd5f05bbe008ee6b6e.tar.gz
Merge branch 'fix-gh-issue-9640' into 'master'
Fix HTML link that was improperly escaped in new user e-mail ### Before: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/e42e73f04971d8dd949b034846d2bb9f/image.png) ### After: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/90425911345031a4b8e9374323728f79/image.png) Closes https://github.com/gitlabhq/gitlabhq/issues/9640 See merge request !1323
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/notify/new_user_email.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ee70789babc..082970e0cfd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 8.0.0 (unreleased)
+ - Fix HTML link that was improperly escaped in new user e-mail (Stan Hu)
- Fix broken sort in merge request API (Stan Hu)
- Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs (Stan Hu)
- Gracefully handle errors in syntax highlighting by leaving the block unformatted (Stan Hu)
diff --git a/app/views/notify/new_user_email.html.haml b/app/views/notify/new_user_email.html.haml
index 4feacdaacff..6b9b42dcf37 100644
--- a/app/views/notify/new_user_email.html.haml
+++ b/app/views/notify/new_user_email.html.haml
@@ -13,4 +13,4 @@
%p
= link_to "Click here to set your password", edit_password_url(@user, reset_password_token: @token)
%p
- = reset_token_expire_message
+ = raw reset_token_expire_message