Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

2 files changed, 1 insertions, 68 deletions

diff --git a/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js b/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js
deleted file mode 100644
index be04ff158e7..00000000000
--- a/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * API callbacks for pagination and tabs
- * shared between Pipelines and Environments table.
- *
- * Components need to have `scope`, `page` and `requestData`
- */
-import { historyPushState, buildUrlWithCurrentLocation } from '../../lib/utils/common_utils';
-import { validateParams } from '~/pipelines/utils';
-
-export default {
-  methods: {
-    onChangeTab(scope) {
-      if (this.scope === scope) {
-        return;
-      }
-
-      let params = {
-        scope,
-        page: '1',
-      };
-
-      params = this.onChangeWithFilter(params);
-
-      this.updateContent(params);
-    },
-
-    onChangePage(page) {
-      /* URLS parameters are strings, we need to parse to match types */
-      let params = {
-        page: Number(page).toString(),
-      };
-
-      if (this.scope) {
-        params.scope = this.scope;
-      }
-
-      params = this.onChangeWithFilter(params);
-
-      this.updateContent(params);
-    },
-
-    onChangeWithFilter(params) {
-      return { ...params, ...validateParams(this.requestData) };
-    },
-
-    updateInternalState(parameters) {
-      // stop polling
-      this.poll.stop();
-
-      const queryString = Object.keys(parameters)
-        .map((parameter) => {
-          const value = parameters[parameter];
-          // update internal state for UI
-          this[parameter] = value;
-          return `${parameter}=${encodeURIComponent(value)}`;
-        })
-        .join('&');
-
-      // update polling parameters
-      this.requestData = parameters;
-
-      historyPushState(buildUrlWithCurrentLocation(`?${queryString}`));
-
-      this.isLoading = true;
-    },
-  },
-};
diff --git a/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js b/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
index 56da2637825..52ded0e0cc1 100644
--- a/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
+++ b/app/assets/javascripts/vue_shared/mixins/related_issuable_mixin.js
@@ -1,6 +1,6 @@
 import { isEmpty } from 'lodash';
-import { sprintf, __ } from '~/locale';
 import { formatDate } from '~/lib/utils/datetime_utility';
+import { sprintf, __ } from '~/locale';
 import timeagoMixin from '~/vue_shared/mixins/timeago';
 
 const mixins = {