Commit 8c6cc649 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'fix-ci-variables-regression' into 'master'

Fix not being able to add more than one variable through the UI

Closes #227400

See merge request gitlab-org/gitlab!37001
parents 2364a36e b73b8dcd
...@@ -74,7 +74,7 @@ export default { ...@@ -74,7 +74,7 @@ export default {
variable_type: displayText.variableText, variable_type: displayText.variableText,
key: '', key: '',
secret_value: '', secret_value: '',
protected: false, protected_variable: false,
masked: false, masked: false,
environment_scope: displayText.allEnvironmentsText, environment_scope: displayText.allEnvironmentsText,
}; };
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
}, },
[types.SET_VARIABLE_PROTECTED](state) { [types.SET_VARIABLE_PROTECTED](state) {
state.variable.protected = true; state.variable.protected_variable = true;
}, },
[types.UPDATE_VARIABLE_KEY](state, key) { [types.UPDATE_VARIABLE_KEY](state, key) {
......
---
title: Fix not being able to add more than one CI variable through the UI
merge_request: 37001
author:
type: fixed
...@@ -41,7 +41,7 @@ describe('CI variable list mutations', () => { ...@@ -41,7 +41,7 @@ describe('CI variable list mutations', () => {
variable_type: 'Variable', variable_type: 'Variable',
key: '', key: '',
secret_value: '', secret_value: '',
protected: false, protected_variable: false,
masked: false, masked: false,
environment_scope: 'All (default)', environment_scope: 'All (default)',
}; };
...@@ -85,7 +85,7 @@ describe('CI variable list mutations', () => { ...@@ -85,7 +85,7 @@ describe('CI variable list mutations', () => {
it('should set protected value to true', () => { it('should set protected value to true', () => {
mutations[types.SET_VARIABLE_PROTECTED](stateCopy); mutations[types.SET_VARIABLE_PROTECTED](stateCopy);
expect(stateCopy.variable.protected).toBe(true); expect(stateCopy.variable.protected_variable).toBe(true);
}); });
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment