Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

CHANGELOG.md

@@ -2,6 +2,18 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 15.8.3 (2023-02-15)
+
+### Fixed (3 changes)
+
+- [Attempt reading schema file instead of a file named `#{report_version}`](gitlab-org/gitlab@f4b236c5f22c2da89bd4275cd8f5bf2807069ee4) ([merge request](gitlab-org/gitlab!111934))
+- [Revert changes on wiki replication/verification legacy code](gitlab-org/gitlab@71b29b669f0415fa371560139d699aa7ad568549) ([merge request](gitlab-org/gitlab!111934)) **GitLab Enterprise Edition**
+- [Revert changes on wiki replication/verification legacy code](gitlab-org/gitlab@fd824d99fb7b341088841edfaa6c401c4c20dad8) ([merge request](gitlab-org/gitlab!111879)) **GitLab Enterprise Edition**
+
+### Changed (1 change)
+
+- [Upgrade Alert - Add proper API support](gitlab-org/gitlab@6658efdbfb89847f20836e862710260e49c44778) ([merge request](gitlab-org/gitlab!111934))
+
 ## 15.8.2 (2023-02-10)
 
 No changes.

app/assets/javascripts/ci/runner/admin_new_runner/index.js

@@ -12,7 +12,7 @@ export const initAdminNewRunner = (selector = '#js-admin-new-runner') => {
     return null;
   }
 
