kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix HTML link that was improperly escaped in new user e-mail

Browse source 
Closes https://github.com/gitlabhq/gitlabhq/issues/9640
This commit is contained in:
Stan Hu 2015-09-16 21:24:53 -07:00
parent cac969229a
commit b71a9fcdeb
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 8.0.0 (unreleased) 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) - 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) - 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) - Gracefully handle errors in syntax highlighting by leaving the block unformatted (Stan Hu)

2
app/views/notify/new_user_email.html.haml
View file

@ -13,4 +13,4 @@
%p %p
= link_to "Click here to set your password", edit_password_url(@user, reset_password_token: @token) = link_to "Click here to set your password", edit_password_url(@user, reset_password_token: @token)
%p %p
= reset_token_expire_message = raw reset_token_expire_message