diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-04-30 16:13:13 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-04-30 16:13:13 +0000 |
commit | 2272e95acd5b398a3ccfa12de85c40d285b679d8 (patch) | |
tree | 2336216d5aa2bd5e05ba98a3f9c356ad0da049b7 /app/views/ci | |
parent | 9cc1294d27d09015bcd1dc73dab187a0f605e22a (diff) | |
parent | e71351d4f463715fccd80ddbcb4dade67e80f34b (diff) | |
download | gitlab-ce-2272e95acd5b398a3ccfa12de85c40d285b679d8.tar.gz |
Merge branch 'master' into 'bootstrap4'
# Conflicts:
# app/views/ci/variables/_variable_row.html.haml
Diffstat (limited to 'app/views/ci')
-rw-r--r-- | app/views/ci/variables/_variable_row.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/ci/variables/_variable_row.html.haml b/app/views/ci/variables/_variable_row.html.haml index 316b433c5cd..571eb28f195 100644 --- a/app/views/ci/variables/_variable_row.html.haml +++ b/app/views/ci/variables/_variable_row.html.haml @@ -17,14 +17,14 @@ .ci-variable-row-body %input.js-ci-variable-input-id{ type: "hidden", name: id_input_name, value: id } %input.js-ci-variable-input-destroy{ type: "hidden", name: destroy_input_name } - %input.js-ci-variable-input-key.ci-variable-body-item.form-control{ type: "text", + %input.js-ci-variable-input-key.ci-variable-body-item.qa-ci-variable-input-key.form-control{ type: "text", name: key_input_name, value: key, placeholder: s_('CiVariables|Input variable key') } .ci-variable-body-item - .form-control.js-secret-value-placeholder{ class: ('hidden' unless id) } + .form-control.js-secret-value-placeholder.qa-ci-variable-input-value{ class: ('hide' unless id) } = '*' * 20 - %textarea.js-ci-variable-input-value.js-secret-value.form-control{ class: ('hidden' if id), + %textarea.js-ci-variable-input-value.js-secret-value.qa-ci-variable-input-value.form-control{ class: ('hide' if id), rows: 1, name: value_input_name, placeholder: s_('CiVariables|Input variable value') } |