.gitlab/CODEOWNERS

@@ -929,16 +929,18 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /app/workers/authorized_projects_worker.rb @gitlab-org/manage/authentication-and-authorization
 /app/workers/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/application_settings_tokens_optional_encryption.yml @gitlab-org/manage/authentication-and-authorization
+/config/feature_flags/development/async_only_project_authorizations_refresh.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/enforce_auth_checks_on_uploads.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/forti_authenticator.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/forti_token_cloud.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/groups_tokens_optional_encryption.yml @gitlab-org/manage/authentication-and-authorization
-/config/feature_flags/development/omniauth_initializer_fullhost_proc.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/omniauth_login_minimal_scopes.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/personal_access_tokens_scoped_to_projects.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/projects_tokens_optional_encryption.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/refresh_authorizations_via_affected_projects_on_group_membership.yml @gitlab-org/manage/authentication-and-authorization
+/config/feature_flags/development/skip_group_share_unlink_auth_refresh.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml @gitlab-org/manage/authentication-and-authorization
+/config/feature_flags/development/update_oauth_registration_flow.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/development/webauthn.yml @gitlab-org/manage/authentication-and-authorization
 /config/feature_flags/ops/block_password_auth_for_saml_users.yml @gitlab-org/manage/authentication-and-authorization
 /config/initializers/01_secret_token.rb @gitlab-org/manage/authentication-and-authorization
@@ -975,6 +977,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /ee/app/helpers/ee/access_tokens_helper.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/helpers/ee/auth_helper.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/helpers/ee/personal_access_tokens_helper.rb @gitlab-org/manage/authentication-and-authorization
+/ee/app/models/concerns/password_complexity.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/models/ee/personal_access_token.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/models/ee/project_authorization.rb @gitlab-org/manage/authentication-and-authorization
 /ee/app/models/scim_oauth_access_token.rb @gitlab-org/manage/authentication-and-authorization
@@ -984,6 +987,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /ee/app/services/ee/resource_access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/services/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/services/security/token_revocation_service.rb @gitlab-org/manage/authentication-and-authorization
+/ee/app/validators/password/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/admin/application_settings/_personal_access_token_expiration_policy.html.haml @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/credentials_inventory_mailer/personal_access_token_revoked_email.html.haml @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/credentials_inventory_mailer/personal_access_token_revoked_email.text.haml @gitlab-org/manage/authentication-and-authorization
@@ -996,6 +1000,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /ee/app/views/shared/credentials_inventory/_project_access_tokens.html.haml @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/shared/credentials_inventory/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/views/shared/credentials_inventory/project_access_tokens/ @gitlab-org/manage/authentication-and-authorization
+/ee/app/workers/auth/ @gitlab-org/manage/authentication-and-authorization
 /ee/app/workers/personal_access_tokens/ @gitlab-org/manage/authentication-and-authorization
 /ee/config/routes/oauth.rb @gitlab-org/manage/authentication-and-authorization
 /ee/lib/ee/gitlab/auth/ @gitlab-org/manage/authentication-and-authorization
