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

Merge branch 'fix-gh-issue-9640' into 'master'
efa90d0a · Dmitriy Zaporozhets · 480e713c · b71a9fcd · efa90d0a · efa90d0a
Commit efa90d0a authored Sep 17, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

new_user_email.html.haml app/views/notify/new_user_email.html.haml +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
 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)

--- 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