Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab/issue_templates/Secret_Detection_Pattern_Change.md

@@ -12,12 +12,26 @@ Please briefly describe what you are looking to add or change and select the app
 <!--
 Please add a link to the vendor, documentation and any contact information you may have.
 -->
+- Vendor:
+- Documentation:
+
 
 ## Examples
 
 <!--
-Please provide a list of examples of what this secret type could look like.
+Please provide a list of at least 5 examples of what this secret type could look like.
+-->
+1.
+1.
+1.
+1.
+1.
+
+## Remediation Guidance (Optional) 
+<!--
+Please include any information you might have on how to rotate or revoke this secret type. 
 -->
+_If you would like to contribute your own changes, please open an MR in the [Secret Detection Rules](https://gitlab.com/gitlab-org/security-products/secret-detection/secret-detection-rules/-/tree/main) repository. To get started please reference the adding new rules section in the `README.MD`._
 
 
 /label ~"section::sec" ~"devops::application security testing" ~"group::secret detection" ~"GitLab Ultimate" ~"Category:Secret Detection" ~"Secret Detection:Pattern Change" ~"type::maintenance" 

app/assets/javascripts/access_tokens/index.js

@@ -31,7 +31,11 @@ export const initAccessTokenTableApp = () => {
   // Default values
   const noActiveTokensMessage =
     noTokensMessage ||
-    sprintf(__('This user has no active %{accessTokenTypePlural}.'), { accessTokenTypePlural });
+    sprintf(
+      __('This user has no active %{accessTokenTypePlural}.'),
+      { accessTokenTypePlural },
+      false,
+    );
   const showRole = 'showRole' in el.dataset;
 
   const initialActiveAccessTokens = JSON.parse(initialActiveAccessTokensJson);

app/assets/javascripts/behaviors/markdown/render_gfm.js

@@ -8,7 +8,7 @@ import { renderJSONTable, renderJSONTableHTML } from './render_json_table';
 
 function initPopovers(elements) {
   if (!elements.length) return;
-  import(/* webpackChunkName: 'IssuablePopoverBundle' */ 'ee_else_ce/issuable/popover')
+  import(/* webpackChunkName: 'IssuablePopoverBundle' */ '~/issuable/popover')
     .then(({ default: initIssuablePopovers }) => {
       initIssuablePopovers(elements);
     })

app/assets/javascripts/boards/components/issue_due_date.vue

@@ -4,6 +4,7 @@ import dateFormat from '~/lib/dateformat';
 import {
   getDayDifference,
   getTimeago,
+  humanTimeframe,
   localeDateFormat,
   newDate,
 } from '~/lib/utils/datetime_utility';
@@ -25,6 +26,11 @@ export default {
       type: String,
       required: true,
     },
+    startDate: {
+      type: String,
+      required: false,
+      default: undefined,
+    },
     cssClass: {
       type: String,
       required: false,
@@ -39,32 +45,28 @@ export default {
   computed: {
     title() {
       const timeago = getTimeago();
-      const { timeDifference, standardDateFormat } = this;
-      const formattedDate = standardDateFormat;
 
-      if (timeDifference >= -1 && timeDifference < 7) {
-        return `${timeago.format(this.issueDueDate)} (${formattedDate})`;
+      if (this.timeDifference >= -1 && this.timeDifference < 7) {
+        return `${timeago.format(this.issueDueDate)} (${this.standardDateFormat})`;
       }
 
       return timeago.format(this.issueDueDate);
     },
     body() {
-      const { timeDifference, issueDueDate, standardDateFormat } = this;
-
-      if (timeDifference === 0) {
+      if (this.timeDifference === 0) {
         return __('Today');
       }
-      if (timeDifference === 1) {
+      if (this.timeDifference === 1) {
         return __('Tomorrow');
       }
-      if (timeDifference === -1) {
+      if (this.timeDifference === -1) {
         return __('Yesterday');
       }
-      if (timeDifference > 0 && timeDifference < 7) {
-        return dateFormat(issueDueDate, 'dddd');
+      if (this.timeDifference > 0 && this.timeDifference < 7) {
+        return dateFormat(this.issueDueDate, 'dddd');
       }
 
-      return standardDateFormat;
+      return this.standardDateFormat;
     },
     iconName() {
       return this.isOverdue ? 'calendar-overdue' : 'calendar';
@@ -77,10 +79,13 @@ export default {
       return getDayDifference(today, this.issueDueDate);
     },
     isOverdue() {
-      if (this.timeDifference >= 0 || this.closed) return false;
-      return true;
+      return !this.closed && this.timeDifference < 0;
     },
     standardDateFormat() {
+      if (this.startDate) {
+        return humanTimeframe(newDate(this.startDate), this.issueDueDate);
+      }
+
       const today = new Date();
       return today.getFullYear() === this.issueDueDate.getFullYear()
         ? localeDateFormat.asDateWithoutYear.format(this.issueDueDate)

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

@@ -1,8 +1,13 @@
 <script>
-import { GlSkeletonLoader } from '@gitlab/ui';
 import { createAlert } from '~/alert';
+import CrudComponent from '~/vue_shared/components/crud_component.vue';
 import runnerJobsQuery from '../graphql/show/runner_jobs.query.graphql';
-import { I18N_FETCH_ERROR, I18N_NO_JOBS_FOUND, RUNNER_DETAILS_JOBS_PAGE_SIZE } from '../constants';
+import {
+  I18N_FETCH_ERROR,
+  I18N_JOBS,
+  I18N_NO_JOBS_FOUND,
+  RUNNER_DETAILS_JOBS_PAGE_SIZE,
+} from '../constants';
 import { captureException } from '../sentry_utils';
 import { getPaginationVariables } from '../utils';
 import RunnerJobsTable from './runner_jobs_table.vue';
@@ -12,12 +17,11 @@ import RunnerJobsEmptyState from './runner_jobs_empty_state.vue';
 export default {
   name: 'RunnerJobs',
   components: {
-    GlSkeletonLoader,
+    CrudComponent,
     RunnerJobsTable,
     RunnerPagination,
     RunnerJobsEmptyState,
   },
-
   props: {
     runner: {
       type: Object,
@@ -68,18 +72,28 @@ export default {
       this.pagination = value;
     },
   },
+  I18N_JOBS,
   I18N_NO_JOBS_FOUND,
 };
 </script>
 
 <template>
-  <div class="gl-pt-3">
-    <div v-if="loading" class="gl-py-5">
-      <gl-skeleton-loader />
-    </div>
-    <runner-jobs-table v-else-if="jobs.items.length" :jobs="jobs.items" />
+  <crud-component
+    :title="$options.I18N_JOBS"
+    icon="pipeline"
+    :count="runner.jobCount"
+    :is-loading="loading"
+    class="gl-mt-5"
+  >
+    <runner-jobs-table v-if="jobs.items.length" :jobs="jobs.items" />
     <runner-jobs-empty-state v-else />
 
-    <runner-pagination :disabled="loading" :page-info="jobs.pageInfo" @input="onPaginationInput" />
-  </div>
+    <template #pagination>
+      <runner-pagination
+        :disabled="loading"
+        :page-info="jobs.pageInfo"
+        @input="onPaginationInput"
+      />
+    </template>
+  </crud-component>
 </template>

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

@@ -38,7 +38,5 @@ export default {
 </script>
 
 <template>
-  <div v-if="isShown" class="gl-text-center">
-    <gl-keyset-pagination v-bind="paginationProps" @prev="prevPage" @next="nextPage" />
-  </div>
+  <gl-keyset-pagination v-if="isShown" v-bind="paginationProps" @prev="prevPage" @next="nextPage" />
 </template>

app/assets/javascripts/ci/runner/constants.js

@@ -7,7 +7,7 @@ export const RUNNER_PAGE_SIZE = 20;
 export const RUNNER_JOB_COUNT_LIMIT = 1000;
 
 export const RUNNER_DETAILS_PROJECTS_PAGE_SIZE = 5;
-export const RUNNER_DETAILS_JOBS_PAGE_SIZE = 30;
+export const RUNNER_DETAILS_JOBS_PAGE_SIZE = 20;
 
 export const I18N_FETCH_ERROR = s__('Runners|Something went wrong while fetching runner data.');
 export const I18N_CREATE_ERROR = s__(

app/assets/javascripts/diffs/components/diff_file.vue

@@ -22,6 +22,7 @@ import NoteForm from '~/notes/components/note_form.vue';
 import diffLineNoteFormMixin from '~/notes/mixins/diff_line_note_form';
 import { fileContentsId } from '~/diffs/components/diff_row_utils';
 import { useLegacyDiffs } from '~/diffs/stores/legacy_diffs';
+import { useMrNotes } from '~/mr_notes/store/legacy_mr_notes';
 import {
   DIFF_FILE_AUTOMATIC_COLLAPSE,
   DIFF_FILE_MANUAL_COLLAPSE,
@@ -134,7 +135,8 @@ export default {
       'isVirtualScrollingEnabled',
       'linkedFile',
     ]),
-    ...mapVuexGetters(['isLoggedIn', 'isNotesFetched', 'getNoteableData', 'noteableType']),
+    ...mapState(useMrNotes, ['isLoggedIn']),
+    ...mapVuexGetters(['isNotesFetched', 'getNoteableData', 'noteableType']),
     autosaveKey() {
       if (!this.isLoggedIn) return '';
 

app/assets/javascripts/diffs/components/diff_line_note_form.vue

@@ -15,6 +15,7 @@ import { commentLineOptions, formatLineRange } from '~/notes/components/multilin
 import NoteForm from '~/notes/components/note_form.vue';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
 import { useLegacyDiffs } from '~/diffs/stores/legacy_diffs';
+import { useMrNotes } from '~/mr_notes/store/legacy_mr_notes';
 import {
   DIFF_NOTE_TYPE,
   INLINE_DIFF_LINES_KEY,
@@ -76,17 +77,12 @@ export default {
       'getDiffFileByHash',
       'diffLines',
     ]),
+    ...mapState(useMrNotes, ['isLoggedIn']),
     ...mapVuexState({
       noteableData: ({ notes }) => notes.noteableData,
       selectedCommentPosition: ({ notes }) => notes.selectedCommentPosition,
     }),
-    ...mapVuexGetters([
-      'isLoggedIn',
-      'noteableType',
-      'getNoteableData',
-      'getNotesDataByProp',
-      'getUserData',
-    ]),
+    ...mapVuexGetters(['noteableType', 'getNoteableData', 'getNotesDataByProp', 'getUserData']),
     author() {
       return this.getUserData;
     },

app/assets/javascripts/diffs/index.js

@@ -1,16 +1,20 @@
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 // eslint-disable-next-line no-restricted-imports
-import { mapActions, mapState, mapGetters } from 'vuex';
+import {
+  mapActions as mapVuexActions,
+  mapState as mapVuexState,
+  mapGetters as mapVuexGetters,
+} from 'vuex';
+import { mapState } from 'pinia';
 import { cleanLeadingSeparator } from '~/lib/utils/url_utility';
 import { apolloProvider } from '~/graphql_shared/issuable_client';
 import { getCookie, parseBoolean, removeCookie } from '~/lib/utils/common_utils';
 import store from '~/mr_notes/stores';
 import { pinia } from '~/pinia/instance';
-
+import { useMrNotes } from '~/mr_notes/store/legacy_mr_notes';
 import eventHub from '../notes/event_hub';
 import DiffsApp from './components/app.vue';
-
 import { TREE_LIST_STORAGE_KEY, DIFF_WHITESPACE_COOKIE_NAME } from './constants';
 
 export default function initDiffsApp() {
@@ -47,9 +51,7 @@ export default function initDiffsApp() {
       };
     },
     computed: {
-      ...mapState({
-        activeTab: (state) => state.page.activeTab,
-      }),
+      ...mapState(useMrNotes, ['activeTab']),
     },
     created() {
       const treeListStored = localStorage.getItem(TREE_LIST_STORAGE_KEY);
@@ -79,7 +81,7 @@ export default function initDiffsApp() {
       }
     },
     methods: {
-      ...mapActions('diffs', ['setRenderTreeList', 'setShowWhitespace']),
+      ...mapVuexActions('diffs', ['setRenderTreeList', 'setShowWhitespace']),
     },
     render(createElement) {
       return createElement('diffs-app', {
@@ -111,8 +113,8 @@ export default function initDiffsApp() {
         FindFile: () => import('~/vue_shared/components/file_finder/index.vue'),
       },
       computed: {
-        ...mapState('diffs', ['fileFinderVisible', 'isLoading']),
-        ...mapGetters('diffs', ['flatBlobsList']),
+        ...mapVuexState('diffs', ['fileFinderVisible', 'isLoading']),
+        ...mapVuexGetters('diffs', ['flatBlobsList']),
       },
       watch: {
         fileFinderVisible(newVal, oldVal) {
@@ -122,7 +124,7 @@ export default function initDiffsApp() {
         },
       },
       methods: {
-        ...mapActions('diffs', ['toggleFileFinder', 'scrollToFile']),
+        ...mapVuexActions('diffs', ['toggleFileFinder', 'scrollToFile']),
         openFile(file) {
           window.mrTabs.tabShown('diffs');
           this.scrollToFile({ path: file.path });

app/assets/javascripts/glql/components/presenters/issuable.vue

@@ -1,6 +1,6 @@
 <script>
 import { GlLink, GlIntersperse } from '@gitlab/ui';
-import initIssuablePopovers from 'ee_else_ce/issuable/popover';
+import initIssuablePopovers from '~/issuable/popover';
 import { extractGroupOrProject } from '../../utils/common';
 
 const types = {

app/assets/javascripts/glql/components/presenters/milestone.vue

@@ -1,6 +1,6 @@
 <script>
 import { GlLink } from '@gitlab/ui';
-import initIssuablePopovers from 'ee_else_ce/issuable/popover';
+import initIssuablePopovers from '~/issuable/popover';
 import { extractGroupOrProject } from '../../utils/common';
 
 export default {