Merge branch 'change-var-to-variable' into 'master'

Change type options text in Variable dialog

See merge request gitlab-org/gitlab!30878

app/assets/javascripts/ci_variable_list/constants.js

@@ -4,7 +4,7 @@ import { __ } from '~/locale';
 export const ADD_CI_VARIABLE_MODAL_ID = 'add-ci-variable';
 
 export const displayText = {
-  variableText: __('Var'),
+  variableText: __('Variable'),
   fileText: __('File'),
   allEnvironmentsText: __('All (default)'),
 };

changelogs/unreleased/change-var-to-variable.yml

+---
+title: Change Var to Variable text
+merge_request: 30878
+author:
+type: changed

locale/gitlab.pot

@@ -23340,7 +23340,7 @@ msgstr ""
 msgid "Value Stream Analytics gives an overview of how much time it takes to go from idea to production in your project."
 msgstr ""
 
-msgid "Var"
+msgid "Variable"
 msgstr ""
 
 msgid "Variable will be masked in job logs."

spec/frontend/ci_variable_list/services/mock_data.js

@@ -8,7 +8,7 @@ export default {
       protected: false,
       secret_value: 'test_val',
       value: 'test_val',
-      variable_type: 'Var',
+      variable_type: 'Variable',
     },
   ],
 
@@ -44,7 +44,7 @@ export default {
       protected: false,
       secret_value: 'test_val',
       value: 'test_val',
-      variable_type: 'Var',
+      variable_type: 'Variable',
     },
     {
       environment_scope: 'All (default)',
@@ -104,7 +104,7 @@ export default {
       id: 28,
       key: 'goku_var',
       value: 'goku_val',
-      variable_type: 'Var',
+      variable_type: 'Variable',
       protected: true,
       masked: true,
       environment_scope: 'staging',
@@ -114,7 +114,7 @@ export default {
       id: 25,
       key: 'test_var_4',
       value: 'test_val_4',
-      variable_type: 'Var',
+      variable_type: 'Variable',
       protected: false,
       masked: false,
       environment_scope: 'production',
@@ -134,7 +134,7 @@ export default {
       id: 24,
       key: 'test_var_3',
       value: 'test_val_3',
-      variable_type: 'Var',
+      variable_type: 'Variable',
       protected: false,
       masked: false,
       environment_scope: 'All (default)',
@@ -144,7 +144,7 @@ export default {
       id: 26,
       key: 'test_var_5',
       value: 'test_val_5',
-      variable_type: 'Var',
+      variable_type: 'Variable',
       protected: false,
       masked: false,
       environment_scope: 'production',

spec/frontend/ci_variable_list/store/mutations_spec.js

@@ -47,7 +47,7 @@ describe('CI variable list mutations', () => {
   describe('CLEAR_MODAL', () => {
     it('should clear modal state ', () => {
       const modalState = {
-        variable_type: 'Var',
+        variable_type: 'Variable',
         key: '',
         secret_value: '',
         protected: false,