summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatarzyna Kobierska <kkobierska@gmail.com>2016-07-20 09:19:07 +0200
committerKatarzyna Kobierska <kkobierska@gmail.com>2016-07-26 11:19:40 +0200
commit4f2ef9a6e5e6997ef4bc70e435b9d0011b46f509 (patch)
tree2ba72ed2af9cc549c0e0a6a052ec185bb8f4efbe
parent08c8b97413d9814f228efc68675a5dc079bb487b (diff)
downloadgitlab-ce-4f2ef9a6e5e6997ef4bc70e435b9d0011b46f509.tar.gz
Multiple trigger variables show in separate line
-rw-r--r--CHANGELOG6
-rw-r--r--app/views/projects/builds/_sidebar.html.haml5
2 files changed, 9 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ef8c72f4aa2..858e8c268d2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,12 @@ v 8.10.1
- Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page. !5446
- Ignore invalid trusted proxies in X-Forwarded-For header. !5454
- Add links to the real markdown.md file for all GFM examples. !5458
+ - Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
+
+v 8.10.1 (unreleased)
+ - Fix Error 500 when creating Wiki pages with hyphens or spaces
+ - Ignore invalid trusted proxies in X-Forwarded-For header
+ - Fix bug where replies to commit notes displayed in the MR discussion tab wouldn't show up on the commit page
v 8.10.0
- Fix profile activity heatmap to show correct day name (eanplatter)
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml
index dc57b49f27a..4794548e169 100644
--- a/app/views/projects/builds/_sidebar.html.haml
+++ b/app/views/projects/builds/_sidebar.html.haml
@@ -88,8 +88,9 @@
%p
%span.build-light-text Variables:
- %code
- - @build.trigger_request.variables.each do |key, value|
+
+ - @build.trigger_request.variables.each do |key, value|
+ %code
#{key}=#{value}
.block