home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 04:26:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-gh-issue-9640' into 'master'

Browse Source 
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
This commit is contained in:
Dmitriy Zaporozhets
2015-09-17 07:27:41 +00:00
parent 480e713c8f b71a9fcdeb
commit efa90d0a14
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+1
View File
@@ -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)
app/views/notify/new_user_email.html.haml
+1 -1
View File
@@ -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