summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-06-12 09:03:08 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-06-12 09:03:08 +0000
commit2e60272fd55eb071be927a419b98a005a07f70bf (patch)
tree660f425b9ce79332327228d78acbc27d4cf54128
parent099d231ec1d178b5aad2feda374177629a4b6c64 (diff)
parent566caff73196e001381ea68fc11ed3a97f0b92b5 (diff)
downloadgitlab-ce-2e60272fd55eb071be927a419b98a005a07f70bf.tar.gz
Merge branch 'unify-ci-variables-form-row' into 'master'
CE: Unify app/views/ci/variables/_variable_row.html.haml See merge request gitlab-org/gitlab-ce!19594
-rw-r--r--app/views/ci/variables/_variable_row.html.haml1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/ci/variables/_variable_row.html.haml b/app/views/ci/variables/_variable_row.html.haml
index 571eb28f195..6ee55836dd2 100644
--- a/app/views/ci/variables/_variable_row.html.haml
+++ b/app/views/ci/variables/_variable_row.html.haml
@@ -43,5 +43,6 @@
%span.toggle-icon
= sprite_icon('status_success_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-checked')
= sprite_icon('status_failed_borderless', size: 16, css_class: 'toggle-icon-svg toggle-status-unchecked')
+ = render_if_exists 'ci/variables/environment_scope', form_field: form_field, variable: variable
%button.js-row-remove-button.ci-variable-row-remove-button{ type: 'button', 'aria-label': s_('CiVariables|Remove variable row') }
= icon('minus-circle')