@@ -1012,6 +1017,7 @@ lib/gitlab/checks/** @proglottis @toon @zj-gitlab
 /lib/api/entities/impersonation_token.rb @gitlab-org/manage/authentication-and-authorization
 /lib/api/entities/impersonation_token_with_token.rb @gitlab-org/manage/authentication-and-authorization
 /lib/api/entities/personal_access_token.rb @gitlab-org/manage/authentication-and-authorization
+/lib/api/entities/personal_access_token_with_details.rb @gitlab-org/manage/authentication-and-authorization
 /lib/api/entities/personal_access_token_with_token.rb @gitlab-org/manage/authentication-and-authorization
 /lib/api/entities/resource_access_token.rb @gitlab-org/manage/authentication-and-authorization
 /lib/api/entities/resource_access_token_with_token.rb @gitlab-org/manage/authentication-and-authorization

GITALY_SERVER_VERSION

-ac72695adc90343b7255869818376f505bde8315
+9ff756d21305e63a256ba74c6f75b5c867d9fc22

app/assets/javascripts/jobs/bridge/app.vue

-<script>
-import { GlLoadingIcon } from '@gitlab/ui';
-import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
-import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { __, sprintf } from '~/locale';
-import CiHeader from '~/vue_shared/components/header_ci_component.vue';
-import getPipelineQuery from './graphql/queries/pipeline.query.graphql';
-import BridgeEmptyState from './components/empty_state.vue';
-import BridgeSidebar from './components/sidebar.vue';
-import { SIDEBAR_COLLAPSE_BREAKPOINTS } from './components/constants';
-
-export default {
-  name: 'BridgePageApp',
-  components: {
-    BridgeEmptyState,
-    BridgeSidebar,
-    CiHeader,
-    GlLoadingIcon,
-  },
-  inject: ['buildId', 'projectFullPath', 'pipelineIid'],
-  apollo: {
-    pipeline: {
-      query: getPipelineQuery,
-      variables() {
-        return {
-          fullPath: this.projectFullPath,
-          iid: this.pipelineIid,
-        };
-      },
-      update(data) {
-        if (!data?.project?.pipeline) {
-          return null;
-        }
-
-        const { pipeline } = data.project;
-        const stages = pipeline?.stages.edges.map((edge) => edge.node) || [];
-        const jobs = stages.map((stage) => stage.jobs.nodes).flat();
-
-        return {
-          ...pipeline,
-          commit: {
-            ...pipeline.commit,
-            commit_path: pipeline.commit.webPath,
-            short_id: pipeline.commit.shortId,
-          },
-          id: getIdFromGraphQLId(pipeline.id),
-          jobs,
-          stages,
-        };
-      },
-    },
-  },
-  data() {
-    return {
-      isSidebarExpanded: true,
-      pipeline: {},
-    };
-  },
-  computed: {
-    bridgeJob() {
-      return (
-        this.pipeline.jobs?.filter(
-          (job) => getIdFromGraphQLId(job.id) === Number(this.buildId),
-        )[0] || {}
-      );
-    },
-    bridgeName() {
-      return sprintf(__('Job %{jobName}'), { jobName: this.bridgeJob.name });
-    },
-    isPipelineLoading() {
-      return this.$apollo.queries.pipeline.loading;
-    },
-  },
-  created() {
-    window.addEventListener('resize', this.onResize);
-  },
-  mounted() {
-    this.onResize();
-  },
-  methods: {
-    toggleSidebar() {
-      this.isSidebarExpanded = !this.isSidebarExpanded;
-    },
-    onResize() {
-      const breakpoint = bp.getBreakpointSize();
-      if (SIDEBAR_COLLAPSE_BREAKPOINTS.includes(breakpoint)) {
-        this.isSidebarExpanded = false;
-      } else if (!this.isSidebarExpanded) {
-        this.isSidebarExpanded = true;
-      }
-    },
-  },
-};
-</script>
-<template>
-  <div>
-    <gl-loading-icon v-if="isPipelineLoading" size="lg" class="gl-mt-4" />
-    <div v-else>
-      <ci-header
-        class="gl-border-b-1 gl-border-b-solid gl-border-b-gray-100"
-        :status="bridgeJob.detailedStatus"
-        :time="bridgeJob.createdAt"
-        :user="pipeline.user"
-        :has-sidebar-button="true"
-        :item-name="bridgeName"
-        @clickedSidebarButton="toggleSidebar"
-      />
-      <bridge-empty-state :downstream-pipeline-path="bridgeJob.downstreamPipeline.path" />
-      <bridge-sidebar
-        v-if="isSidebarExpanded"
-        :bridge-job="bridgeJob"
-        :commit="pipeline.commit"
-        :is-sidebar-expanded="isSidebarExpanded"
-        @toggleSidebar="toggleSidebar"
-      />
-    </div>
-  </div>
-</template>

app/assets/javascripts/jobs/bridge/components/constants.js

-export const SIDEBAR_COLLAPSE_BREAKPOINTS = ['xs', 'sm'];

app/assets/javascripts/jobs/bridge/components/empty_state.vue

-<script>
-import { GlButton } from '@gitlab/ui';
-import { __ } from '~/locale';
-
-export default {
-  name: 'BridgeEmptyState',
-  i18n: {
-    title: __('This job triggers a downstream pipeline'),
-    linkBtnText: __('View downstream pipeline'),
-  },
-  components: {
-    GlButton,
-  },
-  inject: {
-    emptyStateIllustrationPath: {
-      type: String,
-      require: true,
-    },
-  },
-  props: {
-    downstreamPipelinePath: {
-      type: String,
-      required: false,
-      default: undefined,
-    },
-  },
-};
-</script>
-
-<template>
-  <div class="gl-display-flex gl-flex-direction-column gl-align-items-center gl-mt-11">
-    <img :src="emptyStateIllustrationPath" />
-    <h1 class="gl-font-size-h1">{{ $options.i18n.title }}</h1>
-    <gl-button
-      v-if="downstreamPipelinePath"
-      class="gl-mt-3"
-      category="secondary"
-      variant="confirm"
-      size="medium"
-      :href="downstreamPipelinePath"
-    >
-      {{ $options.i18n.linkBtnText }}
-    </gl-button>
-  </div>
-</template>

app/assets/javascripts/jobs/bridge/components/sidebar.vue

-<script>
-import { GlButton, GlDropdown, GlDropdownItem } from '@gitlab/ui';
-import { __ } from '~/locale';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate/tooltip_on_truncate.vue';
-import { JOB_SIDEBAR } from '../../constants';
-import CommitBlock from '../../components/commit_block.vue';
-
-export default {
-  styles: {
-    width: '290px',
-  },
-  name: 'BridgeSidebar',
-  i18n: {
-    ...JOB_SIDEBAR,
-    retryButton: __('Retry'),
-    retryTriggerJob: __('Retry the trigger job'),
-    retryDownstreamPipeline: __('Retry the downstream pipeline'),
-  },
-  sectionClass: ['gl-border-t-solid', 'gl-border-t-1', 'gl-border-t-gray-100', 'gl-py-5'],
-  components: {
-    CommitBlock,
-    GlButton,
-    GlDropdown,
-    GlDropdownItem,
-    TooltipOnTruncate,
-  },
-  mixins: [glFeatureFlagsMixin()],
-  props: {
-    bridgeJob: {
-      type: Object,
-      required: true,
-    },
-    commit: {
-      type: Object,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      topPosition: 0,
-    };
-  },
-  computed: {
-    rootStyle() {
-      return { ...this.$options.styles, top: `${this.topPosition}px` };
-    },
-  },
-  mounted() {
-    this.setTopPosition();
-  },
-  methods: {
-    onSidebarButtonClick() {
-      this.$emit('toggleSidebar');
-    },
-    setTopPosition() {
-      const navbarEl = document.querySelector('.js-navbar');
-
-      if (navbarEl) {
-        this.topPosition = navbarEl.getBoundingClientRect().bottom;
-      }
-    },
-  },
-};
-</script>
-<template>
-  <aside
-    class="gl-fixed gl-right-0 gl-px-5 gl-bg-gray-10 gl-h-full gl-border-l-solid gl-border-1 gl-border-gray-100 gl-z-index-200 gl-overflow-hidden"
-    :style="rootStyle"
-  >
-    <div class="gl-py-5 gl-display-flex gl-align-items-center">
-      <tooltip-on-truncate :title="bridgeJob.name" truncate-target="child"
-        ><h4 class="gl-mb-0 gl-mr-2 gl-text-truncate">
-          {{ bridgeJob.name }}
-        </h4>
-      </tooltip-on-truncate>
-      <!-- TODO: implement retry actions -->
-      <div
-        v-if="glFeatures.triggerJobRetryAction"
-        class="gl-flex-grow-1 gl-flex-shrink-0 gl-text-right"
-      >
-        <gl-dropdown
-          :text="$options.i18n.retryButton"
-          category="primary"
-          variant="confirm"
-          right
-          size="medium"
-        >
-          <gl-dropdown-item>{{ $options.i18n.retryTriggerJob }}</gl-dropdown-item>
-          <gl-dropdown-item>{{ $options.i18n.retryDownstreamPipeline }}</gl-dropdown-item>
-        </gl-dropdown>
-      </div>
-      <gl-button
-        :aria-label="$options.i18n.toggleSidebar"
-        data-testid="sidebar-expansion-toggle"
-        category="tertiary"
-        class="gl-md-display-none gl-ml-2"
-        icon="chevron-double-lg-right"
-        @click="onSidebarButtonClick"
-      />
-    </div>
-    <commit-block :commit="commit" :class="$options.sectionClass" />
-    <!-- TODO: show stage dropdown, jobs list -->
-  </aside>
-</template>

app/assets/javascripts/jobs/bridge/graphql/queries/pipeline.query.graphql

-query getPipelineData($fullPath: ID!, $iid: ID!) {
-  project(fullPath: $fullPath) {
-    id
-    pipeline(iid: $iid) {
-      id
-      iid
-      path
-      sha
-      ref
-      refPath
-      commit {
-        id
-        shortId
-        title
-        webPath
-      }
-      detailedStatus {
-        id
-        icon
-        group
-      }
-      stages {
-        edges {
-          node {
-            id
-            name
-            jobs {
-              nodes {
-                id
-                createdAt
-                name
-                scheduledAt
-                startedAt
-                status
-                triggered
-                detailedStatus {
-                  id
-                  detailsPath
-                  icon
-                  group
-                  text
-                  tooltip
-                }
-                downstreamPipeline {
-                  id
-                  path
-                }
-                stage {
-                  id
-                  name
-                }
-              }
-            }
-          }
-        }
-      }
-      user {
-        id
-        avatarUrl
-        name
-        username
-        webPath
-        webUrl
-        status {
-          message
-        }
-      }
-    }
-  }
-}

app/assets/javascripts/jobs/index.js

 import Vue from 'vue';
-import VueApollo from 'vue-apollo';
-import createDefaultClient from '~/lib/graphql';
-import BridgeApp from './bridge/app.vue';
 import JobApp from './components/job_app.vue';
 import createStore from './store';
 
@@ -51,43 +48,7 @@ const initializeJobPage = (element) => {
   });
 };
 
-const initializeBridgePage = (el) => {
-  const {
-    buildId,
-    downstreamPipelinePath,
-    emptyStateIllustrationPath,
-    pipelineIid,
-    projectFullPath,
-  } = el.dataset;
-
-  Vue.use(VueApollo);
-  const apolloProvider = new VueApollo({
-    defaultClient: createDefaultClient(),
-  });
-
-  return new Vue({
-    el,
-    apolloProvider,
-    provide: {
-      buildId,
-      downstreamPipelinePath,
-      emptyStateIllustrationPath,
-      pipelineIid,
-      projectFullPath,
-    },
-    render(h) {
-      return h(BridgeApp);
-    },
-  });
-};
-
 export default () => {
   const jobElement = document.getElementById('js-job-page');
-  const bridgeElement = document.getElementById('js-bridge-page');
-
-  if (jobElement) {
-    initializeJobPage(jobElement);
-  } else {
-    initializeBridgePage(bridgeElement);
-  }
+  initializeJobPage(jobElement);
 };

app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue

 <script>
-import { GlForm, GlIcon, GlLink, GlButton, GlSprintf, GlAlert } from '@gitlab/ui';
+import {
+  GlForm,
+  GlIcon,
+  GlLink,
+  GlButton,
+  GlSprintf,
+  GlAlert,
+  GlFormGroup,
+  GlFormInput,
+  GlFormSelect,
+} from '@gitlab/ui';
 import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue';
 import axios from '~/lib/utils/axios_utils';
 import csrf from '~/lib/utils/csrf';
@@ -76,9 +86,12 @@ export default {
   },
   components: {
     GlAlert,
+    GlIcon,
     GlForm,
+    GlFormGroup,
+    GlFormInput,
+    GlFormSelect,
     GlSprintf,
-    GlIcon,
     GlLink,
     GlButton,
     MarkdownField,
@@ -311,155 +324,151 @@ export default {
       name="wiki[last_commit_sha]"
       :value="pageInfo.lastCommitSha"
     />
-    <div class="form-group row">
-      <div class="col-sm-2 col-form-label">
-        <label class="control-label-full-width" for="wiki_title">{{
-          $options.i18n.title.label
-        }}</label>
-      </div>
-      <div class="col-sm-10">
-        <input
-          id="wiki_title"
-          v-model="title"
-          name="wiki[title]"
-          type="text"
-          class="form-control"
-          data-qa-selector="wiki_title_textbox"
-          :required="true"
-          :autofocus="!pageInfo.persisted"
-          :placeholder="$options.i18n.title.placeholder"
-          @input="updateCommitMessage"
-        />
-        <span class="gl-display-inline-block gl-max-w-full gl-mt-2 gl-text-gray-600">
-          <gl-icon class="gl-mr-n1" name="bulb" />
-          {{ titleHelpText }}
-          <gl-link :href="helpPath" target="_blank">
-            {{ $options.i18n.title.helpText.learnMore }}
-          </gl-link>
-        </span>
-      </div>
-    </div>
-    <div class="form-group row">
-      <div class="col-sm-2 col-form-label">
-        <label class="control-label-full-width" for="wiki_format">{{
-          $options.i18n.format.label
-        }}</label>
+
+    <div class="row">
+      <div class="col-sm-9">
+        <gl-form-group :label="$options.i18n.title.label" label-for="wiki_title">
+          <template #description>
+            <gl-icon class="gl-mr-n1" name="bulb" />
+            {{ titleHelpText }}
+            <gl-link :href="helpPath" target="_blank">
+              {{ $options.i18n.title.helpText.learnMore }}
+            </gl-link>
+          </template>
+
+          <gl-form-input
+            id="wiki_title"
+            v-model="title"
+            name="wiki[title]"
+            type="text"
+            class="form-control"
+            data-qa-selector="wiki_title_textbox"
+            :required="true"
+            :autofocus="!pageInfo.persisted"
+            :placeholder="$options.i18n.title.placeholder"
+            @input="updateCommitMessage"
+          />
+        </gl-form-group>
       </div>
-      <div class="col-sm-10">
-        <select
-          id="wiki_format"
-          v-model="format"
-          class="form-control"
-          name="wiki[format]"
-          :disabled="isContentEditorActive"
-        >
-          <option v-for="(key, label) of formatOptions" :key="key" :value="key">
-            {{ label }}
-          </option>
-        </select>
+
+      <div class="col-sm-3 row-sm-10">
+        <gl-form-group :label="$options.i18n.format.label" label-for="wiki_format">
+          <gl-form-select
+            id="wiki_format"
+            v-model="format"
+            name="wiki[format]"
+            :disabled="isContentEditorActive"
+            class="form-control"
+            :value="formatOptions.Markdown"
+          >
+            <option v-for="(key, label) of formatOptions" :key="key" :value="key">
+              {{ label }}
+            </option>
+          </gl-form-select>
+        </gl-form-group>
       </div>
     </div>
-    <div class="form-group row" data-testid="wiki-form-content-fieldset">
-      <div class="col-sm-2 col-form-label">
-        <label class="control-label-full-width" for="wiki_content">{{
-          $options.i18n.content.label
-        }}</label>
-      </div>
-      <div class="col-sm-10">
-        <div v-if="isMarkdownFormat" class="gl-display-flex gl-justify-content-end gl-mb-3">
-          <gl-button
-            data-testid="toggle-editing-mode-button"
-            data-qa-selector="editing_mode_button"
-            :data-qa-mode="toggleEditingModeButtonText"
-            variant="link"
-            @click="toggleEditingMode"
-            >{{ toggleEditingModeButtonText }}</gl-button
-          >
-        </div>
-        <local-storage-sync
-          storage-key="gl-wiki-content-editor-enabled"
-          :value="useContentEditor"
-          @input="setUseContentEditor"
-        />
-        <markdown-field
-          v-if="!isContentEditorActive"
-          :markdown-preview-path="pageInfo.markdownPreviewPath"
-          :can-attach-file="true"
-          :enable-autocomplete="true"
-          :textarea-value="content"
-          :markdown-docs-path="pageInfo.markdownHelpPath"
-          :uploads-path="pageInfo.uploadsPath"
-          :enable-preview="isMarkdownFormat"
-          class="bordered-box"
-        >
-          <template #textarea>
-            <textarea
-              id="wiki_content"
-              ref="textarea"
-              v-model="content"
-              name="wiki[content]"
-              class="note-textarea js-gfm-input js-autosize markdown-area"
-              dir="auto"
-              data-supports-quick-actions="false"
-              data-qa-selector="wiki_content_textarea"
-              :autofocus="pageInfo.persisted"
-              :aria-label="$options.i18n.content.label"
-              :placeholder="$options.i18n.content.placeholder"
-              @input="handleContentChange"
+
+    <div class="row" data-testid="wiki-form-content-fieldset">
+      <div class="col-sm-12 row-sm-5">
+        <gl-form-group>
+          <div v-if="isMarkdownFormat" class="gl-display-flex gl-justify-content-end gl-mb-3">
+            <gl-button
+              data-testid="toggle-editing-mode-button"
+              data-qa-selector="editing_mode_button"
+              :data-qa-mode="toggleEditingModeButtonText"
+              variant="link"
+              @click="toggleEditingMode"
+              >{{ toggleEditingModeButtonText }}</gl-button
             >
-            </textarea>
-          </template>
-        </markdown-field>
-        <div v-if="isContentEditorActive">
-          <content-editor
-            :render-markdown="renderMarkdown"
-            :uploads-path="pageInfo.uploadsPath"
-            @initialized="loadInitialContent"
-            @change="handleContentEditorChange"
+          </div>
+          <local-storage-sync
+            storage-key="gl-wiki-content-editor-enabled"
+            :value="useContentEditor"
+            @input="setUseContentEditor"
           />
-          <input id="wiki_content" v-model.trim="content" type="hidden" name="wiki[content]" />
-        </div>
-
-        <div class="clearfix"></div>
-        <div class="error-alert"></div>
-
-        <div class="form-text gl-text-gray-600">
-          <gl-sprintf v-if="displayWikiSpecificMarkdownHelp" :message="$options.i18n.linksHelpText">
-            <template #linkExample
-              ><code>{{ linkExample }}</code></template
+          <markdown-field
+            v-if="!isContentEditorActive"
+            :markdown-preview-path="pageInfo.markdownPreviewPath"
+            :can-attach-file="true"
+            :enable-autocomplete="true"
+            :textarea-value="content"
+            :markdown-docs-path="pageInfo.markdownHelpPath"
+            :uploads-path="pageInfo.uploadsPath"
+            :enable-preview="isMarkdownFormat"
+            class="bordered-box"
+          >
+            <template #textarea>
+              <textarea
+                id="wiki_content"
+                ref="textarea"
+                v-model="content"
+                name="wiki[content]"
+                class="note-textarea js-gfm-input js-autosize markdown-area"
+                dir="auto"
+                data-supports-quick-actions="false"
+                data-qa-selector="wiki_content_textarea"
+                :autofocus="pageInfo.persisted"
+                :aria-label="$options.i18n.content.label"
+                :placeholder="$options.i18n.content.placeholder"
+                @input="handleContentChange"
+              >
+              </textarea>
+            </template>
+          </markdown-field>
+          <div v-if="isContentEditorActive">
+            <content-editor
+              :render-markdown="renderMarkdown"
+              :uploads-path="pageInfo.uploadsPath"
+              @initialized="loadInitialContent"
+              @change="handleContentEditorChange"
+            />
+            <input id="wiki_content" v-model.trim="content" type="hidden" name="wiki[content]" />
+          </div>
+
+          <div class="clearfix"></div>
+          <div class="error-alert"></div>
+
+          <div class="form-text gl-text-gray-600">
+            <gl-sprintf
+              v-if="displayWikiSpecificMarkdownHelp"
+              :message="$options.i18n.linksHelpText"
             >
-            <template
-              #link="// eslint-disable-next-line vue/no-template-shadow
+              <template #linkExample>
+                <code>{{ linkExample }}</code>
+              </template>
+              <template
+                #link="// eslint-disable-next-line vue/no-template-shadow
                 { content }"
-              ><gl-link
-                :href="wikiSpecificMarkdownHelpPath"
-                target="_blank"
-                data-testid="wiki-markdown-help-link"
-                >{{ content }}</gl-link
-              ></template
-            >
-          </gl-sprintf>
-        </div>
+                ><gl-link
+                  :href="wikiSpecificMarkdownHelpPath"
+                  target="_blank"
+                  data-testid="wiki-markdown-help-link"
+                  >{{ content }}</gl-link
+                ></template
+              >
+            </gl-sprintf>
+          </div>
+        </gl-form-group>
       </div>
     </div>
-    <div class="form-group row">
-      <div class="col-sm-2 col-form-label">
-        <label class="control-label-full-width" for="wiki_message">{{
-          $options.i18n.commitMessage.label
-        }}</label>
-      </div>
-      <div class="col-sm-10">
-        <input
-          id="wiki_message"
-          v-model.trim="commitMessage"
-          name="wiki[message]"
-          type="text"
-          class="form-control"
-          data-qa-selector="wiki_message_textbox"
-          :placeholder="$options.i18n.commitMessage.label"
-        />
+
+    <div class="row">
+      <div class="col-sm-12 row-sm-5">
+        <gl-form-group :label="$options.i18n.commitMessage.label" label-for="wiki_message">
+          <gl-form-input
+            id="wiki_message"
+            v-model.trim="commitMessage"
+            name="wiki[message]"
+            type="text"
+            class="form-control"
+            data-qa-selector="wiki_message_textbox"
+            :placeholder="$options.i18n.commitMessage.label"
+          />
+        </gl-form-group>
       </div>
     </div>
+
     <div class="form-actions">
       <gl-button
         category="primary"

app/assets/javascripts/projects/new/components/new_project_url_select.vue

@@ -57,10 +57,7 @@ export default {
             id: this.namespaceId,
             fullPath: this.namespaceFullPath,
           }
-        : {
-            id: undefined,
-            fullPath: s__('ProjectsNew|Pick a group or namespace'),
-          },
+        : this.$options.emptyNameSpace,
       shouldSkipQuery: true,
       userNamespaceId: this.userNamespaceId,
     };
@@ -120,12 +117,18 @@ export default {
       this.setNamespace({ id, fullPath });
     },
     setNamespace({ id, fullPath }) {
-      this.selectedNamespace = {
-        id: getIdFromGraphQLId(id),
-        fullPath,
-      };
+      this.selectedNamespace = id
+        ? {
+            id: getIdFromGraphQLId(id),
+            fullPath,
+          }
+        : this.$options.emptyNameSpace;
     },
   },
+  emptyNameSpace: {
+    id: undefined,
+    fullPath: s__('ProjectsNew|Pick a group or namespace'),
+  },
 };
 </script>
 

app/assets/javascripts/projects/pipelines/charts/components/app.vue

@@ -14,6 +14,8 @@ export default {
     LeadTimeCharts: () => import('ee_component/dora/components/lead_time_charts.vue'),
     TimeToRestoreServiceCharts: () =>
       import('ee_component/dora/components/time_to_restore_service_charts.vue'),
+    ChangeFailureRateCharts: () =>
+      import('ee_component/dora/components/change_failure_rate_charts.vue'),
     ProjectQualitySummary: () => import('ee_component/project_quality_summary/app.vue'),
   },
   piplelinesTabEvent: 'p_analytics_ci_cd_pipelines',
@@ -40,7 +42,12 @@ export default {
       const chartsToShow = ['pipelines'];
 
       if (this.shouldRenderDoraCharts) {
-        chartsToShow.push('deployment-frequency', 'lead-time', 'time-to-restore-service');
+        chartsToShow.push(
+          'deployment-frequency',
+          'lead-time',
+          'time-to-restore-service',
+          'change-failure-rate',
+        );
       }
 
       if (this.shouldRenderQualitySummary) {
@@ -105,6 +112,12 @@ export default {
         >
           <time-to-restore-service-charts />
         </gl-tab>
+        <gl-tab
+          :title="s__('DORA4Metrics|Change failure rate')"
+          data-testid="change-failure-rate-tab"
+        >
+          <change-failure-rate-charts />
+        </gl-tab>
       </template>
       <gl-tab v-if="shouldRenderQualitySummary" :title="s__('QualitySummary|Project quality')">
         <project-quality-summary />

app/assets/javascripts/projects/project_new.js

@@ -342,6 +342,7 @@ const bindEvents = () => {
 
 export default {
   bindEvents,
+  validateGroupNamespaceDropdown,
   deriveProjectPathFromUrl,
   onProjectNameChange,
   onProjectPathChange,

app/assets/javascripts/runner/components/runner_filtered_search_bar.vue

@@ -45,7 +45,7 @@ export default {
     },
   },
   data() {
-    // filtered_search_bar_root.vue may mutate the inital
+    // filtered_search_bar_root.vue may mutate the initial
     // filters. Use `cloneDeep` to prevent those mutations
     // from affecting this component
     const { filters, sort } = cloneDeep(this.value);
@@ -54,6 +54,14 @@ export default {
       initialSortBy: sort,
     };
   },
+  computed: {
+    validTokens() {
+      // Some filters are only available in EE
+      // EE-only tokens are represented by `null` or `undefined`
+      // values when in CE
+      return this.tokens.filter(Boolean);
+    },
+  },
   methods: {
     onFilter(filters) {
       // Apply new filters, from page 1
@@ -83,7 +91,7 @@ export default {
     recent-searches-storage-key="runners-search"
     :sort-options="$options.sortOptions"
     :initial-filter-value="initialFilterValue"
-    :tokens="tokens"
+    :tokens="validTokens"
     :initial-sort-by="initialSortBy"
     :search-input-placeholder="__('Search or filter results...')"
     data-testid="runners-filtered-search"

app/assets/javascripts/surveys/merge_request_experience/app.vue

 <script>
-import { GlButton, GlSprintf, GlSafeHtmlDirective } from '@gitlab/ui';
+import { GlButton, GlSprintf, GlSafeHtmlDirective, GlTooltipDirective } from '@gitlab/ui';
 import gitlabLogo from '@gitlab/svgs/dist/illustrations/gitlab_logo.svg';
 import { s__, __ } from '~/locale';
 import UserCalloutDismisser from '~/vue_shared/components/user_callout_dismisser.vue';
@@ -29,6 +29,7 @@ export default {
   },
   directives: {
     safeHtml: GlSafeHtmlDirective,
+    tooltip: GlTooltipDirective,
   },
   mixins: [Tracking.mixin()],
   i18n: {
@@ -92,7 +93,7 @@ export default {
   >
     <template #default="{ dismiss }">
       <aside
-        class="gl-fixed gl-bottom-0 gl-right-0 gl-z-index-9999 gl-p-5"
+        class="mr-experience-survey-wrapper gl-fixed gl-bottom-0 gl-right-0 gl-p-5"
         :aria-label="$options.i18n.survey"
       >
         <transition name="survey-slide-up">
@@ -101,6 +102,7 @@ export default {
             class="mr-experience-survey-body gl-relative gl-display-flex gl-flex-direction-column gl-bg-white gl-p-5 gl-border gl-rounded-base"
           >
             <gl-button
+              v-tooltip="$options.i18n.close"
               :aria-label="$options.i18n.close"
               variant="default"
               category="tertiary"

app/assets/stylesheets/pages/merge_requests.scss

@@ -350,6 +350,13 @@ $comparison-empty-state-height: 62px;
   }
 }
 
+.mr-experience-survey-wrapper {
+  // setting this explicitly because:
+  //   diff-files-holder has z-index 203
+  //   z-index 9999 utility class breaks tooltips
+  z-index: 210;
+}
+
 .mr-experience-survey-body {
   width: 300px;
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);

app/controllers/profiles/personal_access_tokens_controller.rb

@@ -14,6 +14,13 @@ def index
       name: params[:name],
       scopes: scopes
     )
+
+    respond_to do |format|
+      format.html
+      format.json do
+        render json: @active_personal_access_tokens
+      end
+    end
   end
 
   def create
@@ -56,6 +63,28 @@ def set_index_vars
 
   def active_personal_access_tokens
     tokens = finder(state: 'active', sort: 'expires_at_asc').execute
+
+    if Feature.enabled?('access_token_pagination')
+      tokens = tokens.page(page)
+      add_pagination_headers(tokens)
+    end
+
     ::API::Entities::PersonalAccessTokenWithDetails.represent(tokens)
   end
+
+  def add_pagination_headers(relation)
+    Gitlab::Pagination::OffsetHeaderBuilder.new(
+      request_context: self,
+      per_page: relation.limit_value,
+      page: relation.current_page,
+      next_page: relation.next_page,
+      prev_page: relation.prev_page,
+      total: relation.total_count,
+      params: params.permit(:page)
+    ).execute
+  end
+
+  def page
+    (params[:page] || 1).to_i
+  end
 end

app/controllers/projects/jobs_controller.rb

@@ -22,10 +22,6 @@ class Projects::JobsController < Projects::ApplicationController
   before_action :push_jobs_table_vue_search, only: [:index]
   before_action :reject_if_build_artifacts_size_refreshing!, only: [:erase]
 
-  before_action do
-    push_frontend_feature_flag(:trigger_job_retry_action, @project)
-  end
-
   layout 'project'
 
   feature_category :continuous_integration

app/finders/issuable_finder.rb

@@ -436,7 +436,7 @@ def by_negated_milestone(items)
     elsif not_params.filter_by_started_milestone?
       items.joins(:milestone).merge(Milestone.not_started)
     else
-      items.without_particular_milestone(not_params[:milestone_title])
+      items.without_particular_milestones(not_params[:milestone_title])
     end
   end
   # rubocop: enable CodeReuse/ActiveRecord

app/helpers/application_settings_helper.rb

@@ -238,6 +238,8 @@ def visible_attributes
       :email_author_in_body,
       :enabled_git_access_protocol,
       :enforce_terms,
+      :error_tracking_enabled,
+      :error_tracking_api_url,
       :external_pipeline_validation_service_timeout,
       :external_pipeline_validation_service_token,
       :external_pipeline_validation_service_url,

app/helpers/emails_helper.rb

@@ -116,19 +116,16 @@ def closure_reason_text(closed_via, format: nil)
     end
   end
 
-  # "You are receiving this email because #{reason} on #{gitlab_host}."
-  def notification_reason_text(reason)
-    gitlab_host = Gitlab.config.gitlab.host
-
-    case reason
-    when NotificationReason::OWN_ACTIVITY
-      _("You're receiving this email because of your activity on %{host}.") % { host: gitlab_host }
-    when NotificationReason::ASSIGNED
-      _("You're receiving this email because you have been assigned an item on %{host}.") % { host: gitlab_host }
-    when NotificationReason::MENTIONED
-      _("You're receiving this email because you have been mentioned on %{host}.") % { host: gitlab_host }
+  # "You are receiving this email because ... on #{host}. ..."
+  def notification_reason_text(reason: nil, show_manage_notifications_link: false, show_help_link: false, manage_label_subscriptions_url: nil, unsubscribe_url: nil, format: :text)
+    if unsubscribe_url && show_manage_notifications_link && show_help_link
+      notification_reason_text_with_unsubscribe_and_manage_notifications_and_help_links(reason: reason, unsubscribe_url: unsubscribe_url, format: format)
+    elsif !reason && manage_label_subscriptions_url && show_help_link
+      notification_reason_text_with_manage_label_subscriptions_and_help_links(manage_label_subscriptions_url: manage_label_subscriptions_url, format: format)
+    elsif show_manage_notifications_link && show_help_link
+      notification_reason_text_with_manage_notifications_and_help_links(reason: reason, format: format)
     else
-      _("You're receiving this email because of your account on %{host}.") % { host: gitlab_host }
+      notification_reason_text_without_links(reason: reason, format: format)
     end
   end
 
@@ -259,9 +256,7 @@ def group_membership_expiration_changed_link(member, group, format: nil)
   end
 
   def instance_access_request_text(user, format: nil)
-    gitlab_host = Gitlab.config.gitlab.host
-
-    _('%{username} has asked for a GitLab account on your instance %{host}:') % { username: sanitize_name(user.name), host: gitlab_host }
+    _('%{username} has asked for a GitLab account on your instance %{host}:').html_safe % { username: sanitize_name(user.name), host: gitlab_host_link(format) }
   end
 
   def instance_access_request_link(user, format: nil)
@@ -325,6 +320,75 @@ def show_header?
   def email_header_and_footer_enabled?
     current_appearance&.email_header_and_footer_enabled?
   end
+
+  def gitlab_host_link(format)
+    case format
+    when :html
+      generate_link(Gitlab.config.gitlab.host, Gitlab.config.gitlab.url)
+    when :text
+      Gitlab.config.gitlab.host
+    end
+  end
+
+  def notification_reason_text_with_unsubscribe_and_manage_notifications_and_help_links(reason:, unsubscribe_url:, format:)
+    unsubscribe_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: unsubscribe_url }
+    unsubscribe_link_end = '</a>'.html_safe
+
+    manage_notifications_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" class="mng-notif-link">'.html_safe % { url: profile_notifications_url }
+    manage_notifications_link_end = '</a>'.html_safe
+
+    help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" class="help-link">'.html_safe % { url: help_url }
+    help_link_end = '</a>'.html_safe
+
+    case reason
+    when NotificationReason::OWN_ACTIVITY
+      _("You're receiving this email because of your activity on %{host}. %{unsubscribe_link_start}Unsubscribe%{unsubscribe_link_end} from this thread &middot; %{manage_notifications_link_start}Manage all notifications%{manage_notifications_link_end} &middot; %{help_link_start}Help%{help_link_end}").html_safe % { host: gitlab_host_link(format), unsubscribe_link_start: unsubscribe_link_start, unsubscribe_link_end: unsubscribe_link_end, manage_notifications_link_start: manage_notifications_link_start, manage_notifications_link_end: manage_notifications_link_end, help_link_start: help_link_start, help_link_end: help_link_end }
+    when NotificationReason::ASSIGNED
+      _("You're receiving this email because you have been assigned an item on %{host}. %{unsubscribe_link_start}Unsubscribe%{unsubscribe_link_end} from this thread &middot; %{manage_notifications_link_start}Manage all notifications%{manage_notifications_link_end} &middot; %{help_link_start}Help%{help_link_end}").html_safe % { host: gitlab_host_link(format), unsubscribe_link_start: unsubscribe_link_start, unsubscribe_link_end: unsubscribe_link_end, manage_notifications_link_start: manage_notifications_link_start, manage_notifications_link_end: manage_notifications_link_end, help_link_start: help_link_start, help_link_end: help_link_end }
+    when NotificationReason::MENTIONED
+      _("You're receiving this email because you have been mentioned on %{host}. %{unsubscribe_link_start}Unsubscribe%{unsubscribe_link_end} from this thread &middot; %{manage_notifications_link_start}Manage all notifications%{manage_notifications_link_end} &middot; %{help_link_start}Help%{help_link_end}").html_safe % { host: gitlab_host_link(format), unsubscribe_link_start: unsubscribe_link_start, unsubscribe_link_end: unsubscribe_link_end, manage_notifications_link_start: manage_notifications_link_start, manage_notifications_link_end: manage_notifications_link_end, help_link_start: help_link_start, help_link_end: help_link_end }
+    else
+      _("You're receiving this email because of your account on %{host}. %{unsubscribe_link_start}Unsubscribe%{unsubscribe_link_end} from this thread &middot; %{manage_notifications_link_start}Manage all notifications%{manage_notifications_link_end} &middot; %{help_link_start}Help%{help_link_end}").html_safe % { host: gitlab_host_link(format), unsubscribe_link_start: unsubscribe_link_start, unsubscribe_link_end: unsubscribe_link_end, manage_notifications_link_start: manage_notifications_link_start, manage_notifications_link_end: manage_notifications_link_end, help_link_start: help_link_start, help_link_end: help_link_end }
+    end
+  end
+
+  def notification_reason_text_with_manage_label_subscriptions_and_help_links(manage_label_subscriptions_url:, format:)
+    manage_label_subscriptions_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" class="mng-notif-link">'.html_safe % { url: manage_label_subscriptions_url }
+    manage_label_subscriptions_link_end = '</a>'.html_safe
+
+    help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" class="help-link">'.html_safe % { url: help_url }
+    help_link_end = '</a>'.html_safe
+
+    _("You're receiving this email because of your account on %{host}. %{manage_label_subscriptions_link_start}Manage label subscriptions%{manage_label_subscriptions_link_end} &middot; %{help_link_start}Help%{help_link_end}").html_safe % { host: gitlab_host_link(format), manage_label_subscriptions_link_start: manage_label_subscriptions_link_start, manage_label_subscriptions_link_end: manage_label_subscriptions_link_end, help_link_start: help_link_start, help_link_end: help_link_end }
+  end
+
+  def notification_reason_text_with_manage_notifications_and_help_links(reason:, format:)
+    manage_notifications_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" class="mng-notif-link">'.html_safe % { url: profile_notifications_url }
+    manage_notifications_link_end = '</a>'.html_safe
+
+    help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer" class="help-link">'.html_safe % { url: help_url }
+    help_link_end = '</a>'.html_safe
+
+    case reason
+    when NotificationReason::MENTIONED
+      _("You're receiving this email because you have been mentioned on %{host}. %{manage_notifications_link_start}Manage all notifications%{manage_notifications_link_end} &middot; %{help_link_start}Help%{help_link_end}").html_safe % { host: gitlab_host_link(format), manage_notifications_link_start: manage_notifications_link_start, manage_notifications_link_end: manage_notifications_link_end, help_link_start: help_link_start, help_link_end: help_link_end }
+    else
+      _("You're receiving this email because of your account on %{host}. %{manage_notifications_link_start}Manage all notifications%{manage_notifications_link_end} &middot; %{help_link_start}Help%{help_link_end}").html_safe % { host: gitlab_host_link(format), manage_notifications_link_start: manage_notifications_link_start, manage_notifications_link_end: manage_notifications_link_end, help_link_start: help_link_start, help_link_end: help_link_end }
+    end
+  end
+
+  def notification_reason_text_without_links(reason:, format:)
+    case reason
+    when NotificationReason::OWN_ACTIVITY
+      _("You're receiving this email because of your activity on %{host}.").html_safe % { host: gitlab_host_link(format) }
+    when NotificationReason::ASSIGNED
+      _("You're receiving this email because you have been assigned an item on %{host}.").html_safe % { host: gitlab_host_link(format) }
+    when NotificationReason::MENTIONED
+      _("You're receiving this email because you have been mentioned on %{host}.").html_safe % { host: gitlab_host_link(format) }
+    else
+      _("You're receiving this email because of your account on %{host}.").html_safe % { host: gitlab_host_link(format) }
+    end
+  end
 end
 
 EmailsHelper.prepend_mod_with('EmailsHelper')