diff options
author | Rémy Coutable <remy@rymai.me> | 2016-10-26 12:42:21 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-26 12:42:21 +0200 |
commit | 70074733bb5f8dd09d3389b8873da22c39d52b50 (patch) | |
tree | 07dc223b631a00d4cbd727ca81a7ff3e2f93d081 | |
parent | 3c270ab36f102c46d23b92902895da26e238b7f5 (diff) | |
parent | 8eda73619bb0c42ed2bf6221b1766f010ef93f69 (diff) | |
download | gitlab-ce-70074733bb5f8dd09d3389b8873da22c39d52b50.tar.gz |
Merge branch 'samrose3/gitlab-ce-help-ui-alerts-url-fix'
See merge request !6915
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | app/views/help/ui.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e61165b2826..5592625efcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml index d16bd61b779..070ed90da6d 100644 --- a/app/views/help/ui.html.haml +++ b/app/views/help/ui.html.haml @@ -461,7 +461,7 @@ .panel-body = lorem - %h2#alert Alerts + %h2#alerts Alerts .row .col-md-6 |