diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-26 11:24:43 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-26 11:24:43 +0000 |
| commit | 2f5fdfe3f2848542b9930f4144723706451cfbc0 (patch) | |
| tree | 8762f551111a98b3b71fa3809455a1e793618483 /app/views | |
| parent | e9946f19a5af84b13fc8f21bdffa0689fd93f6c3 (diff) | |
| parent | ea69ee1942c2e983cb91c197b0df82b7783badf1 (diff) | |
| download | gitlab-ce-2f5fdfe3f2848542b9930f4144723706451cfbc0.tar.gz | |
Merge branch 'multiple-trigger-variables-show-in-separate-line' into 'master'
Multiple trigger variables show in separate line
## What does this MR do?
Separate lines for multiple trigger variables
## Screenshot
## What are the relevant issue numbers?
Closes #19006
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Add tests for multiple trigger variables view
- [x] All builds are passing
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
cc @ubudzisz @grzesiek @yorickpeterse @tmaczukin [@chastell](https://github.com/chastell) [@tomash](https://github.com/tomash)
See merge request !5357
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/builds/_sidebar.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml index b89183c40dc..a8bc53c2849 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 |