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

Merge branch 'samrose3/gitlab-ce-help-ui-alerts-url-fix' 

See merge request !6915
This commit is contained in:
Rémy Coutable 2016-10-26 12:42:21 +02:00
parent 3c270ab36f 8eda73619b
commit 70074733bb
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.md
View File

@ -9,6 +9,7 @@ Please view this file on the master branch, on stable branches it's out of date.
- Fix HipChat notifications rendering (airatshigapov, eisnerd)
- Add hover to trash icon in notes !7008 (blackst0ne)
- Escape ref and path for relative links !6050 (winniehell)
- Fixed link typo on /help/ui to Alerts section. !6915 (Sam Rose)
- Simpler arguments passed to named_route on toggle_award_url helper method
- Fix: Backup restore doesn't clear cache
- Replace jquery.cookie plugin with js.cookie !7085

2
app/views/help/ui.html.haml
View File

@ -461,7 +461,7 @@
.panel-body
= lorem
%h2#alert Alerts
%h2#alerts Alerts
.row
.col-md-6