diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-15 22:16:37 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-15 22:16:37 +0000 |
commit | 975dc69ec6a292fcdce380fc18940e735a3c2e6b (patch) | |
tree | be16d4f3ca49bc9b84cdc24f891f0a10c911bdf8 /app/assets/javascripts/ci_variable_list | |
parent | 2203d10839b7e1b7d4daa96e4046fa882189e1bd (diff) | |
parent | c6b2ff8a21470cb59e3512b2f27f1c926e17ae6f (diff) | |
download | gitlab-ce-975dc69ec6a292fcdce380fc18940e735a3c2e6b.tar.gz |
Merge branch '42929-hide-new-variable-values' into 'master'
Hide CI secret variable values on save
Closes #42929
See merge request gitlab-org/gitlab-ce!17044
Diffstat (limited to 'app/assets/javascripts/ci_variable_list')
-rw-r--r-- | app/assets/javascripts/ci_variable_list/ajax_variable_list.js | 1 | ||||
-rw-r--r-- | app/assets/javascripts/ci_variable_list/ci_variable_list.js | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/javascripts/ci_variable_list/ajax_variable_list.js b/app/assets/javascripts/ci_variable_list/ajax_variable_list.js index 76f93e5c6bd..b33adff609f 100644 --- a/app/assets/javascripts/ci_variable_list/ajax_variable_list.js +++ b/app/assets/javascripts/ci_variable_list/ajax_variable_list.js @@ -75,6 +75,7 @@ export default class AjaxVariableList { if (res.status === statusCodes.OK && res.data) { this.updateRowsWithPersistedVariables(res.data.variables); + this.variableList.hideValues(); } else if (res.status === statusCodes.BAD_REQUEST) { // Validation failed this.errorBox.innerHTML = generateErrorBoxContent(res.data); diff --git a/app/assets/javascripts/ci_variable_list/ci_variable_list.js b/app/assets/javascripts/ci_variable_list/ci_variable_list.js index 3467e88119b..745f3404295 100644 --- a/app/assets/javascripts/ci_variable_list/ci_variable_list.js +++ b/app/assets/javascripts/ci_variable_list/ci_variable_list.js @@ -178,6 +178,10 @@ export default class VariableList { this.$container.find('.js-row-remove-button').attr('disabled', !isEnabled); } + hideValues() { + this.secretValues.updateDom(false); + } + getAllData() { // Ignore the last empty row because we don't want to try persist // a blank variable and run into validation problems. |