-  const { legacyRegistrationToken, awsImgPath, dockerImgPath, kubernetesImgPath } = el.dataset;
+  const { legacyRegistrationToken } = el.dataset;
 
   const apolloProvider = new VueApollo({
     defaultClient: createDefaultClient(),
@@ -21,11 +21,6 @@ export const initAdminNewRunner = (selector = '#js-admin-new-runner') => {
   return new Vue({
     el,
     apolloProvider,
-    provide: {
-      awsImgPath,
-      dockerImgPath,
-      kubernetesImgPath,
-    },
     render(h) {
       return h(AdminNewRunnerApp, {
         props: {

app/assets/javascripts/ci/runner/components/runner_platforms_radio_group.vue

@@ -1,5 +1,9 @@
 <script>
+import AWS_LOGO_URL from '@gitlab/svgs/dist/illustrations/logos/aws.svg?url';
+import DOCKER_LOGO_URL from '@gitlab/svgs/dist/illustrations/third-party-logos/ci_cd-template-logos/docker.png';
+import KUBERNETES_LOGO_URL from '@gitlab/svgs/dist/illustrations/logos/kubernetes.svg?url';
 import { GlFormRadioGroup, GlIcon, GlLink } from '@gitlab/ui';
+
 import {
   LINUX_PLATFORM,
   MACOS_PLATFORM,
@@ -18,7 +22,6 @@ export default {
     GlIcon,
     RunnerPlatformsRadio,
   },
-  inject: ['awsImgPath', 'dockerImgPath', 'kubernetesImgPath'],
   props: {
     value: {
       type: String,
@@ -39,9 +42,13 @@ export default {
   LINUX_PLATFORM,
   MACOS_PLATFORM,
   WINDOWS_PLATFORM,
+
   AWS_PLATFORM,
+  AWS_LOGO_URL,
   DOCKER_HELP_URL,
+  DOCKER_LOGO_URL,
   KUBERNETES_HELP_URL,
+  KUBERNETES_LOGO_URL,
 };
 </script>
 
@@ -68,7 +75,11 @@ export default {
       <label>{{ s__('Runners|Cloud templates') }}</label>
       <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
       <div class="gl-display-flex gl-flex-wrap gl-gap-5">
-        <runner-platforms-radio v-model="model" :image="awsImgPath" :value="$options.AWS_PLATFORM">
+        <runner-platforms-radio
+          v-model="model"
+          :image="$options.AWS_LOGO_URL"
+          :value="$options.AWS_PLATFORM"
+        >
           AWS
         </runner-platforms-radio>
       </div>
@@ -79,13 +90,13 @@ export default {
 
       <div class="gl-display-flex gl-flex-wrap gl-gap-5">
         <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
-        <runner-platforms-radio :image="dockerImgPath">
+        <runner-platforms-radio :image="$options.DOCKER_LOGO_URL">
           <gl-link :href="$options.DOCKER_HELP_URL" target="_blank">
             Docker
             <gl-icon name="external-link" />
           </gl-link>
         </runner-platforms-radio>
-        <runner-platforms-radio :image="kubernetesImgPath">
+        <runner-platforms-radio :image="$options.KUBERNETES_LOGO_URL">
           <gl-link :href="$options.KUBERNETES_HELP_URL" target="_blank">
             Kubernetes
             <gl-icon name="external-link" />

app/assets/javascripts/helpers/init_simple_app_helper.js

@@ -0,0 +1,39 @@
+import Vue from 'vue';
+
+/**
+ * Initializes a component as a simple vue app, passing the necessary props. If the element
+ * has a data attribute named `data-view-model`, the content of that attributed will be
+ * converted from json and passed on to the component as a prop. The root component is then
+ * responsible for setting up it's children, injections, and other desired features.
+ *
+ * @param {string} selector css selector for where to build
+ * @param {Vue.component} component The Vue compoment to be built as the root of the app
+ *
+ * @example
+ * ```html
+ * <div id='#mount-here' data-view-model="{'some': 'object'}" />
+ * ```
+ *
+ * ```javascript
+ * initSimpleApp('#mount-here', MyApp)
+ * ```
+ *
+ * This will mount MyApp as root on '#mount-here'. It will receive {'some': 'object'} as it's
+ * view model prop.
+ */
+export const initSimpleApp = (selector, component) => {
+  const element = document.querySelector(selector);
+
+  if (!element) {
+    return null;
+  }
+
+  const props = element.dataset.viewModel ? JSON.parse(element.dataset.viewModel) : {};
+
+  return new Vue({
+    el: element,
+    render(h) {
+      return h(component, { props });
+    },
+  });
+};

app/assets/javascripts/ide/init_gitlab_web_ide.js

@@ -7,6 +7,7 @@ import csrf from '~/lib/utils/csrf';
 import { getBaseConfig } from './lib/gitlab_web_ide/get_base_config';
 import { setupRootElement } from './lib/gitlab_web_ide/setup_root_element';
 import { GITLAB_WEB_IDE_FEEDBACK_ISSUE } from './constants';
+import { handleTracking } from './lib/gitlab_web_ide/handle_tracking_event';
 
 const buildRemoteIdeURL = (ideRemotePath, remoteHost, remotePathArg) => {
   const remotePath = cleanLeadingSeparator(remotePathArg);
@@ -72,6 +73,7 @@ export const initGitlabWebIDE = async (el) => {
       fontFamily: editorFontFamily,
       format: editorFontFormat,
     },
+    handleTracking,
     async handleStartRemote({ remoteHost, remotePath, connectionToken }) {
       const confirmed = await confirmAction(
         __('Are you sure you want to leave the Web IDE? All unsaved changes will be lost.'),

app/assets/javascripts/ide/lib/gitlab_web_ide/handle_tracking_event.js

@@ -0,0 +1,20 @@
+import { snakeCase } from 'lodash';
+import { convertObjectPropsToSnakeCase } from '~/lib/utils/common_utils';
+import Tracking from '~/tracking';
+
+export const handleTracking = ({ name, data }) => {
+  const snakeCaseEventName = snakeCase(name);
+
+  if (data && Object.keys(data).length) {
+    Tracking.event(undefined, snakeCaseEventName, {
+      /* See GitLab snowplow schema for a definition of the extra field
+       * https://docs.gitlab.com/ee/development/snowplow/schemas.html#gitlab_standard.
+       */
+      extra: convertObjectPropsToSnakeCase(data, {
+        deep: true,
+      }),
+    });
+  } else {
+    Tracking.event(undefined, snakeCaseEventName);
+  }
+};

app/assets/javascripts/ide/remote/index.js

@@ -1,6 +1,7 @@
 import { startRemote } from '@gitlab/web-ide';
 import { getBaseConfig, setupRootElement } from '~/ide/lib/gitlab_web_ide';
 import { isSameOriginUrl, joinPaths } from '~/lib/utils/url_utility';
+import { handleTracking } from '~/ide/lib/gitlab_web_ide/handle_tracking_event';
 
 /**
  * @param {Element} rootEl
@@ -36,5 +37,6 @@ export const mountRemoteIDE = async (el) => {
     // TODO Handle error better
     handleError: visitReturnUrl,
     handleClose: visitReturnUrl,
+    handleTracking,
   });
 };

app/assets/javascripts/ml/experiment_tracking/components/ml_candidate.vue

@@ -10,7 +10,12 @@ export default {
     IncubationAlert,
     GlLink,
   },
-  inject: ['candidate'],
+  props: {
+    candidate: {
+      type: Object,
+      required: true,
+    },
+  },
   i18n: {
     titleLabel: __('Model candidate details'),
     infoLabel: __('Info'),

app/assets/javascripts/pages/projects/ml/candidates/show/index.js

@@ -1,27 +1,4 @@
-import Vue from 'vue';
+import { initSimpleApp } from '~/helpers/init_simple_app_helper';
 import MlCandidate from '~/ml/experiment_tracking/components/ml_candidate.vue';
 
-const initShowCandidate = () => {
-  const element = document.querySelector('#js-show-ml-candidate');
-  if (!element) {
-    return;
-  }
-
-  const container = document.createElement('div');
-  element.appendChild(container);
-
-  const candidate = JSON.parse(element.dataset.candidate);
-
-  // eslint-disable-next-line no-new
-  new Vue({
-    el: container,
-    provide: {
-      candidate,
-    },
-    render(h) {
-      return h(MlCandidate);
-    },
-  });
-};
-
-initShowCandidate();
+initSimpleApp('#js-show-ml-candidate', MlCandidate);

app/assets/javascripts/related_issues/components/add_issuable_form.vue

@@ -1,10 +1,10 @@
 <script>
 import { GlFormGroup, GlFormRadioGroup, GlButton } from '@gitlab/ui';
+import { TYPE_ISSUE } from '~/issues/constants';
 import { mergeUrlParams } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
 
 import {
-  issuableTypesMap,
   itemAddFailureTypesMap,
   linkedIssueTypesMap,
   addRelatedIssueErrorMap,
@@ -54,7 +54,7 @@ export default {
     issuableType: {
       type: String,
       required: false,
-      default: issuableTypesMap.ISSUE,
+      default: TYPE_ISSUE,
     },
     hasError: {
       type: Boolean,

app/assets/javascripts/related_issues/components/related_issuable_input.vue

@@ -1,11 +1,11 @@
 <script>
 import $ from 'jquery';
 import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete';
+import { TYPE_ISSUE } from '~/issues/constants';
 import {
   autoCompleteTextMap,
   inputPlaceholderConfidentialTextMap,
   inputPlaceholderTextMap,
-  issuableTypesMap,
 } from '../constants';
 import IssueToken from './issue_token.vue';
 
@@ -54,7 +54,7 @@ export default {
     issuableType: {
       type: String,
       required: false,
-      default: issuableTypesMap.ISSUE,
+      default: TYPE_ISSUE,
     },
     confidential: {
       type: Boolean,

app/assets/javascripts/related_issues/components/related_issues_root.vue

@@ -25,13 +25,13 @@ Your caret can stop touching a `rawReference` can happen in a variety of ways:
 */
 import { createAlert } from '~/flash';
 import { getIdFromGraphQLId, isGid } from '~/graphql_shared/utils';
+import { TYPE_ISSUE } from '~/issues/constants';
 import { HTTP_STATUS_NOT_FOUND } from '~/lib/utils/http_status';
 import { __ } from '~/locale';
 import {
   relatedIssuesRemoveErrorMap,
   pathIndeterminateErrorMap,
   addRelatedIssueErrorMap,
-  issuableTypesMap,
   PathIdSeparator,
 } from '../constants';
 import RelatedIssuesService from '../services/related_issues_service';
@@ -66,7 +66,7 @@ export default {
     issuableType: {
       type: String,
       required: false,
-      default: issuableTypesMap.ISSUE,
+      default: TYPE_ISSUE,
     },
     allowAutoComplete: {
       type: Boolean,