diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-02 10:47:03 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-02 10:47:03 +0000 |
| commit | 26108ddb119a910c4d03cc128f81adb0c0e88cc1 (patch) | |
| tree | cafc2ec1568577a5557ed2a56ea237767bf23d40 | |
| parent | 86900f00004ed5f862c3b72b4f643036f97a8e56 (diff) | |
| parent | 1798dcc1a6fc24e4fba8ed53d89cd86039a670f9 (diff) | |
| download | gitlab-ce-26108ddb119a910c4d03cc128f81adb0c0e88cc1.tar.gz | |
Merge branch 'masked-variables-docs-update' into 'master'
Clarify masked variable message, add docs link
See merge request gitlab-org/gitlab-ce!27156
| -rw-r--r-- | app/views/ci/variables/_variable_row.html.haml | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/views/ci/variables/_variable_row.html.haml b/app/views/ci/variables/_variable_row.html.haml index aecfdea10d9..12a8d9930b7 100644 --- a/app/views/ci/variables/_variable_row.html.haml +++ b/app/views/ci/variables/_variable_row.html.haml @@ -33,7 +33,9 @@ name: value_input_name, placeholder: s_('CiVariables|Input variable value') } = value - %p.masking-validation-error.gl-field-error.hide= s_("CiVariables|This variable will not be masked") + %p.masking-validation-error.gl-field-error.hide + = s_("CiVariables|Cannot use Masked Variable with current value") + = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'masked-variables'), target: '_blank', rel: 'noopener noreferrer' - unless only_key_value .ci-variable-body-item.ci-variable-protected-item .append-right-default diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 1ebb0e603cd..8ae350779d4 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1833,6 +1833,9 @@ msgstr "" msgid "CiStatus|running" msgstr "" +msgid "CiVariables|Cannot use Masked Variable with current value" +msgstr "" + msgid "CiVariables|Input variable key" msgstr "" @@ -1842,9 +1845,6 @@ msgstr "" msgid "CiVariables|Remove variable row" msgstr "" -msgid "CiVariables|This variable will not be masked" -msgstr "" - msgid "CiVariable|* (All environments)" msgstr "" |