Add latest changes from gitlab-org/gitlab@master

6 files changed, 15 insertions, 15 deletions

diff --git a/app/assets/javascripts/integrations/edit/components/integration_form.vue b/app/assets/javascripts/integrations/edit/components/integration_form.vue
index 17f910a9d75..0460ed6791e 100644
--- a/app/assets/javascripts/integrations/edit/components/integration_form.vue
+++ b/app/assets/javascripts/integrations/edit/components/integration_form.vue
@@ -25,7 +25,7 @@ export default {
   mixins: [glFeatureFlagsMixin()],
   computed: {
     ...mapGetters(['currentKey', 'propsSource', 'isSavingOrTesting']),
-    ...mapState(['adminState', 'override', 'isSaving', 'isTesting']),
+    ...mapState(['defaultState', 'override', 'isSaving', 'isTesting']),
     isEditable() {
       return this.propsSource.editable;
     },
@@ -53,8 +53,8 @@ export default {
 <template>
   <div>
     <override-dropdown
-      v-if="adminState !== null"
-      :inherit-from-id="adminState.id"
+      v-if="defaultState !== null"
+      :inherit-from-id="defaultState.id"
       :override="override"
       :learn-more-path="propsSource.learnMorePath"
       @change="setOverride"
diff --git a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue
index 5e1ff96c5d7..c31dada8d2f 100644
--- a/app/assets/javascripts/integrations/edit/components/override_dropdown.vue
+++ b/app/assets/javascripts/integrations/edit/components/override_dropdown.vue
@@ -44,9 +44,9 @@ export default {
     };
   },
   computed: {
-    ...mapState(['adminState']),
+    ...mapState(['defaultState']),
     description() {
-      const level = this.adminState.integrationLevel;
+      const level = this.defaultState.integrationLevel;
 
       return (
         overrideDropdownDescriptions[level] || overrideDropdownDescriptions[defaultIntegrationLevel]
diff --git a/app/assets/javascripts/integrations/edit/index.js b/app/assets/javascripts/integrations/edit/index.js
index 5413226078d..248ee62d43a 100644
--- a/app/assets/javascripts/integrations/edit/index.js
+++ b/app/assets/javascripts/integrations/edit/index.js
@@ -72,7 +72,7 @@ function parseDatasetToProps(data) {
   };
 }
 
-export default (el, adminEl) => {
+export default (el, defaultEl) => {
   if (!el) {
     return null;
   }
@@ -80,12 +80,12 @@ export default (el, adminEl) => {
   const props = parseDatasetToProps(el.dataset);
 
   const initialState = {
-    adminState: null,
+    defaultState: null,
     customState: props,
   };
 
-  if (adminEl) {
-    initialState.adminState = Object.freeze(parseDatasetToProps(adminEl.dataset));
+  if (defaultEl) {
+    initialState.defaultState = Object.freeze(parseDatasetToProps(defaultEl.dataset));
   }
 
   return new Vue({
diff --git a/app/assets/javascripts/integrations/edit/store/getters.js b/app/assets/javascripts/integrations/edit/store/getters.js
index 4b494c30845..4ee5f11855c 100644
--- a/app/assets/javascripts/integrations/edit/store/getters.js
+++ b/app/assets/javascripts/integrations/edit/store/getters.js
@@ -1,8 +1,8 @@
-export const isInheriting = state => (state.adminState === null ? false : !state.override);
+export const isInheriting = state => (state.defaultState === null ? false : !state.override);
 
 export const isSavingOrTesting = state => state.isSaving || state.isTesting;
 
 export const propsSource = (state, getters) =>
-  getters.isInheriting ? state.adminState : state.customState;
+  getters.isInheriting ? state.defaultState : state.customState;
 
 export const currentKey = (state, getters) => (getters.isInheriting ? 'admin' : 'custom');
diff --git a/app/assets/javascripts/integrations/edit/store/state.js b/app/assets/javascripts/integrations/edit/store/state.js
index 7f1cd5c6e4d..a9ecee6c539 100644
--- a/app/assets/javascripts/integrations/edit/store/state.js
+++ b/app/assets/javascripts/integrations/edit/store/state.js
@@ -1,9 +1,9 @@
-export default ({ adminState = null, customState = {} } = {}) => {
-  const override = adminState !== null ? adminState.id !== customState.inheritFromId : false;
+export default ({ defaultState = null, customState = {} } = {}) => {
+  const override = defaultState !== null ? defaultState.id !== customState.inheritFromId : false;
 
   return {
     override,
-    adminState,
+    defaultState,
     customState,
     isSaving: false,
     isTesting: false,
diff --git a/app/assets/javascripts/integrations/integration_settings_form.js b/app/assets/javascripts/integrations/integration_settings_form.js
index 529358a5f0b..1d0814125e6 100644
--- a/app/assets/javascripts/integrations/integration_settings_form.js
+++ b/app/assets/javascripts/integrations/integration_settings_form.js
@@ -20,7 +20,7 @@ export default class IntegrationSettingsForm {
     // Init Vue component
     this.vue = initForm(
       document.querySelector('.js-vue-integration-settings'),
-      document.querySelector('.js-vue-admin-integration-settings'),
+      document.querySelector('.js-vue-default-integration-settings'),
     );
     eventHub.$on('toggle', active => {
       this.formActive = active;