Skip to content

G
gitlab-ce
Commit 70074733 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

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

See merge request !6915
parents 3c270ab3 8eda7361
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
CHANGELOG.md
View file @ 70074733
...@@ -9,6 +9,7 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -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) - Fix HipChat notifications rendering (airatshigapov, eisnerd)
- Add hover to trash icon in notes !7008 (blackst0ne) - Add hover to trash icon in notes !7008 (blackst0ne)
- Escape ref and path for relative links !6050 (winniehell) - 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 - Simpler arguments passed to named_route on toggle_award_url helper method
- Fix: Backup restore doesn't clear cache - Fix: Backup restore doesn't clear cache
- Replace jquery.cookie plugin with js.cookie !7085 - Replace jquery.cookie plugin with js.cookie !7085
......
app/views/help/ui.html.haml
View file @ 70074733
...@@ -461,7 +461,7 @@ ...@@ -461,7 +461,7 @@
.panel-body .panel-body
= lorem = lorem
%h2#alert Alerts %h2#alerts Alerts
.row .row
.col-md-6 .col-md-6
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7