From d9e07a155e65cd4a7d2a1e0f10cd200a6b57371e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 18 Aug 2020 15:10:33 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .markdownlint.json                            |   1 +
 .../design_management/utils/cache_update.js   |  13 +-
 .../diffs/components/diff_content.vue         |   2 +-
 .../diffs/components/diff_file.vue            |   1 +
 .../diffs/components/diff_table_cell.vue      |  51 ++++++--
 app/assets/javascripts/diffs/store/utils.js   |   4 +
 .../filtered_search_visual_tokens.js          |   4 +-
 .../components/time_tracking/time_tracker.vue |   4 +-
 .../rich_content_editor/constants.js          |   9 +-
 .../rich_content_editor.vue                   |  17 +--
 .../services/build_custom_renderer.js         |  70 +++--------
 .../services/editor_service.js                |  10 ++
 .../stylesheets/fontawesome_custom.scss       |   1 -
 app/assets/stylesheets/framework/filters.scss |   8 +-
 app/assets/stylesheets/pages/notes.scss       |  16 ++-
 app/assets/stylesheets/pages/todos.scss       |   4 +
 .../projects/variables_controller.rb          |   7 +-
 .../mutations/design_management/move.rb       |   2 +-
 app/models/design_management/design.rb        |   2 +-
 .../design_management/design_collection.rb    |   4 +-
 app/models/project_services/jira_service.rb   |   6 +
 app/policies/project_policy.rb                |   2 +-
 .../packages/detail/package_presenter.rb      |   1 +
 app/services/ci/change_variable_service.rb    |   7 +-
 .../design_management/move_designs_service.rb |   2 +-
 .../jira_import/cloud_users_mapper_service.rb |  19 +++
 .../server_users_mapper_service.rb            |  19 +++
 app/services/jira_import/users_importer.rb    |  38 ++++--
 app/services/jira_import/users_mapper.rb      |  30 -----
 .../jira_import/users_mapper_service.rb       |  52 ++++++++
 bin/feature-flag                              |  43 +++++--
 ...25946-replace-fa-close-with-gitlab-svg.yml |   5 +
 .../unreleased/232998-package-metadata.yml    |   5 +
 ...mpatibility_on_jira_users_api_endpoint.yml |   5 +
 ...5797-fix-issues-analytics-feature-name.yml |   5 +
 .../unreleased/reorder-designs-fixes.yml      |   5 +
 ...link-comments-disable-symlink-comments.yml |   6 +
 changelogs/unreleased/todo-labels.yml         |   5 +
 .../development/ci_if_parenthesis_enabled.yml |   7 ++
 .../development/ci_plan_needs_size_limit.yml  |   7 ++
 .../development/reorder_designs.yml           |   2 +-
 .../initializers/rails_host_authorization.rb  |   2 +-
 ...0639_backfill_designs_relative_position.rb |  31 +----
 doc/api/repositories.md                       |  11 +-
 doc/ci/variables/README.md                    |   4 +-
 doc/ci/yaml/README.md                         |  18 +--
 doc/development/deleting_migrations.md        |   2 +-
 doc/development/feature_flags/development.md  |  20 +--
 .../img/compliance_dashboard_v13_3.png        | Bin 41721 -> 0 bytes
 .../merge_requests/merge_request_approvals.md |  34 +++--
 lib/api/variables.rb                          |  29 +++--
 .../backfill_designs_relative_position.rb     |  49 +-------
 lib/gitlab/ci/features.rb                     |   4 +-
 lib/gitlab/usage_data.rb                      |   2 -
 .../track_unique_actions.rb                   |   2 -
 locale/gitlab.pot                             |   6 +
 package.json                                  |   2 +-
 spec/bin/feature_flag_spec.rb                 |  48 ++++++-
 .../filtered_search/visual_tokens_spec.rb     |   4 +-
 .../user_uploads_designs_spec.rb              |  28 +++--
 .../__mocks__/@toast-ui/vue-editor/index.js   |  11 ++
 .../alert_settings_form_spec.js.snap          |   4 +-
 .../__snapshots__/popover_spec.js.snap        |   2 +-
 .../toolbar/__snapshots__/index_spec.js.snap  |   2 +-
 .../upload/__snapshots__/button_spec.js.snap  |   6 +-
 .../pages/__snapshots__/index_spec.js.snap    |   2 +-
 .../design/__snapshots__/index_spec.js.snap   |   2 +-
 .../design/__snapshots__/index_spec.js.snap   |   2 +-
 .../diffs/components/diff_table_cell_spec.js  |  54 ++++++++
 .../filtered_search_visual_tokens_spec.js     |   4 +-
 .../grafana_integration_spec.js.snap          |   2 +-
 .../helpers/filtered_search_spec_helper.js    |   2 +-
 .../__snapshots__/alerts_form_spec.js.snap    |   2 +-
 .../incidents_settings_tabs_spec.js.snap      |   2 +-
 .../__snapshots__/pagerduty_form_spec.js.snap |   4 +-
 .../delete_user_modal_spec.js.snap            |   2 +-
 .../__snapshots__/delete_button_spec.js.snap  |   4 +-
 .../__snapshots__/empty_state_spec.js.snap    |   2 +-
 .../__snapshots__/clone_dropdown_spec.js.snap |   4 +-
 .../editor_service_spec.js                    |  24 ++++
 .../rich_content_editor_spec.js               |  51 +++++---
 ...backfill_designs_relative_position_spec.rb |  51 --------
 .../track_unique_actions_spec.rb              |  13 +-
 spec/lib/gitlab/usage_data_spec.rb            |  58 ++++-----
 ...backfill_designs_relative_position_spec.rb |  41 ------
 .../design_collection_spec.rb                 |   4 +-
 .../packages/detail/package_presenter_spec.rb |   9 ++
 spec/services/event_create_service_spec.rb    |   5 -
 .../cloud_users_mapper_service_spec.rb        |  19 +++
 .../server_users_mapper_service_spec.rb       |  19 +++
 .../jira_import/users_importer_spec.rb        | 117 +++++++++++++-----
 .../services/jira_import/users_mapper_spec.rb |  43 -------
 .../user_mapper_services_shared_examples.rb   |  39 ++++++
 yarn.lock                                     |  84 ++-----------
 94 files changed, 836 insertions(+), 651 deletions(-)
 create mode 100644 app/services/jira_import/cloud_users_mapper_service.rb
 create mode 100644 app/services/jira_import/server_users_mapper_service.rb
 delete mode 100644 app/services/jira_import/users_mapper.rb
 create mode 100644 app/services/jira_import/users_mapper_service.rb
 create mode 100644 changelogs/unreleased/225946-replace-fa-close-with-gitlab-svg.yml
 create mode 100644 changelogs/unreleased/232998-package-metadata.yml
 create mode 100644 changelogs/unreleased/235759_backward_compatibility_on_jira_users_api_endpoint.yml
 create mode 100644 changelogs/unreleased/235797-fix-issues-analytics-feature-name.yml
 create mode 100644 changelogs/unreleased/reorder-designs-fixes.yml
 create mode 100644 changelogs/unreleased/symlink-comments-disable-symlink-comments.yml
 create mode 100644 changelogs/unreleased/todo-labels.yml
 create mode 100644 config/feature_flags/development/ci_if_parenthesis_enabled.yml
 create mode 100644 config/feature_flags/development/ci_plan_needs_size_limit.yml
 delete mode 100644 doc/user/compliance/compliance_dashboard/img/compliance_dashboard_v13_3.png
 delete mode 100644 spec/lib/gitlab/background_migration/backfill_designs_relative_position_spec.rb
 delete mode 100644 spec/migrations/backfill_designs_relative_position_spec.rb
 create mode 100644 spec/services/jira_import/cloud_users_mapper_service_spec.rb
 create mode 100644 spec/services/jira_import/server_users_mapper_service_spec.rb
 delete mode 100644 spec/services/jira_import/users_mapper_spec.rb
 create mode 100644 spec/support/shared_examples/services/jira_import/user_mapper_services_shared_examples.rb

diff --git a/.markdownlint.json b/.markdownlint.json
index 253b7bd0c92..1c276dc42ba 100644
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -7,6 +7,7 @@
   "ul-style": {
     "style": "dash"
   },
+  "no-trailing-spaces": false,
   "line-length": false,
   "no-duplicate-header": {
     "allow_different_nesting": true
diff --git a/app/assets/javascripts/design_management/utils/cache_update.js b/app/assets/javascripts/design_management/utils/cache_update.js
index 3e6ed39fbe8..5df6e064b25 100644
--- a/app/assets/javascripts/design_management/utils/cache_update.js
+++ b/app/assets/javascripts/design_management/utils/cache_update.js
@@ -1,5 +1,6 @@
 /* eslint-disable @gitlab/require-i18n-strings */
 
+import { groupBy } from 'lodash';
 import createFlash from '~/flash';
 import { extractCurrentDiscussion, extractDesign } from './design_management_utils';
 import {
@@ -159,13 +160,11 @@ const updateImageDiffNoteInStore = (store, updateImageDiffNote, query, variables
 const addNewDesignToStore = (store, designManagementUpload, query) => {
   const data = store.readQuery(query);
 
-  const newDesigns = data.project.issue.designCollection.designs.nodes.reduce((acc, design) => {
-    if (!acc.find(d => d.filename === design.filename)) {
-      acc.push(design);
-    }
-
-    return acc;
-  }, designManagementUpload.designs);
+  const currentDesigns = data.project.issue.designCollection.designs.nodes;
+  const existingDesigns = groupBy(currentDesigns, 'filename');
+  const newDesigns = currentDesigns.concat(
+    designManagementUpload.designs.filter(d => !existingDesigns[d.filename]),
+  );
 
   let newVersionNode;
   const findNewVersions = designManagementUpload.designs.find(design => design.versions);
diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue
index 741462a849c..087a558efdc 100644
--- a/app/assets/javascripts/diffs/components/diff_content.vue
+++ b/app/assets/javascripts/diffs/components/diff_content.vue
@@ -147,7 +147,7 @@ export default {
           slot="image-overlay"
           :discussions="imageDiscussions"
           :file-hash="diffFileHash"
-          :can-comment="getNoteableData.current_user.can_create_note"
+          :can-comment="getNoteableData.current_user.can_create_note && !diffFile.brokenSymlink"
         />
         <div v-if="showNotesContainer" class="note-container">
           <user-avatar-link
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index 58a4a3981bf..623a4ae1f8f 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -167,6 +167,7 @@ export default {
     :id="file.file_hash"
     :class="{
       'is-active': currentDiffFileId === file.file_hash,
+      'comments-disabled': Boolean(file.brokenSymlink),
     }"
     :data-path="file.new_path"
     class="diff-file file-holder"
diff --git a/app/assets/javascripts/diffs/components/diff_table_cell.vue b/app/assets/javascripts/diffs/components/diff_table_cell.vue
index 198113e330a..49982a81372 100644
--- a/app/assets/javascripts/diffs/components/diff_table_cell.vue
+++ b/app/assets/javascripts/diffs/components/diff_table_cell.vue
@@ -1,8 +1,9 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
-import { GlIcon } from '@gitlab/ui';
+import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
 import { getParameterByName, parseBoolean } from '~/lib/utils/common_utils';
 import DiffGutterAvatars from './diff_gutter_avatars.vue';
+import { __ } from '~/locale';
 import {
   CONTEXT_LINE_TYPE,
   LINE_POSITION_RIGHT,
@@ -18,6 +19,9 @@ export default {
     DiffGutterAvatars,
     GlIcon,
   },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
   props: {
     line: {
       type: Object,
@@ -123,6 +127,24 @@ export default {
     lineNumber() {
       return this.lineType === OLD_LINE_TYPE ? this.line.old_line : this.line.new_line;
     },
+    addCommentTooltip() {
+      const brokenSymlinks = this.line.commentsDisabled;
+      let tooltip = __('Add a comment to this line');
+
+      if (brokenSymlinks) {
+        if (brokenSymlinks.wasSymbolic || brokenSymlinks.isSymbolic) {
+          tooltip = __(
+            'Commenting on symbolic links that replace or are replaced by files is currently not supported.',
+          );
+        } else if (brokenSymlinks.wasReal || brokenSymlinks.isReal) {
+          tooltip = __(
+            'Commenting on files that replace or are replaced by symbolic links is currently not supported.',
+          );
+        }
+      }
+
+      return tooltip;
+    },
   },
   mounted() {
     this.unwatchShouldShowCommentButton = this.$watch('shouldShowCommentButton', newVal => {
@@ -146,17 +168,24 @@ export default {
 
 <template>
   <td ref="td" :class="classNameMap">
-    <button
-      v-if="shouldRenderCommentButton"
-      v-show="shouldShowCommentButton"
-      ref="addDiffNoteButton"
-      type="button"
-      class="add-diff-note js-add-diff-note-button qa-diff-comment"
-      title="Add a comment to this line"
-      @click="handleCommentButton"
+    <span
+      ref="addNoteTooltip"
+      v-gl-tooltip
+      class="add-diff-note tooltip-wrapper"
+      :title="addCommentTooltip"
     >
-      <gl-icon :size="12" name="comment" />
-    </button>
+      <button
+        v-if="shouldRenderCommentButton"
+        v-show="shouldShowCommentButton"
+        ref="addDiffNoteButton"
+        type="button"
+        class="add-diff-note note-button js-add-diff-note-button qa-diff-comment"
+        :disabled="line.commentsDisabled"
+        @click="handleCommentButton"
+      >
+        <gl-icon :size="12" name="comment" />
+      </button>
+    </span>
     <a
       v-if="lineNumber"
       ref="lineNumberRef"
diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js
index 2d87008d3b1..f014cddda32 100644
--- a/app/assets/javascripts/diffs/store/utils.js
+++ b/app/assets/javascripts/diffs/store/utils.js
@@ -480,6 +480,10 @@ export function getDiffPositionByLineCode(diffFiles, useSingleDiffStyle) {
 // This method will check whether the discussion is still applicable
 // to the diff line in question regarding different versions of the MR
 export function isDiscussionApplicableToLine({ discussion, diffPosition, latestDiff }) {
+  if (!diffPosition) {
+    return false;
+  }
+
   const { line_code, ...dp } = diffPosition;
   // Removing `line_range` from diffPosition because the backend does not
   // yet consistently return this property. This check can be removed,
diff --git a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
index 5298e20557d..f0951f6b177 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_visual_tokens.js
@@ -1,5 +1,5 @@
 import VisualTokenValue from './visual_token_value';
-import { objectToQueryString } from '~/lib/utils/common_utils';
+import { objectToQueryString, spriteIcon } from '~/lib/utils/common_utils';
 import FilteredSearchContainer from './container';
 
 export default class FilteredSearchVisualTokens {
@@ -84,7 +84,7 @@ export default class FilteredSearchVisualTokens {
         <div class="value-container">
           <div class="${capitalizeTokenValue ? 'text-capitalize' : ''} value"></div>
           <div class="remove-token" role="button">
-            <i class="fa fa-close"></i>
+            ${spriteIcon('close', 's16 close-icon')}
           </div>
         </div>
       </div>
diff --git a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
index 5cf574e1387..67a8f11b760 100644
--- a/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
+++ b/app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue
@@ -1,4 +1,5 @@
 <script>
+import { GlIcon } from '@gitlab/ui';
 import TimeTrackingHelpState from './help_state.vue';
 import TimeTrackingCollapsedState from './collapsed_state.vue';
 import TimeTrackingSpentOnlyPane from './spent_only_pane.vue';
@@ -11,6 +12,7 @@ import eventHub from '../../event_hub';
 export default {
   name: 'IssuableTimeTracker',
   components: {
+    GlIcon,
     TimeTrackingCollapsedState,
     TimeTrackingEstimateOnlyPane,
     TimeTrackingSpentOnlyPane,
@@ -111,7 +113,7 @@ export default {
         class="close-help-button float-right"
         @click="toggleHelpState(false)"
       >
-        <i class="fa fa-close" aria-hidden="true"> </i>
+        <gl-icon name="close" />
       </div>
     </div>
     <div class="time-tracking-content hide-collapsed">
diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/constants.js b/app/assets/javascripts/vue_shared/components/rich_content_editor/constants.js
index dd1da847001..c08659919fa 100644
--- a/app/assets/javascripts/vue_shared/components/rich_content_editor/constants.js
+++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/constants.js
@@ -1,13 +1,11 @@
 import { __ } from '~/locale';
-import { generateToolbarItem } from './services/editor_service';
-import buildCustomHTMLRenderer from './services/build_custom_renderer';
 
 export const CUSTOM_EVENTS = {
   openAddImageModal: 'gl_openAddImageModal',
 };
 
 /* eslint-disable @gitlab/require-i18n-strings */
-const TOOLBAR_ITEM_CONFIGS = [
+export const TOOLBAR_ITEM_CONFIGS = [
   { icon: 'heading', event: 'openHeadingSelect', classes: 'tui-heading', tooltip: __('Headings') },
   { icon: 'bold', command: 'Bold', tooltip: __('Add bold text') },
   { icon: 'italic', command: 'Italic', tooltip: __('Add italic text') },
@@ -30,11 +28,6 @@ const TOOLBAR_ITEM_CONFIGS = [
   { icon: 'doc-code', command: 'CodeBlock', tooltip: __('Insert a code block') },
 ];
 
-export const EDITOR_OPTIONS = {
-  toolbarItems: TOOLBAR_ITEM_CONFIGS.map(config => generateToolbarItem(config)),
-  customHTMLRenderer: buildCustomHTMLRenderer(),
-};
-
 export const EDITOR_TYPES = {
   markdown: 'markdown',
   wysiwyg: 'wysiwyg',
diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/rich_content_editor.vue b/app/assets/javascripts/vue_shared/components/rich_content_editor/rich_content_editor.vue
index baeb98bec75..d96fe46522e 100644
--- a/app/assets/javascripts/vue_shared/components/rich_content_editor/rich_content_editor.vue
+++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/rich_content_editor.vue
@@ -3,16 +3,11 @@ import 'codemirror/lib/codemirror.css';
 import '@toast-ui/editor/dist/toastui-editor.css';
 
 import AddImageModal from './modals/add_image/add_image_modal.vue';
-import {
-  EDITOR_OPTIONS,
-  EDITOR_TYPES,
-  EDITOR_HEIGHT,
-  EDITOR_PREVIEW_STYLE,
-  CUSTOM_EVENTS,
-} from './constants';
+import { EDITOR_TYPES, EDITOR_HEIGHT, EDITOR_PREVIEW_STYLE, CUSTOM_EVENTS } from './constants';
 
 import {
   registerHTMLToMarkdownRenderer,
+  getEditorOptions,
   addCustomEventListener,
   removeCustomEventListener,
   addImage,
@@ -35,7 +30,7 @@ export default {
     options: {
       type: Object,
       required: false,
-      default: () => EDITOR_OPTIONS,
+      default: () => null,
     },
     initialEditType: {
       type: String,
@@ -65,13 +60,13 @@ export default {
     };
   },
   computed: {
-    editorOptions() {
-      return { ...EDITOR_OPTIONS, ...this.options };
-    },
     editorInstance() {
       return this.$refs.editor;
     },
   },
+  created() {
+    this.editorOptions = getEditorOptions(this.options);
+  },
   beforeDestroy() {
     this.removeListeners();
   },
diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js
index b210ada412d..a9c5d442f62 100644
--- a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js
+++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/build_custom_renderer.js
@@ -1,3 +1,4 @@
+import { union, mapValues } from 'lodash';
 import renderBlockHtml from './renderers/render_html_block';
 import renderKramdownList from './renderers/render_kramdown_list';
 import renderKramdownText from './renderers/render_kramdown_text';
@@ -19,63 +20,20 @@ const executeRenderer = (renderers, node, context) => {
   return availableRenderer ? availableRenderer.render(node, context) : context.origin();
 };
 
-const buildCustomRendererFunctions = (customRenderers, defaults) => {
-  const customTypes = Object.keys(customRenderers).filter(type => !defaults[type]);
-  const customEntries = customTypes.map(type => {
-    const fn = (node, context) => executeRenderer(customRenderers[type], node, context);
-    return [type, fn];
+const buildCustomHTMLRenderer = customRenderers => {
+  const renderersByType = {
+    ...customRenderers,
+    htmlBlock: union(htmlBlockRenderers, customRenderers?.htmlBlock),
+    htmlInline: union(htmlInlineRenderers, customRenderers?.htmlInline),
+    list: union(listRenderers, customRenderers?.list),
+    paragraph: union(paragraphRenderers, customRenderers?.paragraph),
+    text: union(textRenderers, customRenderers?.text),
+    softbreak: union(softbreakRenderers, customRenderers?.softbreak),
+  };
+
+  return mapValues(renderersByType, renderers => {
+    return (node, context) => executeRenderer(renderers, node, context);
   });
-
-  return Object.fromEntries(customEntries);
-};
-
-const buildCustomHTMLRenderer = (
-  customRenderers = {
-    htmlBlock: [],
-    htmlInline: [],
-    list: [],
-    paragraph: [],
-    text: [],
-    softbreak: [],
-  },
-) => {
-  const defaults = {
-    htmlBlock(node, context) {
-      const allHtmlBlockRenderers = [...customRenderers.htmlBlock, ...htmlBlockRenderers];
-
-      return executeRenderer(allHtmlBlockRenderers, node, context);
-    },
-    htmlInline(node, context) {
-      const allHtmlInlineRenderers = [...customRenderers.htmlInline, ...htmlInlineRenderers];
-
-      return executeRenderer(allHtmlInlineRenderers, node, context);
-    },
-    list(node, context) {
-      const allListRenderers = [...customRenderers.list, ...listRenderers];
-
-      return executeRenderer(allListRenderers, node, context);
-    },
-    paragraph(node, context) {
-      const allParagraphRenderers = [...customRenderers.paragraph, ...paragraphRenderers];
-
-      return executeRenderer(allParagraphRenderers, node, context);
-    },
-    text(node, context) {
-      const allTextRenderers = [...customRenderers.text, ...textRenderers];
-
-      return executeRenderer(allTextRenderers, node, context);
-    },
-    softbreak(node, context) {
-      const allSoftbreakRenderers = [...customRenderers.softbreak, ...softbreakRenderers];
-
-      return executeRenderer(allSoftbreakRenderers, node, context);
-    },
-  };
-
-  return {
-    ...buildCustomRendererFunctions(customRenderers, defaults),
-    ...defaults,
-  };
 };
 
 export default buildCustomHTMLRenderer;
diff --git a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/editor_service.js b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/editor_service.js
index 6436dcaae64..51ba033dff0 100644
--- a/app/assets/javascripts/vue_shared/components/rich_content_editor/services/editor_service.js
+++ b/app/assets/javascripts/vue_shared/components/rich_content_editor/services/editor_service.js
@@ -1,6 +1,9 @@
 import Vue from 'vue';
+import { defaults } from 'lodash';
 import ToolbarItem from '../toolbar_item.vue';
 import buildHtmlToMarkdownRenderer from './build_html_to_markdown_renderer';
+import buildCustomHTMLRenderer from './build_custom_renderer';
+import { TOOLBAR_ITEM_CONFIGS } from '../constants';
 
 const buildWrapper = propsData => {
   const instance = new Vue({
@@ -54,3 +57,10 @@ export const registerHTMLToMarkdownRenderer = editorApi => {
     renderer: renderer.constructor.factory(renderer, buildHtmlToMarkdownRenderer(renderer)),
   });
 };
+
+export const getEditorOptions = externalOptions => {
+  return defaults({
+    customHTMLRenderer: buildCustomHTMLRenderer(externalOptions?.customRenderers),
+    toolbarItems: TOOLBAR_ITEM_CONFIGS.map(toolbarItem => generateToolbarItem(toolbarItem)),
+  });
+};
diff --git a/app/assets/stylesheets/fontawesome_custom.scss b/app/assets/stylesheets/fontawesome_custom.scss
index a96a002b879..28bea9233cb 100644
--- a/app/assets/stylesheets/fontawesome_custom.scss
+++ b/app/assets/stylesheets/fontawesome_custom.scss
@@ -93,7 +93,6 @@
 }
 
 .fa-remove::before,
-.fa-close::before,
 .fa-times::before {
   content: '\f00d';
 }
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index ee83ce67c03..2e87724a9e7 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -134,20 +134,20 @@
     padding-left: 8px;
     padding-right: 0;
 
-    .fa-close {
+    .close-icon {
       color: $gl-text-color-secondary;
     }
 
-    &:hover .fa-close {
+    &:hover .close-icon {
       color: $gl-text-color;
     }
 
     &.inverted {
-      .fa-close {
+      .close-icon {
         color: $gl-text-color-secondary-inverted;
       }
 
-      &:hover .fa-close {
+      &:hover .close-icon {
         color: $gl-text-color-inverted;
       }
     }
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 46ea3c37f2d..e4e54501627 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -820,9 +820,7 @@ $note-form-margin-left: 72px;
   }
 }
 
-.add-diff-note {
-  @include btn-comment-icon;
-  opacity: 0;
+.tooltip-wrapper.add-diff-note {
   margin-left: -52px;
   position: absolute;
   top: 50%;
@@ -830,6 +828,18 @@ $note-form-margin-left: 72px;
   z-index: 10;
 }
 
+.note-button.add-diff-note {
+  @include btn-comment-icon;
+  opacity: 0;
+
+  &[disabled] {
+    background: $white;
+    border-color: $gray-200;
+    color: $gl-gray-400;
+    cursor: not-allowed;
+  }
+}
+
 .disabled-comment {
   background-color: $gray-light;
   border-radius: $border-radius-base;
diff --git a/app/assets/stylesheets/pages/todos.scss b/app/assets/stylesheets/pages/todos.scss
index bbb37479fb0..c6f104a024b 100644
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -143,6 +143,10 @@
       margin-bottom: 0;
     }
   }
+
+  .gl-label-scoped {
+    --label-inset-border: inset 0 0 0 1px currentColor;
+  }
 }
 
 @include media-breakpoint-down(sm) {
diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb
index 2cc030d18fc..0fd047f90cf 100644
--- a/app/controllers/projects/variables_controller.rb
+++ b/app/controllers/projects/variables_controller.rb
@@ -12,7 +12,12 @@ class Projects::VariablesController < Projects::ApplicationController
   end
 
   def update
-    if @project.update(variables_params)
+    update_result = Ci::ChangeVariablesService.new(
+      container: @project, current_user: current_user,
+      params: variables_params
+    ).execute
+
+    if update_result
       respond_to do |format|
         format.json { render_variables }
       end
diff --git a/app/graphql/mutations/design_management/move.rb b/app/graphql/mutations/design_management/move.rb
index c103e596387..0b654447844 100644
--- a/app/graphql/mutations/design_management/move.rb
+++ b/app/graphql/mutations/design_management/move.rb
@@ -21,7 +21,7 @@ module Mutations
             description: "The current state of the collection"
 
       def ready(*)
-        raise ::Gitlab::Graphql::Errors::ResourceNotAvailable unless ::Feature.enabled?(:reorder_designs)
+        raise ::Gitlab::Graphql::Errors::ResourceNotAvailable unless ::Feature.enabled?(:reorder_designs, default_enabled: true)
       end
 
       def resolve(**args)
diff --git a/app/models/design_management/design.rb b/app/models/design_management/design.rb
index 865cbb995b5..4e50c048611 100644
--- a/app/models/design_management/design.rb
+++ b/app/models/design_management/design.rb
@@ -82,7 +82,7 @@ module DesignManagement
     scope :ordered, -> (project) do
       # TODO: Always order by relative position after the feature flag is removed
       # https://gitlab.com/gitlab-org/gitlab/-/issues/34382
-      if Feature.enabled?(:reorder_designs, project)
+      if Feature.enabled?(:reorder_designs, project, default_enabled: true)
         # We need to additionally sort by `id` to support keyset pagination.
         # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17788/diffs#note_230875678
         order(:relative_position, :id)
diff --git a/app/models/design_management/design_collection.rb b/app/models/design_management/design_collection.rb
index 5a4322a2994..96d5f4c2419 100644
--- a/app/models/design_management/design_collection.rb
+++ b/app/models/design_management/design_collection.rb
@@ -16,9 +16,7 @@ module DesignManagement
 
     def find_or_create_design!(filename:)
       designs.find { |design| design.filename == filename } ||
-        designs.safe_find_or_create_by!(project: project, filename: filename) do |design|
-          design.move_to_end
-        end
+        designs.safe_find_or_create_by!(project: project, filename: filename)
     end
 
     def versions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index c5d70f3f207..36d7026de30 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -8,6 +8,12 @@ class JiraService < IssueTrackerService
 
   PROJECTS_PER_PAGE = 50
 
+  # TODO: use jira_service.deployment_type enum when https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37003 is merged
+  DEPLOYMENT_TYPES = {
+    server: 'SERVER',
+    cloud: 'CLOUD'
+  }.freeze
+
   validates :url, public_url: true, presence: true, if: :activated?
   validates :api_url, public_url: true, allow_blank: true
   validates :username, presence: true, if: :activated?
diff --git a/app/policies/project_policy.rb b/app/policies/project_policy.rb
index bdfad994d55..21a73185df4 100644
--- a/app/policies/project_policy.rb
+++ b/app/policies/project_policy.rb
@@ -103,7 +103,7 @@ class ProjectPolicy < BasePolicy
 
   with_scope :subject
   condition(:moving_designs_disabled) do
-    !::Feature.enabled?(:reorder_designs, @subject)
+    !::Feature.enabled?(:reorder_designs, @subject, default_enabled: true)
   end
 
   with_scope :subject
diff --git a/app/presenters/packages/detail/package_presenter.rb b/app/presenters/packages/detail/package_presenter.rb
index 631ee173188..bdb2e34854e 100644
--- a/app/presenters/packages/detail/package_presenter.rb
+++ b/app/presenters/packages/detail/package_presenter.rb
@@ -23,6 +23,7 @@ module Packages
         package_detail[:maven_metadatum] = @package.maven_metadatum if @package.maven_metadatum
         package_detail[:nuget_metadatum] = @package.nuget_metadatum if @package.nuget_metadatum
         package_detail[:composer_metadatum] = @package.composer_metadatum if @package.composer_metadatum
+        package_detail[:conan_metadatum] = @package.conan_metadatum if @package.conan_metadatum
         package_detail[:dependency_links] = @package.dependency_links.map(&method(:build_dependency_links))
         package_detail[:pipeline] = build_pipeline_info(@package.build_info.pipeline) if @package.build_info
 
diff --git a/app/services/ci/change_variable_service.rb b/app/services/ci/change_variable_service.rb
index 6588ad598f9..f515a335d54 100644
--- a/app/services/ci/change_variable_service.rb
+++ b/app/services/ci/change_variable_service.rb
@@ -20,7 +20,12 @@ module Ci
     private
 
     def variable
-      container.variables.find_by!(params[:variable_params].slice(:key)) # rubocop:disable CodeReuse/ActiveRecord
+      params[:variable] || find_variable
+    end
+
+    def find_variable
+      identifier = params[:variable_params].slice(:id).presence || params[:variable_params].slice(:key)
+      container.variables.find_by!(identifier) # rubocop:disable CodeReuse/ActiveRecord
     end
   end
 end
diff --git a/app/services/design_management/move_designs_service.rb b/app/services/design_management/move_designs_service.rb
index 4052c189969..ead41e8f4d4 100644
--- a/app/services/design_management/move_designs_service.rb
+++ b/app/services/design_management/move_designs_service.rb
@@ -13,7 +13,7 @@ module DesignManagement
 
     def execute
       return error(:no_focus) unless current_design.present?
-      return error(:cannot_move) unless ::Feature.enabled?(:reorder_designs, project)
+      return error(:cannot_move) unless ::Feature.enabled?(:reorder_designs, project, default_enabled: true)
       return error(:cannot_move) unless current_user.can?(:move_design, current_design)
       return error(:no_neighbors) unless neighbors.present?
       return error(:not_distinct) unless all_distinct?
diff --git a/app/services/jira_import/cloud_users_mapper_service.rb b/app/services/jira_import/cloud_users_mapper_service.rb
new file mode 100644
index 00000000000..b1c7aac584f
--- /dev/null
+++ b/app/services/jira_import/cloud_users_mapper_service.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module JiraImport
+  class CloudUsersMapperService < UsersMapperService
+    private
+
+    def url
+      "/rest/api/2/users?maxResults=#{MAX_USERS}&startAt=#{start_at.to_i}"
+    end
+
+    def jira_user_id(jira_user)
+      jira_user['accountId']
+    end
+
+    def jira_user_name(jira_user)
+      jira_user['displayName']
+    end
+  end
+end
diff --git a/app/services/jira_import/server_users_mapper_service.rb b/app/services/jira_import/server_users_mapper_service.rb
new file mode 100644
index 00000000000..d38d134f55c
--- /dev/null
+++ b/app/services/jira_import/server_users_mapper_service.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module JiraImport
+  class ServerUsersMapperService < UsersMapperService
+    private
+
+    def url
+      "/rest/api/2/user/search?username=''&maxResults=#{MAX_USERS}&startAt=#{start_at.to_i}"
+    end
+
+    def jira_user_id(jira_user)
+      jira_user['key']
+    end
+
+    def jira_user_name(jira_user)
+      jira_user['name']
+    end
+  end
+end
diff --git a/app/services/jira_import/users_importer.rb b/app/services/jira_import/users_importer.rb
index 579d3675073..9babd468d56 100644
--- a/app/services/jira_import/users_importer.rb
+++ b/app/services/jira_import/users_importer.rb
@@ -2,9 +2,7 @@
 
 module JiraImport
   class UsersImporter
-    attr_reader :user, :project, :start_at, :result
-
-    MAX_USERS = 50
+    attr_reader :user, :project, :start_at
 
     def initialize(user, project, start_at)
       @project = project
@@ -15,29 +13,43 @@ module JiraImport
     def execute
       Gitlab::JiraImport.validate_project_settings!(project, user: user)
 
-      return ServiceResponse.success(payload: nil) if users.blank?
-
-      result = UsersMapper.new(project, users).execute
-      ServiceResponse.success(payload: result)
+      ServiceResponse.success(payload: mapped_users)
     rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, Errno::ECONNREFUSED, URI::InvalidURIError, JIRA::HTTPError, OpenSSL::SSL::SSLError => error
-      Gitlab::ErrorTracking.track_exception(error, project_id: project.id, request: url)
-      ServiceResponse.error(message: "There was an error when communicating to Jira: #{error.message}")
+      Gitlab::ErrorTracking.track_exception(error, project_id: project.id)
+      ServiceResponse.error(message: "There was an error when communicating to Jira")
     rescue Projects::ImportService::Error => error
       ServiceResponse.error(message: error.message)
     end
 
     private
 
-    def users
-      @users ||= client.get(url)
+    def mapped_users
+      users_mapper_service.execute
     end
 
-    def url
-      "/rest/api/2/users?maxResults=#{MAX_USERS}&startAt=#{start_at.to_i}"
+    def users_mapper_service
+      @users_mapper_service ||= user_mapper_service_factory
+    end
+
+    def deployment_type
+      # TODO: use project.jira_service.deployment_type value when https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37003 is merged
+      @deployment_type ||= client.ServerInfo.all.deploymentType
     end
 
     def client
       @client ||= project.jira_service.client
     end
+
+    def user_mapper_service_factory
+      # TODO: use deployment_type enum from jira service when https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37003 is merged
+      case deployment_type.upcase
+      when JiraService::DEPLOYMENT_TYPES[:server]
+        ServerUsersMapperService.new(project.jira_service, start_at)
+      when JiraService::DEPLOYMENT_TYPES[:cloud]
+        CloudUsersMapperService.new(project.jira_service, start_at)
+      else
+        raise ArgumentError
+      end
+    end
   end
 end
diff --git a/app/services/jira_import/users_mapper.rb b/app/services/jira_import/users_mapper.rb
deleted file mode 100644
index c3cbeb157bd..00000000000
--- a/app/services/jira_import/users_mapper.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module JiraImport
-  class UsersMapper
-    attr_reader :project, :jira_users
-
-    def initialize(project, jira_users)
-      @project = project
-      @jira_users = jira_users
-    end
-
-    def execute
-      jira_users.to_a.map do |jira_user|
-        {
-          jira_account_id: jira_user['accountId'],
-          jira_display_name: jira_user['displayName'],
-          jira_email: jira_user['emailAddress']
-        }.merge(match_user(jira_user))
-      end
-    end
-
-    private
-
-    # TODO: Matching user by email and displayName will be done as the part
-    # of follow-up issue: https://gitlab.com/gitlab-org/gitlab/-/issues/219023
-    def match_user(jira_user)
-      { gitlab_id: nil, gitlab_username: nil, gitlab_name: nil }
-    end
-  end
-end
diff --git a/app/services/jira_import/users_mapper_service.rb b/app/services/jira_import/users_mapper_service.rb
new file mode 100644
index 00000000000..b5997d77215
--- /dev/null
+++ b/app/services/jira_import/users_mapper_service.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module JiraImport
+  class UsersMapperService
+    MAX_USERS = 50
+
+    attr_reader :jira_service, :start_at
+
+    def initialize(jira_service, start_at)
+      @jira_service = jira_service
+      @start_at = start_at
+    end
+
+    def execute
+      users.to_a.map do |jira_user|
+        {
+          jira_account_id: jira_user_id(jira_user),
+          jira_display_name: jira_user_name(jira_user),
+          jira_email: jira_user['emailAddress']
+        }.merge(match_user(jira_user))
+      end
+    end
+
+    private
+
+    def users
+      @users ||= client.get(url)
+    end
+
+    def client
+      @client ||= jira_service.client
+    end
+
+    def url
+      raise NotImplementedError
+    end
+
+    def jira_user_id(jira_user)
+      raise NotImplementedError
+    end
+
+    def jira_user_name(jira_user)
+      raise NotImplementedError
+    end
+
+    # TODO: Matching user by email and displayName will be done as the part
+    # of follow-up issue: https://gitlab.com/gitlab-org/gitlab/-/issues/219023
+    def match_user(jira_user)
+      { gitlab_id: nil, gitlab_username: nil, gitlab_name: nil }
+    end
+  end
+end
diff --git a/bin/feature-flag b/bin/feature-flag
index d4ab295b30c..ba86df9c06c 100755
--- a/bin/feature-flag
+++ b/bin/feature-flag
@@ -8,7 +8,7 @@
 require 'optparse'
 require 'yaml'
 require 'fileutils'
-require 'cgi'
+require 'uri'
 
 require_relative '../lib/feature/shared' unless defined?(Feature::Shared)
 
@@ -105,10 +105,11 @@ class FeatureFlagOptionParser
     end
 
     def read_group
+      $stdout.puts
       $stdout.puts ">> Please specify the group introducing feature flag, like `group::apm`:"
 
       loop do
-        $stdout.print "\n?> "
+        $stdout.print "?> "
         group = $stdin.gets.strip
         group = nil if group.empty?
         return group if group.nil? || group.start_with?('group::')
@@ -121,6 +122,7 @@ class FeatureFlagOptionParser
       # if there's only one type, do not ask, return
       return TYPES.first.first if TYPES.one?
 
+      $stdout.puts
       $stdout.puts ">> Please specify the type of your feature flag:"
       $stdout.puts
       TYPES.each do |type, data|
@@ -128,7 +130,7 @@ class FeatureFlagOptionParser
       end
 
       loop do
-        $stdout.print "\n?> "
+        $stdout.print "?> "
 
         type = $stdin.gets.strip.to_sym
         return type if TYPES[type]
@@ -137,27 +139,41 @@ class FeatureFlagOptionParser
       end
     end
 
-    def read_issue_url(options)
+    def read_introduced_by_url
+      $stdout.puts
+      $stdout.puts ">> If you have MR open, can you paste the URL here? (or enter to skip)"
+
+      loop do
+        $stdout.print "?> "
+        introduced_by_url = $stdin.gets.strip
+        introduced_by_url = nil if introduced_by_url.empty?
+        return introduced_by_url if introduced_by_url.nil? || introduced_by_url.start_with?('https://')
+
+        $stderr.puts "URL needs to start with https://"
+      end
+    end
+
+    def read_rollout_issue_url(options)
       return unless TYPES.dig(options.type, :rollout_issue)
 
       url = "https://gitlab.com/gitlab-org/gitlab/-/issues/new"
       title = "[Feature flag] Rollout of `#{options.name}`"
-      description = File.read('.gitlab/issue_templates/Feature Flag Roll Out.md')
-      description.sub!(':feature_name', options.name)
 
-      issue_new_url = url + "?" +
-        "issue[title]=" + CGI.escape(title) + "&"
-        # TODO: We should be able to pick `issueable_template`
-        # + "issue[description]=" + CGI.escape(description)
+      params = {
+        'issue[title]' => "[Feature flag] Rollout of `#{options.name}`",
+        'issuable_template' => 'Feature Flag Roll Out',
+      }
+      issue_new_url = url + "?" + URI.encode_www_form(params)
 
+      $stdout.puts
       $stdout.puts ">> Open this URL and fill the rest of details:"
       $stdout.puts issue_new_url
       $stdout.puts
 
-      $stdout.puts ">> Paste URL here, or enter to skip:"
+      $stdout.puts ">> Paste URL of `rollout issue` here, or enter to skip:"
 
       loop do
-        $stdout.print "\n?> "
+        $stdout.print "?> "
         created_url = $stdin.gets.strip
         created_url = nil if created_url.empty?
         return created_url if created_url.nil? || created_url.start_with?('https://')
@@ -185,7 +201,8 @@ class FeatureFlagCreator
     # Read type from $stdin unless is already set
     options.type ||= FeatureFlagOptionParser.read_type
     options.group ||= FeatureFlagOptionParser.read_group
-    options.rollout_issue_url ||= FeatureFlagOptionParser.read_issue_url(options)
+    options.introduced_by_url ||= FeatureFlagOptionParser.read_introduced_by_url
+    options.rollout_issue_url ||= FeatureFlagOptionParser.read_rollout_issue_url(options)
 
     $stdout.puts "\e[32mcreate\e[0m #{file_path}"
     $stdout.puts contents
diff --git a/changelogs/unreleased/225946-replace-fa-close-with-gitlab-svg.yml b/changelogs/unreleased/225946-replace-fa-close-with-gitlab-svg.yml
new file mode 100644
index 00000000000..ea78201234d
--- /dev/null
+++ b/changelogs/unreleased/225946-replace-fa-close-with-gitlab-svg.yml
@@ -0,0 +1,5 @@
+---
+title: Replace fa-close icons with GitLab SVG close icon
+merge_request: 39267
+author:
+type: changed
diff --git a/changelogs/unreleased/232998-package-metadata.yml b/changelogs/unreleased/232998-package-metadata.yml
new file mode 100644
index 00000000000..038e84e9c8d
--- /dev/null
+++ b/changelogs/unreleased/232998-package-metadata.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Conan recipe display in the package details page
+merge_request: 39643
+author:
+type: fixed
diff --git a/changelogs/unreleased/235759_backward_compatibility_on_jira_users_api_endpoint.yml b/changelogs/unreleased/235759_backward_compatibility_on_jira_users_api_endpoint.yml
new file mode 100644
index 00000000000..aadad6fad88
--- /dev/null
+++ b/changelogs/unreleased/235759_backward_compatibility_on_jira_users_api_endpoint.yml
@@ -0,0 +1,5 @@
+---
+title: Handle user mapping for Jira server instances
+merge_request: 39362
+author:
+type: fixed
diff --git a/changelogs/unreleased/235797-fix-issues-analytics-feature-name.yml b/changelogs/unreleased/235797-fix-issues-analytics-feature-name.yml
new file mode 100644
index 00000000000..2221ab750b6
--- /dev/null
+++ b/changelogs/unreleased/235797-fix-issues-analytics-feature-name.yml
@@ -0,0 +1,5 @@
+---
+title: Deprecate additions and deletions attributes in Repositories API
+merge_request: 39653
+author:
+type: deprecated
diff --git a/changelogs/unreleased/reorder-designs-fixes.yml b/changelogs/unreleased/reorder-designs-fixes.yml
new file mode 100644
index 00000000000..05d2fc4ca7e
--- /dev/null
+++ b/changelogs/unreleased/reorder-designs-fixes.yml
@@ -0,0 +1,5 @@
+---
+title: Enable reorder_designs feature by default
+merge_request: 39555
+author:
+type: changed
diff --git a/changelogs/unreleased/symlink-comments-disable-symlink-comments.yml b/changelogs/unreleased/symlink-comments-disable-symlink-comments.yml
new file mode 100644
index 00000000000..2e1d19ae2a9
--- /dev/null
+++ b/changelogs/unreleased/symlink-comments-disable-symlink-comments.yml
@@ -0,0 +1,6 @@
+---
+title: Disable commenting on lines in files that were or are symlinks or replace or
+  are replaced by symlinks
+merge_request: 35371
+author:
+type: fixed
diff --git a/changelogs/unreleased/todo-labels.yml b/changelogs/unreleased/todo-labels.yml
new file mode 100644
index 00000000000..5a33cc6cfbf
--- /dev/null
+++ b/changelogs/unreleased/todo-labels.yml
@@ -0,0 +1,5 @@
+---
+title: Fix missing scoped label borders for todos
+merge_request: 39459
+author:
+type: fixed
diff --git a/config/feature_flags/development/ci_if_parenthesis_enabled.yml b/config/feature_flags/development/ci_if_parenthesis_enabled.yml
new file mode 100644
index 00000000000..5de7f9cf09a
--- /dev/null
+++ b/config/feature_flags/development/ci_if_parenthesis_enabled.yml
@@ -0,0 +1,7 @@
+---
+name: ci_if_parenthesis_enabled
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37574
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238174
+group: group::ci
+type: development
+default_enabled: true
\ No newline at end of file
diff --git a/config/feature_flags/development/ci_plan_needs_size_limit.yml b/config/feature_flags/development/ci_plan_needs_size_limit.yml
new file mode 100644
index 00000000000..826aeb8f030
--- /dev/null
+++ b/config/feature_flags/development/ci_plan_needs_size_limit.yml
@@ -0,0 +1,7 @@
+---
+name: ci_plan_needs_size_limit
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37568
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238173
+group: group::ci
+type: development
+default_enabled: true
\ No newline at end of file
diff --git a/config/feature_flags/development/reorder_designs.yml b/config/feature_flags/development/reorder_designs.yml
index 3bb05ff743f..89c6bec7351 100644
--- a/config/feature_flags/development/reorder_designs.yml
+++ b/config/feature_flags/development/reorder_designs.yml
@@ -4,4 +4,4 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37835
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/232992
 group: group::knowledge
 type: development
-default_enabled: false
+default_enabled: true
diff --git a/config/initializers/rails_host_authorization.rb b/config/initializers/rails_host_authorization.rb
index 6cca39ea95b..7d719dd519f 100644
--- a/config/initializers/rails_host_authorization.rb
+++ b/config/initializers/rails_host_authorization.rb
@@ -3,7 +3,7 @@
 # This file requires config/initializers/1_settings.rb
 
 if Rails.env.development?
-  Rails.application.config.hosts += [Gitlab.config.gitlab.host, 'unix']
+  Rails.application.config.hosts += [Gitlab.config.gitlab.host, 'unix', 'host.docker.internal']
 
   if ENV['RAILS_HOSTS']
     additional_hosts = ENV['RAILS_HOSTS'].split(',').select(&:presence)
diff --git a/db/post_migrate/20200724130639_backfill_designs_relative_position.rb b/db/post_migrate/20200724130639_backfill_designs_relative_position.rb
index a090678214f..ef8b38bf90c 100644
--- a/db/post_migrate/20200724130639_backfill_designs_relative_position.rb
+++ b/db/post_migrate/20200724130639_backfill_designs_relative_position.rb
@@ -1,38 +1,19 @@
 # frozen_string_literal: true
 
+# This migration is not needed anymore and was disabled, because we're now
+# also backfilling design positions immediately before moving a design.
+#
+# See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39555
 class BackfillDesignsRelativePosition < ActiveRecord::Migration[6.0]
   include Gitlab::Database::MigrationHelpers
 
   DOWNTIME = false
-  INTERVAL = 2.minutes
-  BATCH_SIZE = 1000
-  MIGRATION = 'BackfillDesignsRelativePosition'
-
-  disable_ddl_transaction!
-
-  class Issue < ActiveRecord::Base
-    include EachBatch
-
-    self.table_name = 'issues'
-
-    has_many :designs
-  end
-
-  class Design < ActiveRecord::Base
-    self.table_name = 'design_management_designs'
-  end
 
   def up
-    issues_with_designs = Issue.where(id: Design.select(:issue_id))
-
-    issues_with_designs.each_batch(of: BATCH_SIZE) do |relation, index|
-      issue_ids = relation.pluck(:id)
-      delay = INTERVAL * index
-
-      migrate_in(delay, MIGRATION, [issue_ids])
-    end
+    # no-op
   end
 
   def down
+    # no-op
   end
 end
diff --git a/doc/api/repositories.md b/doc/api/repositories.md
index 79ccd5bc9e4..305216f853a 100644
--- a/doc/api/repositories.md
+++ b/doc/api/repositories.md
@@ -199,6 +199,9 @@ authentication if the repository is publicly accessible.
 GET /projects/:id/repository/contributors
 ```
 
+CAUTION: **Deprecation:**
+The `additions` and `deletions` attributes are deprecated [as of GitLab 13.4](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39653) because they [always return `0`](https://gitlab.com/gitlab-org/gitlab/-/issues/233119).
+
 Parameters:
 
 - `id` (required) - The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) owned by the authenticated user
@@ -212,14 +215,14 @@ Response:
   "name": "Example User",
   "email": "example@example.com",
   "commits": 117,
-  "additions": 2097,
-  "deletions": 517
+  "additions": 0,
+  "deletions": 0
 }, {
   "name": "Sample User",
   "email": "sample@example.com",
   "commits": 33,
-  "additions": 338,
-  "deletions": 244
+  "additions": 0,
+  "deletions": 0
 }]
 ```
 
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 8f137b6436a..61bc466692e 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -760,9 +760,9 @@ Examples:
 - `($VARIABLE1 =~ /^content.*/ || $VARIABLE2 =~ /thing$/) && $VARIABLE3`
 - `$CI_COMMIT_BRANCH == "my-branch" || (($VARIABLE1 == "thing" || $VARIABLE2 == "thing") && $VARIABLE3)`
 
-The feature is currently deployed behind a feature flag that is **disabled by default**.
+The feature is currently deployed behind a feature flag that is **enabled by default**.
 [GitLab administrators with access to the GitLab Rails console](../../administration/feature_flags.md)
-can opt to enable it for your instance.
+can opt to disable it for your instance.
 
 To enable it:
 
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index e6e84fbc3cb..82a410129a6 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1989,9 +1989,7 @@ This example creates four paths of execution:
 - The maximum number of jobs that a single job can need in the `needs:` array is limited:
   - For GitLab.com, the limit is ten. For more information, see our
     [infrastructure issue](https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/7541).
-  - For self-managed instances, the limit is:
-    - 10, if the `ci_plan_needs_size_limit` feature flag is disabled (default).
-    - 50, if the `ci_plan_needs_size_limit` feature flag is enabled. This limit [can be changed](#changing-the-needs-job-limit-core-only).
+  - For self-managed instances, the limit is: 50. This limit [can be changed](#changing-the-needs-job-limit-core-only).
 - If `needs:` refers to a job that is marked as `parallel:`.
   the current job will depend on all parallel jobs created.
 - `needs:` is similar to `dependencies:` in that it needs to use jobs from prior stages,
@@ -2002,18 +2000,10 @@ This example creates four paths of execution:
 
 ##### Changing the `needs:` job limit **(CORE ONLY)**
 
-The maximum number of jobs that can be defined within `needs:` defaults to 10.
+The maximum number of jobs that can be defined within `needs:` defaults to 50.
 
-To change this limit to 50 on a self-managed installation, a GitLab administrator
-with [access to the GitLab Rails console](../../administration/feature_flags.md)
-can enable the `:ci_plan_needs_size_limit` feature flag:
-
-```ruby
-Feature::enable(:ci_plan_needs_size_limit)
-```
-
-After the feature flag is enabled, you can choose a custom limit. For example, to
-set the limit to 100:
+A GitLab administrator with [access to the GitLab Rails console](../../administration/feature_flags.md)
+can choose a custom limit. For example, to set the limit to 100:
 
 ```ruby
 Plan.default.actual_limits.update!(ci_needs_size_limit: 100)
diff --git a/doc/development/deleting_migrations.md b/doc/development/deleting_migrations.md
index 8aa16710d55..b8f23019ac2 100644
--- a/doc/development/deleting_migrations.md
+++ b/doc/development/deleting_migrations.md
@@ -23,7 +23,7 @@ Migrations can be disabled if:
 In order to disable a migration, the following steps apply to all types of migrations:
 
 1. Turn the migration into a no-op by removing the code inside `#up`, `#down`
-  or `#perform` methods, and adding `#no-op` comment instead.
+  or `#perform` methods, and adding `# no-op` comment instead.
 1. Add a comment explaining why the code is gone.
 
 Disabling migrations requires explicit approval of Database Maintainer.
diff --git a/doc/development/feature_flags/development.md b/doc/development/feature_flags/development.md
index cb97a775409..9b30187fcd1 100644
--- a/doc/development/feature_flags/development.md
+++ b/doc/development/feature_flags/development.md
@@ -78,19 +78,21 @@ Only feature flags that have a YAML definition file can be used when running the
 ```shell
 $ bin/feature-flag my-feature-flag
 >> Please specify the group introducing feature flag, like `group::apm`:
-
 ?> group::memory
+
+>> If you have MR open, can you paste the URL here? (or enter to skip)
+?> https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38602
+
 >> Open this URL and fill the rest of details:
-https://gitlab.com/gitlab-org/gitlab/-/issues/new?issue[title]=%5BFeature+flag%5D+Rollout+of+%60my-feature-flag%60&
+https://gitlab.com/gitlab-org/gitlab/-/issues/new?issue%5Btitle%5D=%5BFeature+flag%5D+Rollout+of+%60test-flag%60&issuable_template=Feature+Flag+Roll+Out
 
->> Paste URL here, or enter to skip:
-
-?>
-create config/feature_flags/development/my_feature_flag.yml
+>> Paste URL of `rollout issue` here, or enter to skip:
+?> https://gitlab.com/gitlab-org/gitlab/-/issues/232533
+create config/feature_flags/development/test-flag.yml
 ---
-name: my_feature_flag
-introduced_by_url:
-rollout_issue_url:
+name: test-flag
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38602
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/232533
 group: group::memory
 type: development
 default_enabled: false
diff --git a/doc/user/compliance/compliance_dashboard/img/compliance_dashboard_v13_3.png b/doc/user/compliance/compliance_dashboard/img/compliance_dashboard_v13_3.png
deleted file mode 100644
index bf759f44dc57e52994afeb7b48045099cb681421..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 41721
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%0D93GlSp4Vm#|Be5pBv}J(s=Fgq@=j=7ItjX$>BxR
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

diff --git a/doc/user/project/merge_requests/merge_request_approvals.md b/doc/user/project/merge_requests/merge_request_approvals.md
index b8a4d513318..407fc5db425 100644
--- a/doc/user/project/merge_requests/merge_request_approvals.md
+++ b/doc/user/project/merge_requests/merge_request_approvals.md
@@ -1,7 +1,7 @@
 ---
 stage: Create
 group: Source Code
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
+info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers"
 type: reference, concepts
 ---
 
@@ -13,16 +13,16 @@ process, as it clearly communicates the ability to merge the change.
 
 ## Optional Approvals **(CORE ONLY)**
 
-> Introduced in [GitLab Core 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/27426).
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/27426) in GitLab 13.2.
 
-Any user with Developer or greater [permissions](../../permissions.md) can approve a merge request in GitLab Core.
-This provides a consistent mechanism for reviewers to provide approval, and makes it easy for
+Any user with Developer or greater [permissions](../../permissions.md) can approve a merge request in GitLab Core and higher tiers.
+This provides a consistent mechanism for reviewers to approve merge requests, and makes it easy for
 maintainers to know when a change is ready to merge. Approvals in Core are optional and do
 not prevent a merge request from being merged when there is no approval.
 
 ## Required Approvals **(STARTER)**
 
-> Introduced in [GitLab Enterprise Edition 7.12](https://about.gitlab.com/releases/2015/06/22/gitlab-7-12-released/#merge-request-approvers-ee-only).
+> [Introduced](https://about.gitlab.com/releases/2015/06/22/gitlab-7-12-released/#merge-request-approvers-ee-only) in GitLab Enterprise Edition 7.12. Available in [GitLab Starter](https://about.gitlab.com/pricing/) and higher tiers.
 
 Required approvals enable enforced code review by requiring specified people
 to approve a merge request before it can be merged.
@@ -33,8 +33,8 @@ Required approvals enable multiple use cases:
 - Specifying reviewers for a given proposed code change, as well as a minimum number
   of reviewers, through [Approval rules](#approval-rules).
 - Specifying categories of reviewers, such as backend, frontend, quality assurance,
-  database, etc., for all proposed code changes.
-- Automatically designating [Code Owners as eligible approvers](#code-owners-as-eligible-approvers),
+  database, and so on, for all proposed code changes.
+- Designating [Code Owners as eligible approvers](#code-owners-as-eligible-approvers),
   determined by the files changed in a merge request.
 - [Requiring approval from a security team](#security-approvals-in-merge-requests-ultimate)
   before merging code that could introduce a vulnerability.**(ULTIMATE)**
@@ -50,14 +50,10 @@ be merged, and optionally which users should do the approving. Approvals can be
 If no approval rules are defined, any user can approve a merge request, though the default
 minimum number of required approvers can still be set in the [project settings for merge request approvals](#merge-request-approvals-project-settings).
 
-Approval rules define how many approvals a merge request must receive before it can
-be merged, and optionally which users should do the approving. Approvals can be defined:
-
-- [As project defaults](#adding--editing-a-default-approval-rule).
-- [Per merge request](#editing--overriding-approval-rules-per-merge-request).
-
-If no approval rules are defined, any user can approve a merge request, though the default
-minimum number of required approvers can still be set in the [project settings for merge request approvals](#merge-request-approvals-project-settings).
+You can opt to define one single rule to approve a merge request among the available rules
+or choose more than one. Single approval rules are available in GitLab Starter and higher tiers,
+while [multiple approval rules](#multiple-approval-rules-premium) are available in
+[GitLab Premium](https://about.gitlab.com/pricing/) and above.
 
 NOTE: **Note:**
 On GitLab.com, you can add a group as an approver if you're a member of that group or the
@@ -88,6 +84,11 @@ if [**Prevent author approval**](#allowing-merge-request-authors-to-approve-thei
 and [**Prevent committers approval**](#prevent-approval-of-merge-requests-by-their-committers) (disabled by default)
 are enabled on the project settings.
 
+[Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/10294) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.3,
+when an eligible approver comments on a merge request, it appears in the **Commented by** column of the Approvals widget,
+indicating who has engaged in the merge request review. Authors and reviewers can also easily identify who they should reach out
+to if they have any questions or inputs about the content of the merge request.
+
 ##### Implicit Approvers
 
 If the number of required approvals is greater than the number of assigned approvers,
@@ -187,9 +188,6 @@ a rule is already defined.
 When an [eligible approver](#eligible-approvers) approves a merge request, it will
 reduce the number of approvals left for all rules that the approver belongs to.
 
-When an [eligible approver](#eligible-approvers) comments on a merge request, it
-appears in the **Commented by** column. This feature was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/10294) in GitLab 13.3.
-
 ![Approvals premium merge request widget](img/approvals_premium_mr_widget_v13_3.png)
 
 #### Scoped to Protected Branch **(PREMIUM)**
diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index 6f449fd060a..cea0cb3a19c 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -67,10 +67,11 @@ module API
         optional :environment_scope, type: String, desc: 'The environment_scope of the variable'
       end
       post ':id/variables' do
-        variable_params = declared_params(include_missing: false)
-        variable_params = filter_variable_parameters(variable_params)
-
-        variable = user_project.variables.create(variable_params)
+        variable = ::Ci::ChangeVariableService.new(
+          container: user_project,
+          current_user: current_user,
+          params: { action: :create, variable_params: filter_variable_parameters(declared_params(include_missing: false)) }
+        ).execute
 
         if variable.valid?
           present variable, with: Entities::Ci::Variable
@@ -96,10 +97,17 @@ module API
         variable = find_variable(params)
         not_found!('Variable') unless variable
 
-        variable_params = declared_params(include_missing: false).except(:key, :filter)
-        variable_params = filter_variable_parameters(variable_params)
+        variable_params = filter_variable_parameters(
+          declared_params(include_missing: false)
+            .except(:key, :filter)
+        )
+        variable = ::Ci::ChangeVariableService.new(
+          container: user_project,
+          current_user: current_user,
+          params: { action: :update, variable: variable, variable_params: variable_params }
+        ).execute
 
-        if variable.update(variable_params)
+        if variable.valid?
           present variable, with: Entities::Ci::Variable
         else
           render_validation_error!(variable)
@@ -119,8 +127,11 @@ module API
         variable = find_variable(params)
         not_found!('Variable') unless variable
 
-        # Variables don't have a timestamp. Therefore, destroy unconditionally.
-        variable.destroy
+        ::Ci::ChangeVariableService.new(
+          container: user_project,
+          current_user: current_user,
+          params: { action: :destroy, variable: variable }
+        ).execute
 
         no_content!
       end
diff --git a/lib/gitlab/background_migration/backfill_designs_relative_position.rb b/lib/gitlab/background_migration/backfill_designs_relative_position.rb
index 4cfaa899eef..efbb1b950ad 100644
--- a/lib/gitlab/background_migration/backfill_designs_relative_position.rb
+++ b/lib/gitlab/background_migration/backfill_designs_relative_position.rb
@@ -2,52 +2,13 @@
 
 module Gitlab
   module BackgroundMigration
-    # Backfill `relative_position` column in `design_management_designs` table
+    # This migration is not needed anymore and was disabled, because we're now
+    # also backfilling design positions immediately before moving a design.
+    #
+    # See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39555
     class BackfillDesignsRelativePosition
-      # Define the issue model
-      class Issue < ActiveRecord::Base
-        self.table_name = 'issues'
-      end
-
-      # Define the design model
-      class Design < ActiveRecord::Base
-        include RelativePositioning if defined?(RelativePositioning)
-
-        self.table_name = 'design_management_designs'
-
-        def self.relative_positioning_query_base(design)
-          where(issue_id: design.issue_id)
-        end
-
-        def self.relative_positioning_parent_column
-          :issue_id
-        end
-
-        def self.move_nulls_to_start(designs)
-          if defined?(super)
-            super(designs)
-          else
-            logger.error "BackfillDesignsRelativePosition failed because move_nulls_to_start is no longer included in the RelativePositioning concern"
-          end
-        end
-      end
-
       def perform(issue_ids)
-        issue_ids.each do |issue_id|
-          migrate_issue(issue_id)
-        end
-      end
-
-      private
-
-      def migrate_issue(issue_id)
-        issue = Issue.find_by(id: issue_id)
-        return unless issue
-
-        designs = Design.where(issue_id: issue.id).order(:id)
-        return unless designs.any?
-
-        Design.move_nulls_to_start(designs)
+        # no-op
       end
     end
   end
diff --git a/lib/gitlab/ci/features.rb b/lib/gitlab/ci/features.rb
index 5d0e1e4fd01..38767acf716 100644
--- a/lib/gitlab/ci/features.rb
+++ b/lib/gitlab/ci/features.rb
@@ -57,7 +57,7 @@ module Gitlab
       end
 
       def self.ci_if_parenthesis_enabled?
-        ::Feature.enabled?(:ci_if_parenthesis_enabled)
+        ::Feature.enabled?(:ci_if_parenthesis_enabled, default_enabled: true)
       end
 
       def self.allow_to_create_merge_request_pipelines_in_target_project?(target_project)
@@ -65,7 +65,7 @@ module Gitlab
       end
 
       def self.ci_plan_needs_size_limit?(project)
-        ::Feature.enabled?(:ci_plan_needs_size_limit, project)
+        ::Feature.enabled?(:ci_plan_needs_size_limit, project, default_enabled: true)
       end
 
       def self.job_entry_matches_all_keys?
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index f2a7da73120..f6914389637 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -604,8 +604,6 @@ module Gitlab
       end
 
       def action_monthly_active_users(time_period)
-        return {} unless Feature.enabled?(Gitlab::UsageDataCounters::TrackUniqueActions::FEATURE_FLAG)
-
         counter = Gitlab::UsageDataCounters::TrackUniqueActions
 
         project_count = redis_usage_data do
diff --git a/lib/gitlab/usage_data_counters/track_unique_actions.rb b/lib/gitlab/usage_data_counters/track_unique_actions.rb
index b7948b07251..0df982572a4 100644
--- a/lib/gitlab/usage_data_counters/track_unique_actions.rb
+++ b/lib/gitlab/usage_data_counters/track_unique_actions.rb
@@ -4,7 +4,6 @@ module Gitlab
   module UsageDataCounters
     module TrackUniqueActions
       KEY_EXPIRY_LENGTH = 29.days
-      FEATURE_FLAG = :track_unique_actions
 
       WIKI_ACTION = :wiki_action
       DESIGN_ACTION = :design_action
@@ -29,7 +28,6 @@ module Gitlab
       class << self
         def track_event(event_action:, event_target:, author_id:, time: Time.zone.now)
           return unless Gitlab::CurrentSettings.usage_ping_enabled
-          return unless Feature.enabled?(FEATURE_FLAG)
           return unless valid_target?(event_target)
           return unless valid_action?(event_action)
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index ff2627e69a5..eba71cacad1 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6161,6 +6161,12 @@ msgstr ""
 msgid "Comment/Reply (quoting selected text)"
 msgstr ""
 
+msgid "Commenting on files that replace or are replaced by symbolic links is currently not supported."
+msgstr ""
+
+msgid "Commenting on symbolic links that replace or are replaced by files is currently not supported."
+msgstr ""
+
 msgid "Comments"
 msgstr ""
 
diff --git a/package.json b/package.json
index 5f70378f735..29d611c341d 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "@babel/preset-env": "^7.10.1",
     "@gitlab/at.js": "1.5.5",
     "@gitlab/svgs": "1.158.0",
-    "@gitlab/ui": "18.7.0",
+    "@gitlab/ui": "20.1.1",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "^6.0.3-1",
     "@sentry/browser": "^5.10.2",
diff --git a/spec/bin/feature_flag_spec.rb b/spec/bin/feature_flag_spec.rb
index e0fa24fb484..f85b8f22210 100644
--- a/spec/bin/feature_flag_spec.rb
+++ b/spec/bin/feature_flag_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe 'bin/feature-flag' do
   using RSpec::Parameterized::TableSyntax
 
   describe FeatureFlagCreator do
-    let(:argv) { %w[feature-flag-name -t development -g group::memory -i https://url] }
+    let(:argv) { %w[feature-flag-name -t development -g group::memory -i https://url -m http://url] }
     let(:options) { FeatureFlagOptionParser.parse(argv) }
     let(:creator) { described_class.new(options) }
     let(:existing_flag) { File.join('config', 'feature_flags', 'development', 'existing-feature-flag.yml') }
@@ -183,15 +183,51 @@ RSpec.describe 'bin/feature-flag' do
       end
     end
 
-    describe '.rollout_issue_url' do
+    describe '.read_introduced_by_url' do
+      let(:url) { 'https://merge-request' }
+
+      it 'reads type from $stdin' do
+        expect($stdin).to receive(:gets).and_return(url)
+        expect do
+          expect(described_class.read_introduced_by_url).to eq('https://merge-request')
+        end.to output(/can you paste the URL here/).to_stdout
+      end
+
+      context 'empty URL given' do
+        let(:url) { '' }
+
+        it 'skips entry' do
+          expect($stdin).to receive(:gets).and_return(url)
+          expect do
+            expect(described_class.read_introduced_by_url).to be_nil
+          end.to output(/can you paste the URL here/).to_stdout
+        end
+      end
+
+      context 'invalid URL given' do
+        let(:url) { 'invalid' }
+
+        it 'shows error message and retries' do
+          expect($stdin).to receive(:gets).and_return(url)
+          expect($stdin).to receive(:gets).and_raise('EOF')
+
+          expect do
+            expect { described_class.read_introduced_by_url }.to raise_error(/EOF/)
+          end.to output(/can you paste the URL here/).to_stdout
+            .and output(/URL needs to start with/).to_stderr
+        end
+      end
+    end
+
+    describe '.read_rollout_issue_url' do
       let(:options) { OpenStruct.new(name: 'foo', type: :development) }
       let(:url) { 'https://issue' }
 
       it 'reads type from $stdin' do
         expect($stdin).to receive(:gets).and_return(url)
         expect do
-          expect(described_class.read_issue_url(options)).to eq('https://issue')
-        end.to output(/Paste URL here/).to_stdout
+          expect(described_class.read_rollout_issue_url(options)).to eq('https://issue')
+        end.to output(/Paste URL of `rollout issue` here/).to_stdout
       end
 
       context 'invalid URL given' do
@@ -202,8 +238,8 @@ RSpec.describe 'bin/feature-flag' do
           expect($stdin).to receive(:gets).and_raise('EOF')
 
           expect do
-            expect { described_class.read_issue_url(options) }.to raise_error(/EOF/)
-          end.to output(/Paste URL here/).to_stdout
+            expect { described_class.read_rollout_issue_url(options) }.to raise_error(/EOF/)
+          end.to output(/Paste URL of `rollout issue` here/).to_stdout
             .and output(/URL needs to start/).to_stderr
         end
       end
diff --git a/spec/features/issues/filtered_search/visual_tokens_spec.rb b/spec/features/issues/filtered_search/visual_tokens_spec.rb
index 59588978a8e..c585d7f6194 100644
--- a/spec/features/issues/filtered_search/visual_tokens_spec.rb
+++ b/spec/features/issues/filtered_search/visual_tokens_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe 'Visual tokens', :js do
     end
 
     it 'ends editing mode when document is clicked' do
-      find('#content-body').click
+      find('.js-navbar').click
 
       expect_filtered_search_input_empty
       expect(page).to have_css('#js-dropdown-author', visible: false)
@@ -142,7 +142,7 @@ RSpec.describe 'Visual tokens', :js do
     it 'does not tokenize incomplete token' do
       filtered_search.send_keys('author:=')
 
-      find('body').click
+      find('.js-navbar').click
       token = page.all('.tokens-container .js-visual-token')[1]
 
       expect_filtered_search_input_empty
diff --git a/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb b/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb
index 8070fee5804..29a27992a0d 100644
--- a/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb
+++ b/spec/features/projects/issues/design_management/user_uploads_designs_spec.rb
@@ -5,9 +5,9 @@ require 'spec_helper'
 RSpec.describe 'User uploads new design', :js do
   include DesignManagementTestHelpers
 
-  let_it_be(:project) { create(:project_empty_repo, :public) }
-  let_it_be(:user) { project.owner }
-  let_it_be(:issue) { create(:issue, project: project) }
+  let(:project) { create(:project_empty_repo, :public) }
+  let(:user) { project.owner }
+  let(:issue) { create(:issue, project: project) }
 
   before do
     sign_in(user)
@@ -28,7 +28,7 @@ RSpec.describe 'User uploads new design', :js do
       let(:feature_enabled) { true }
 
       it 'uploads designs' do
-        attach_file(:design_file, logo_fixture, make_visible: true)
+        upload_design(logo_fixture, count: 1)
 
         expect(page).to have_selector('.js-design-list-item', count: 1)
 
@@ -36,9 +36,12 @@ RSpec.describe 'User uploads new design', :js do
           expect(page).to have_content('dk.png')
         end
 
-        attach_file(:design_file, gif_fixture, make_visible: true)
+        upload_design(gif_fixture, count: 2)
 
+        # Known bug in the legacy implementation: new designs are inserted
+        # in the beginning on the frontend.
         expect(page).to have_selector('.js-design-list-item', count: 2)
+        expect(page.all('.js-design-list-item').map(&:text)).to eq(['banana_sample.gif', 'dk.png'])
       end
     end
 
@@ -61,8 +64,8 @@ RSpec.describe 'User uploads new design', :js do
     context "when the feature is available" do
       let(:feature_enabled) { true }
 
-      it 'uploads designs', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/225616' do
-        attach_file(:design_file, logo_fixture, make_visible: true)
+      it 'uploads designs' do
+        upload_design(logo_fixture, count: 1)
 
         expect(page).to have_selector('.js-design-list-item', count: 1)
 
@@ -70,9 +73,10 @@ RSpec.describe 'User uploads new design', :js do
           expect(page).to have_content('dk.png')
         end
 
-        attach_file(:design_file, gif_fixture, make_visible: true)
+        upload_design(gif_fixture, count: 2)
 
         expect(page).to have_selector('.js-design-list-item', count: 2)
+        expect(page.all('.js-design-list-item').map(&:text)).to eq(['dk.png', 'banana_sample.gif'])
       end
     end
 
@@ -92,4 +96,12 @@ RSpec.describe 'User uploads new design', :js do
   def gif_fixture
     Rails.root.join('spec', 'fixtures', 'banana_sample.gif')
   end
+
+  def upload_design(fixture, count:)
+    attach_file(:design_file, fixture, match: :first, make_visible: true)
+
+    wait_for('designs uploaded') do
+      issue.reload.designs.count == count
+    end
+  end
 end
diff --git a/spec/frontend/__mocks__/@toast-ui/vue-editor/index.js b/spec/frontend/__mocks__/@toast-ui/vue-editor/index.js
index 726ed0fa030..9fee8e18d26 100644
--- a/spec/frontend/__mocks__/@toast-ui/vue-editor/index.js
+++ b/spec/frontend/__mocks__/@toast-ui/vue-editor/index.js
@@ -17,6 +17,17 @@ export const Editor = {
       type: String,
     },
   },
+  created() {
+    const mockEditorApi = {
+      eventManager: {
+        addEventType: jest.fn(),
+        listen: jest.fn(),
+        removeEventHandler: jest.fn(),
+      },
+    };
+
+    this.$emit('load', mockEditorApi);
+  },
   render(h) {
     return h('div');
   },
diff --git a/spec/frontend/alert_settings/__snapshots__/alert_settings_form_spec.js.snap b/spec/frontend/alert_settings/__snapshots__/alert_settings_form_spec.js.snap
index f6036dcbc1d..f271aeb5d95 100644
--- a/spec/frontend/alert_settings/__snapshots__/alert_settings_form_spec.js.snap
+++ b/spec/frontend/alert_settings/__snapshots__/alert_settings_form_spec.js.snap
@@ -27,7 +27,7 @@ exports[`AlertsSettingsForm with default values renders the initial template 1`]
     <gl-form-group-stub label=\\"Authorization key\\" label-for=\\"authorization-key\\" label-class=\\"label-bold\\">
       <gl-form-input-group-stub value=\\"abcedfg123\\" predefinedoptions=\\"[object Object]\\" id=\\"authorization-key\\" readonly=\\"\\" class=\\"gl-mb-2\\"></gl-form-input-group-stub>
       <div class=\\"gl-display-flex gl-justify-content-end\\">
-        <gl-button-stub category=\\"tertiary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" disabled=\\"true\\" class=\\"gl-mt-3\\" role=\\"button\\" tabindex=\\"0\\">Reset key</gl-button-stub>
+        <gl-button-stub category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" disabled=\\"true\\" class=\\"gl-mt-3\\" role=\\"button\\" tabindex=\\"0\\">Reset key</gl-button-stub>
       </div>
       <gl-modal-stub modalid=\\"authKeyModal\\" titletag=\\"h4\\" modalclass=\\"\\" size=\\"md\\" title=\\"Reset key\\" ok-title=\\"Reset key\\" ok-variant=\\"danger\\">
         Resetting the authorization key for this project will require updating the authorization key in every alert source it is enabled in.
@@ -37,7 +37,7 @@ exports[`AlertsSettingsForm with default values renders the initial template 1`]
       <gl-form-textarea-stub noresize=\\"true\\" id=\\"alert-json\\" disabled=\\"true\\" state=\\"true\\" placeholder=\\"Enter test alert JSON....\\" rows=\\"6\\" max-rows=\\"10\\"></gl-form-textarea-stub>
     </gl-form-group-stub>
     <div class=\\"gl-display-flex gl-justify-content-end\\">
-      <gl-button-stub category=\\"tertiary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" disabled=\\"true\\">Test alert payload</gl-button-stub>
+      <gl-button-stub category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" disabled=\\"true\\">Test alert payload</gl-button-stub>
     </div>
     <div class=\\"footer-block row-content-block gl-display-flex gl-justify-content-space-between\\">
       <gl-button-stub category=\\"primary\\" variant=\\"default\\" size=\\"medium\\" icon=\\"\\" disabled=\\"true\\">
diff --git a/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap b/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap
index 161c2bade05..745a163951a 100644
--- a/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap
+++ b/spec/frontend/code_navigation/components/__snapshots__/popover_spec.js.snap
@@ -56,7 +56,7 @@ exports[`Code navigation popover component renders popover 1`] = `
         class="popover-body border-top"
       >
         <gl-button-stub
-          category="tertiary"
+          category="primary"
           class="w-100"
           data-testid="go-to-definition-btn"
           href="http://gitlab.com/test.js"
diff --git a/spec/frontend/design_management/components/toolbar/__snapshots__/index_spec.js.snap b/spec/frontend/design_management/components/toolbar/__snapshots__/index_spec.js.snap
index aa914a8dff0..1900c64cd47 100644
--- a/spec/frontend/design_management/components/toolbar/__snapshots__/index_spec.js.snap
+++ b/spec/frontend/design_management/components/toolbar/__snapshots__/index_spec.js.snap
@@ -44,7 +44,7 @@ exports[`Design management toolbar component renders design and updated data 1`]
     />
      
     <gl-button-stub
-      category="tertiary"
+      category="primary"
       href="/-/designs/306/7f747adcd4693afadbe968d7ba7d983349b9012d"
       icon="download"
       size="medium"
diff --git a/spec/frontend/design_management/components/upload/__snapshots__/button_spec.js.snap b/spec/frontend/design_management/components/upload/__snapshots__/button_spec.js.snap
index c4112b46402..3d7939df28e 100644
--- a/spec/frontend/design_management/components/upload/__snapshots__/button_spec.js.snap
+++ b/spec/frontend/design_management/components/upload/__snapshots__/button_spec.js.snap
@@ -5,7 +5,7 @@ exports[`Design management upload button component renders inverted upload desig
   isinverted="true"
 >
   <gl-button-stub
-    category="tertiary"
+    category="primary"
     icon=""
     size="small"
     title="Adding a design with the same filename replaces the file in a new version."
@@ -30,7 +30,7 @@ exports[`Design management upload button component renders inverted upload desig
 exports[`Design management upload button component renders loading icon 1`] = `
 <div>
   <gl-button-stub
-    category="tertiary"
+    category="primary"
     disabled="true"
     icon=""
     size="small"
@@ -62,7 +62,7 @@ exports[`Design management upload button component renders loading icon 1`] = `
 exports[`Design management upload button component renders upload design button 1`] = `
 <div>
   <gl-button-stub
-    category="tertiary"
+    category="primary"
     icon=""
     size="small"
     title="Adding a design with the same filename replaces the file in a new version."
diff --git a/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap b/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
index c3fcede5576..3881b2d7679 100644
--- a/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
+++ b/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap
@@ -110,7 +110,7 @@ exports[`Design management index page designs renders designs list and header wi
         class="qa-selector-toolbar gl-display-flex gl-align-items-center"
       >
         <gl-button-stub
-          category="tertiary"
+          category="primary"
           class="gl-mr-3 js-select-all"
           icon=""
           size="small"
diff --git a/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap b/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap
index a7b754ba50d..823294efc38 100644
--- a/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap
+++ b/spec/frontend/design_management/pages/design/__snapshots__/index_spec.js.snap
@@ -65,7 +65,7 @@ exports[`Design management design index page renders design index 1`] = `
     />
      
     <gl-button-stub
-      category="tertiary"
+      category="primary"
       class="link-inherit-color gl-text-body gl-text-decoration-none gl-font-weight-bold gl-mb-4"
       data-testid="resolved-comments"
       icon="chevron-right"
diff --git a/spec/frontend/design_management_legacy/pages/design/__snapshots__/index_spec.js.snap b/spec/frontend/design_management_legacy/pages/design/__snapshots__/index_spec.js.snap
index c3417744524..dc5baf37fc6 100644
--- a/spec/frontend/design_management_legacy/pages/design/__snapshots__/index_spec.js.snap
+++ b/spec/frontend/design_management_legacy/pages/design/__snapshots__/index_spec.js.snap
@@ -65,7 +65,7 @@ exports[`Design management design index page renders design index 1`] = `
     />
      
     <gl-button-stub
-      category="tertiary"
+      category="primary"
       class="link-inherit-color gl-text-body gl-text-decoration-none gl-font-weight-bold gl-mb-4"
       data-testid="resolved-comments"
       icon="chevron-right"
diff --git a/spec/frontend/diffs/components/diff_table_cell_spec.js b/spec/frontend/diffs/components/diff_table_cell_spec.js
index 24daef62ee2..02f5c27eecb 100644
--- a/spec/frontend/diffs/components/diff_table_cell_spec.js
+++ b/spec/frontend/diffs/components/diff_table_cell_spec.js
@@ -18,6 +18,12 @@ const TEST_LINE_CODE = 'LC_42';
 const TEST_FILE_HASH = diffFileMockData.file_hash;
 
 describe('DiffTableCell', () => {
+  const symlinkishFileTooltip =
+    'Commenting on symbolic links that replace or are replaced by files is currently not supported.';
+  const realishFileTooltip =
+    'Commenting on files that replace or are replaced by symbolic links is currently not supported.';
+  const otherFileTooltip = 'Add a comment to this line';
+
   let wrapper;
   let line;
   let store;
@@ -67,6 +73,7 @@ describe('DiffTableCell', () => {
   const findTd = () => wrapper.find({ ref: 'td' });
   const findNoteButton = () => wrapper.find({ ref: 'addDiffNoteButton' });
   const findLineNumber = () => wrapper.find({ ref: 'lineNumberRef' });
+  const findTooltip = () => wrapper.find({ ref: 'addNoteTooltip' });
   const findAvatars = () => wrapper.find(DiffGutterAvatars);
 
   describe('td', () => {
@@ -134,6 +141,53 @@ describe('DiffTableCell', () => {
         });
       },
     );
+
+    it.each`
+      disabled      | commentsDisabled
+      ${'disabled'} | ${true}
+      ${undefined}  | ${false}
+    `(
+      'has attribute disabled=$disabled when the outer component has prop commentsDisabled=$commentsDisabled',
+      ({ disabled, commentsDisabled }) => {
+        line.commentsDisabled = commentsDisabled;
+
+        createComponent({
+          showCommentButton: true,
+          isHover: true,
+        });
+
+        wrapper.setData({ isCommentButtonRendered: true });
+
+        return wrapper.vm.$nextTick().then(() => {
+          expect(findNoteButton().attributes('disabled')).toBe(disabled);
+        });
+      },
+    );
+
+    it.each`
+      tooltip                  | commentsDisabled
+      ${symlinkishFileTooltip} | ${{ wasSymbolic: true }}
+      ${symlinkishFileTooltip} | ${{ isSymbolic: true }}
+      ${realishFileTooltip}    | ${{ wasReal: true }}
+      ${realishFileTooltip}    | ${{ isReal: true }}
+      ${otherFileTooltip}      | ${false}
+    `(
+      'has the correct tooltip when commentsDisabled=$commentsDisabled',
+      ({ tooltip, commentsDisabled }) => {
+        line.commentsDisabled = commentsDisabled;
+
+        createComponent({
+          showCommentButton: true,
+          isHover: true,
+        });
+
+        wrapper.setData({ isCommentButtonRendered: true });
+
+        return wrapper.vm.$nextTick().then(() => {
+          expect(findTooltip().attributes('title')).toBe(tooltip);
+        });
+      },
+    );
   });
 
   describe('line number', () => {
diff --git a/spec/frontend/filtered_search/filtered_search_visual_tokens_spec.js b/spec/frontend/filtered_search/filtered_search_visual_tokens_spec.js
index e59ee925cc7..6a00065c9fe 100644
--- a/spec/frontend/filtered_search/filtered_search_visual_tokens_spec.js
+++ b/spec/frontend/filtered_search/filtered_search_visual_tokens_spec.js
@@ -280,8 +280,8 @@ describe('Filtered Search Visual Tokens', () => {
         );
       });
 
-      it('contains fa-close icon', () => {
-        expect(tokenElement.querySelector('.remove-token .fa-close')).toEqual(expect.anything());
+      it('contains close icon', () => {
+        expect(tokenElement.querySelector('.remove-token .close-icon')).toEqual(expect.anything());
       });
     });
   });
diff --git a/spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap b/spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
index 8a61f5565c6..0e16b726c4b 100644
--- a/spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
+++ b/spec/frontend/grafana_integration/components/__snapshots__/grafana_integration_spec.js.snap
@@ -17,7 +17,7 @@ exports[`grafana integration component default state to match the default snapsh
     </h3>
      
     <gl-button-stub
-      category="tertiary"
+      category="primary"
       class="js-settings-toggle"
       icon=""
       size="medium"
diff --git a/spec/frontend/helpers/filtered_search_spec_helper.js b/spec/frontend/helpers/filtered_search_spec_helper.js
index ceb7982bbc3..ecf10694a16 100644
--- a/spec/frontend/helpers/filtered_search_spec_helper.js
+++ b/spec/frontend/helpers/filtered_search_spec_helper.js
@@ -15,7 +15,7 @@ export default class FilteredSearchSpecHelper {
         <div class="value-container">
           <div class="value">${value}</div>
           <div class="remove-token" role="button">
-            <i class="fa fa-close"></i>
+            <svg class="s16 close-icon"></svg>
           </div>
         </div>
       </div>
diff --git a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
index ef61a835918..f3f610e4bb7 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
@@ -85,7 +85,7 @@ exports[`Alert integration settings form default state should match the default
       class="gl-display-flex gl-justify-content-end"
     >
       <gl-button-stub
-        category="tertiary"
+        category="primary"
         class="js-no-auto-disable"
         data-qa-selector="save_changes_button"
         icon=""
diff --git a/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
index 31978f8da64..3ad4c13382d 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
@@ -18,7 +18,7 @@ exports[`IncidentsSettingTabs should render the component 1`] = `
     </h4>
      
     <gl-button-stub
-      category="tertiary"
+      category="primary"
       class="js-settings-toggle"
       icon=""
       size="medium"
diff --git a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
index c0fee56c9d8..78bb238fcb6 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
@@ -46,7 +46,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
         class="gl-display-flex gl-justify-content-end"
       >
         <gl-button-stub
-          category="tertiary"
+          category="primary"
           class="gl-mt-3"
           data-testid="webhook-reset-btn"
           icon=""
@@ -80,7 +80,7 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
       class="gl-display-flex gl-justify-content-end"
     >
       <gl-button-stub
-        category="tertiary"
+        category="primary"
         class="js-no-auto-disable"
         icon=""
         size="medium"
diff --git a/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap b/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
index 4148c263d28..fc37a545511 100644
--- a/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
+++ b/spec/frontend/pages/admin/users/components/__snapshots__/delete_user_modal_spec.js.snap
@@ -38,7 +38,7 @@ exports[`User Operation confirmation modal renders modal with form included 1`]
     />
   </form>
   <gl-button-stub
-    category="tertiary"
+    category="primary"
     icon=""
     size="medium"
     variant="default"
diff --git a/spec/frontend/projects/components/shared/__snapshots__/delete_button_spec.js.snap b/spec/frontend/projects/components/shared/__snapshots__/delete_button_spec.js.snap
index 51fb9a0dede..a43acc8c002 100644
--- a/spec/frontend/projects/components/shared/__snapshots__/delete_button_spec.js.snap
+++ b/spec/frontend/projects/components/shared/__snapshots__/delete_button_spec.js.snap
@@ -82,7 +82,7 @@ exports[`Project remove modal intialized matches the snapshot 1`] = `
      
     <template>
       <gl-button-stub
-        category="tertiary"
+        category="primary"
         class="js-modal-action-cancel"
         icon=""
         size="medium"
@@ -96,7 +96,7 @@ exports[`Project remove modal intialized matches the snapshot 1`] = `
       <!---->
        
       <gl-button-stub
-        category="tertiary"
+        category="primary"
         class="js-modal-action-primary"
         disabled="true"
         icon=""
diff --git a/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap b/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap
index e5e436278a3..22689080063 100644
--- a/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap
+++ b/spec/frontend/serverless/components/__snapshots__/empty_state_spec.js.snap
@@ -11,7 +11,7 @@ exports[`EmptyStateComponent should render content 1`] = `
       <p>In order to start using functions as a service, you must first install Knative on your Kubernetes cluster. <gl-link-stub href=\\"/help\\">More information</gl-link-stub>
       </p>
       <div>
-        <gl-button-stub category=\\"tertiary\\" variant=\\"success\\" size=\\"medium\\" icon=\\"\\" href=\\"/clusters\\">Install Knative</gl-button-stub>
+        <gl-button-stub category=\\"primary\\" variant=\\"success\\" size=\\"medium\\" icon=\\"\\" href=\\"/clusters\\">Install Knative</gl-button-stub>
         <!---->
       </div>
     </div>
diff --git a/spec/frontend/vue_shared/components/__snapshots__/clone_dropdown_spec.js.snap b/spec/frontend/vue_shared/components/__snapshots__/clone_dropdown_spec.js.snap
index 71cfa394957..e84eb7789d3 100644
--- a/spec/frontend/vue_shared/components/__snapshots__/clone_dropdown_spec.js.snap
+++ b/spec/frontend/vue_shared/components/__snapshots__/clone_dropdown_spec.js.snap
@@ -39,7 +39,7 @@ exports[`Clone Dropdown Button rendering matches the snapshot 1`] = `
             tag="div"
           >
             <gl-button-stub
-              category="tertiary"
+              category="primary"
               class="d-inline-flex"
               data-clipboard-text="ssh://foo.bar"
               data-qa-selector="copy_ssh_url_button"
@@ -80,7 +80,7 @@ exports[`Clone Dropdown Button rendering matches the snapshot 1`] = `
             tag="div"
           >
             <gl-button-stub
-              category="tertiary"
+              category="primary"
               class="d-inline-flex"
               data-clipboard-text="http://foo.bar"
               data-qa-selector="copy_http_url_button"
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js
index 78f27c9948b..16f60b5ff21 100644
--- a/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js
+++ b/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js
@@ -5,10 +5,13 @@ import {
   registerHTMLToMarkdownRenderer,
   addImage,
   getMarkdown,
+  getEditorOptions,
 } from '~/vue_shared/components/rich_content_editor/services/editor_service';
 import buildHTMLToMarkdownRenderer from '~/vue_shared/components/rich_content_editor/services/build_html_to_markdown_renderer';
+import buildCustomRenderer from '~/vue_shared/components/rich_content_editor/services/build_custom_renderer';
 
 jest.mock('~/vue_shared/components/rich_content_editor/services/build_html_to_markdown_renderer');
+jest.mock('~/vue_shared/components/rich_content_editor/services/build_custom_renderer');
 
 describe('Editor Service', () => {
   let mockInstance;
@@ -120,4 +123,25 @@ describe('Editor Service', () => {
       expect(mockInstance.toMarkOptions.renderer).toBe(extendedRenderer);
     });
   });
+
+  describe('getEditorOptions', () => {
+    const externalOptions = {
+      customRenderers: {},
+    };
+    const renderer = {};
+
+    beforeEach(() => {
+      buildCustomRenderer.mockReturnValueOnce(renderer);
+    });
+
+    it('generates a configuration object with a custom HTML renderer and toolbarItems', () => {
+      expect(getEditorOptions()).toHaveProp('customHTMLRenderer', renderer);
+      expect(getEditorOptions()).toHaveProp('toolbarItems');
+    });
+
+    it('passes external renderers to the buildCustomRenderers function', () => {
+      getEditorOptions(externalOptions);
+      expect(buildCustomRenderer).toHaveBeenCalledWith(externalOptions.customRenderers);
+    });
+  });
 });
diff --git a/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js
index b6ff6aa767c..3d54db7fe5c 100644
--- a/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js
+++ b/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js
@@ -2,7 +2,6 @@ import { shallowMount } from '@vue/test-utils';
 import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue';
 import AddImageModal from '~/vue_shared/components/rich_content_editor/modals/add_image/add_image_modal.vue';
 import {
-  EDITOR_OPTIONS,
   EDITOR_TYPES,
   EDITOR_HEIGHT,
   EDITOR_PREVIEW_STYLE,
@@ -14,6 +13,7 @@ import {
   removeCustomEventListener,
   addImage,
   registerHTMLToMarkdownRenderer,
+  getEditorOptions,
 } from '~/vue_shared/components/rich_content_editor/services/editor_service';
 
 jest.mock('~/vue_shared/components/rich_content_editor/services/editor_service', () => ({
@@ -22,6 +22,7 @@ jest.mock('~/vue_shared/components/rich_content_editor/services/editor_service',
   removeCustomEventListener: jest.fn(),
   addImage: jest.fn(),
   registerHTMLToMarkdownRenderer: jest.fn(),
+  getEditorOptions: jest.fn(),
 }));
 
 describe('Rich Content Editor', () => {
@@ -32,13 +33,25 @@ describe('Rich Content Editor', () => {
   const findEditor = () => wrapper.find({ ref: 'editor' });
   const findAddImageModal = () => wrapper.find(AddImageModal);
 
-  beforeEach(() => {
+  const buildWrapper = () => {
     wrapper = shallowMount(RichContentEditor, {
       propsData: { content, imageRoot },
     });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
   });
 
   describe('when content is loaded', () => {
+    const editorOptions = {};
+
+    beforeEach(() => {
+      getEditorOptions.mockReturnValueOnce(editorOptions);
+      buildWrapper();
+    });
+
     it('renders an editor', () => {
       expect(findEditor().exists()).toBe(true);
     });
@@ -47,8 +60,8 @@ describe('Rich Content Editor', () => {
       expect(findEditor().props().initialValue).toBe(content);
     });
 
-    it('provides the correct editor options', () => {
-      expect(findEditor().props().options).toEqual(EDITOR_OPTIONS);
+    it('provides options generated by the getEditorOptions service', () => {
+      expect(findEditor().props().options).toBe(editorOptions);
     });
 
     it('has the correct preview style', () => {
@@ -65,6 +78,10 @@ describe('Rich Content Editor', () => {
   });
 
   describe('when content is changed', () => {
+    beforeEach(() => {
+      buildWrapper();
+    });
+
     it('emits an input event with the changed content', () => {
       const changedMarkdown = '## Changed Markdown';
       const getMarkdownMock = jest.fn().mockReturnValueOnce(changedMarkdown);
@@ -77,6 +94,10 @@ describe('Rich Content Editor', () => {
   });
 
   describe('when content is reset', () => {
+    beforeEach(() => {
+      buildWrapper();
+    });
+
     it('should reset the content via setMarkdown', () => {
       const newContent = 'Just the body content excluding the front matter for example';
       const mockInstance = { invoke: jest.fn() };
@@ -89,35 +110,33 @@ describe('Rich Content Editor', () => {
   });
 
   describe('when editor is loaded', () => {
-    let mockEditorApi;
-
     beforeEach(() => {
-      mockEditorApi = { eventManager: { addEventType: jest.fn(), listen: jest.fn() } };
-      findEditor().vm.$emit('load', mockEditorApi);
+      buildWrapper();
     });
 
     it('adds the CUSTOM_EVENTS.openAddImageModal custom event listener', () => {
       expect(addCustomEventListener).toHaveBeenCalledWith(
-        mockEditorApi,
+        wrapper.vm.editorApi,
         CUSTOM_EVENTS.openAddImageModal,
         wrapper.vm.onOpenAddImageModal,
       );
     });
 
     it('registers HTML to markdown renderer', () => {
-      expect(registerHTMLToMarkdownRenderer).toHaveBeenCalledWith(mockEditorApi);
+      expect(registerHTMLToMarkdownRenderer).toHaveBeenCalledWith(wrapper.vm.editorApi);
     });
   });
 
   describe('when editor is destroyed', () => {
-    it('removes the CUSTOM_EVENTS.openAddImageModal custom event listener', () => {
-      const mockEditorApi = { eventManager: { removeEventHandler: jest.fn() } };
+    beforeEach(() => {
+      buildWrapper();
+    });
 
-      wrapper.vm.editorApi = mockEditorApi;
+    it('removes the CUSTOM_EVENTS.openAddImageModal custom event listener', () => {
       wrapper.vm.$destroy();
 
       expect(removeCustomEventListener).toHaveBeenCalledWith(
-        mockEditorApi,
+        wrapper.vm.editorApi,
         CUSTOM_EVENTS.openAddImageModal,
         wrapper.vm.onOpenAddImageModal,
       );
@@ -125,6 +144,10 @@ describe('Rich Content Editor', () => {
   });
 
   describe('add image modal', () => {
+    beforeEach(() => {
+      buildWrapper();
+    });
+
     it('renders an addImageModal component', () => {
       expect(findAddImageModal().exists()).toBe(true);
     });
diff --git a/spec/lib/gitlab/background_migration/backfill_designs_relative_position_spec.rb b/spec/lib/gitlab/background_migration/backfill_designs_relative_position_spec.rb
deleted file mode 100644
index 1b723502663..00000000000
--- a/spec/lib/gitlab/background_migration/backfill_designs_relative_position_spec.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Gitlab::BackgroundMigration::BackfillDesignsRelativePosition do
-  let(:namespace) { table(:namespaces).create!(name: 'gitlab', path: 'gitlab') }
-  let(:project) { table(:projects).create!(namespace_id: namespace.id) }
-  let(:issues) { table(:issues) }
-  let(:designs) { table(:design_management_designs) }
-
-  before do
-    issues.create!(id: 1, project_id: project.id)
-    issues.create!(id: 2, project_id: project.id)
-    issues.create!(id: 3, project_id: project.id)
-    issues.create!(id: 4, project_id: project.id)
-
-    designs.create!(id: 1, issue_id: 1, project_id: project.id, filename: 'design1.jpg')
-    designs.create!(id: 2, issue_id: 1, project_id: project.id, filename: 'design2.jpg')
-    designs.create!(id: 3, issue_id: 2, project_id: project.id, filename: 'design3.jpg')
-    designs.create!(id: 4, issue_id: 2, project_id: project.id, filename: 'design4.jpg')
-    designs.create!(id: 5, issue_id: 3, project_id: project.id, filename: 'design5.jpg')
-  end
-
-  describe '#perform' do
-    it 'backfills the position for the designs in each issue' do
-      expect(described_class::Design).to receive(:move_nulls_to_start).with(
-        a_collection_containing_exactly(
-          an_object_having_attributes(id: 1, issue_id: 1),
-          an_object_having_attributes(id: 2, issue_id: 1)
-        )
-      ).ordered.and_call_original
-
-      expect(described_class::Design).to receive(:move_nulls_to_start).with(
-        a_collection_containing_exactly(
-          an_object_having_attributes(id: 3, issue_id: 2),
-          an_object_having_attributes(id: 4, issue_id: 2)
-        )
-      ).ordered.and_call_original
-
-      # We only expect calls to `move_nulls_to_start` with issues 1 and 2:
-      # - Issue 3 should be skipped because we're not passing its ID
-      # - Issue 4 should be skipped because it doesn't have any designs
-      # - Issue 0 should be skipped because it doesn't exist
-      subject.perform([1, 2, 4, 0])
-
-      expect(designs.find(1).relative_position).to be < designs.find(2).relative_position
-      expect(designs.find(3).relative_position).to be < designs.find(4).relative_position
-      expect(designs.find(5).relative_position).to be_nil
-    end
-  end
-end
diff --git a/spec/lib/gitlab/usage_data_counters/track_unique_actions_spec.rb b/spec/lib/gitlab/usage_data_counters/track_unique_actions_spec.rb
index 6db77f19877..bd348666729 100644
--- a/spec/lib/gitlab/usage_data_counters/track_unique_actions_spec.rb
+++ b/spec/lib/gitlab/usage_data_counters/track_unique_actions_spec.rb
@@ -17,10 +17,9 @@ RSpec.describe Gitlab::UsageDataCounters::TrackUniqueActions, :clean_gitlab_redi
 
   context 'tracking an event' do
     context 'when tracking successfully' do
-      context 'when the feature flag and the application setting is enabled' do
+      context 'when the application setting is enabled' do
         context 'when the target and the action is valid' do
           before do
-            stub_feature_flags(described_class::FEATURE_FLAG => true)
             stub_application_setting(usage_ping_enabled: true)
           end
 
@@ -59,17 +58,15 @@ RSpec.describe Gitlab::UsageDataCounters::TrackUniqueActions, :clean_gitlab_redi
     context 'when tracking unsuccessfully' do
       using RSpec::Parameterized::TableSyntax
 
-      where(:feature_flag, :application_setting, :target, :action) do
-        true  | true  | Project         | :invalid_action
-        false | true  | Project         | :pushed
-        true  | false | Project         | :pushed
-        true  | true  | :invalid_target | :pushed
+      where(:application_setting, :target, :action) do
+        true  | Project         | :invalid_action
+        false | Project         | :pushed
+        true  | :invalid_target | :pushed
       end
 
       with_them do
         before do
           stub_application_setting(usage_ping_enabled: application_setting)
-          stub_feature_flags(described_class::FEATURE_FLAG => feature_flag)
         end
 
         it 'returns the expected values' do
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 2fb30b3228a..e3da0163e8d 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -912,45 +912,29 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
     let(:time) { Time.zone.now }
 
     before do
-      stub_feature_flags(Gitlab::UsageDataCounters::TrackUniqueActions::FEATURE_FLAG => feature_flag)
+      counter = Gitlab::UsageDataCounters::TrackUniqueActions
+      project = Event::TARGET_TYPES[:project]
+      wiki = Event::TARGET_TYPES[:wiki]
+      design = Event::TARGET_TYPES[:design]
+
+      counter.track_event(event_action: :pushed, event_target: project, author_id: 1)
+      counter.track_event(event_action: :pushed, event_target: project, author_id: 1)
+      counter.track_event(event_action: :pushed, event_target: project, author_id: 2)
+      counter.track_event(event_action: :pushed, event_target: project, author_id: 3)
+      counter.track_event(event_action: :pushed, event_target: project, author_id: 4, time: time - 3.days)
+      counter.track_event(event_action: :created, event_target: project, author_id: 5, time: time - 3.days)
+      counter.track_event(event_action: :created, event_target: wiki, author_id: 3)
+      counter.track_event(event_action: :created, event_target: design, author_id: 3)
     end
 
-    context 'when the feature flag is enabled' do
-      let(:feature_flag) { true }
-
-      before do
-        counter = Gitlab::UsageDataCounters::TrackUniqueActions
-        project = Event::TARGET_TYPES[:project]
-        wiki = Event::TARGET_TYPES[:wiki]
-        design = Event::TARGET_TYPES[:design]
-
-        counter.track_event(event_action: :pushed, event_target: project, author_id: 1)
-        counter.track_event(event_action: :pushed, event_target: project, author_id: 1)
-        counter.track_event(event_action: :pushed, event_target: project, author_id: 2)
-        counter.track_event(event_action: :pushed, event_target: project, author_id: 3)
-        counter.track_event(event_action: :pushed, event_target: project, author_id: 4, time: time - 3.days)
-        counter.track_event(event_action: :created, event_target: project, author_id: 5, time: time - 3.days)
-        counter.track_event(event_action: :created, event_target: wiki, author_id: 3)
-        counter.track_event(event_action: :created, event_target: design, author_id: 3)
-      end
-
-      it 'returns the distinct count of user actions within the specified time period' do
-        expect(described_class.action_monthly_active_users(time_period)).to eq(
-          {
-            action_monthly_active_users_design_management: 1,
-            action_monthly_active_users_project_repo: 3,
-            action_monthly_active_users_wiki_repo: 1
-          }
-        )
-      end
-    end
-
-    context 'when the feature flag is disabled' do
-      let(:feature_flag) { false }
-
-      it 'returns an empty hash' do
-        expect(described_class.action_monthly_active_users(time_period)).to eq({})
-      end
+    it 'returns the distinct count of user actions within the specified time period' do
+      expect(described_class.action_monthly_active_users(time_period)).to eq(
+        {
+          action_monthly_active_users_design_management: 1,
+          action_monthly_active_users_project_repo: 3,
+          action_monthly_active_users_wiki_repo: 1
+        }
+      )
     end
   end
 
diff --git a/spec/migrations/backfill_designs_relative_position_spec.rb b/spec/migrations/backfill_designs_relative_position_spec.rb
deleted file mode 100644
index 878d3385bb3..00000000000
--- a/spec/migrations/backfill_designs_relative_position_spec.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-require Rails.root.join('db', 'post_migrate', '20200724130639_backfill_designs_relative_position.rb')
-
-RSpec.describe BackfillDesignsRelativePosition do
-  let(:namespace) { table(:namespaces).create!(name: 'gitlab', path: 'gitlab') }
-  let(:project) { table(:projects).create!(namespace_id: namespace.id) }
-  let(:issues) { table(:issues) }
-  let(:designs) { table(:design_management_designs) }
-
-  before do
-    issues.create!(id: 1, project_id: project.id)
-    issues.create!(id: 2, project_id: project.id)
-    issues.create!(id: 3, project_id: project.id)
-    issues.create!(id: 4, project_id: project.id)
-
-    designs.create!(issue_id: 1, project_id: project.id, filename: 'design1.jpg')
-    designs.create!(issue_id: 2, project_id: project.id, filename: 'design2.jpg')
-    designs.create!(issue_id: 4, project_id: project.id, filename: 'design3.jpg')
-
-    stub_const("#{described_class.name}::BATCH_SIZE", 2)
-  end
-
-  it 'correctly schedules background migrations' do
-    Sidekiq::Testing.fake! do
-      Timecop.freeze do
-        migrate!
-
-        expect(described_class::MIGRATION)
-          .to be_scheduled_delayed_migration(2.minutes, [1, 2])
-
-        expect(described_class::MIGRATION)
-          .to be_scheduled_delayed_migration(4.minutes, [4])
-
-        # Issue 3 should be skipped because it doesn't have any designs
-        expect(BackgroundMigrationWorker.jobs.size).to eq(2)
-      end
-    end
-  end
-end
diff --git a/spec/models/design_management/design_collection_spec.rb b/spec/models/design_management/design_collection_spec.rb
index a48dc457c38..de766d5ce09 100644
--- a/spec/models/design_management/design_collection_spec.rb
+++ b/spec/models/design_management/design_collection_spec.rb
@@ -37,9 +37,11 @@ RSpec.describe DesignManagement::DesignCollection do
 
     it 'inserts the design after any existing designs' do
       design1 = collection.find_or_create_design!(filename: 'design1.jpg')
+      design1.update!(relative_position: 100)
+
       design2 = collection.find_or_create_design!(filename: 'design2.jpg')
 
-      expect(design1.relative_position).to be < design2.relative_position
+      expect(collection.designs.ordered(issue.project)).to eq([design1, design2])
     end
   end
 
diff --git a/spec/presenters/packages/detail/package_presenter_spec.rb b/spec/presenters/packages/detail/package_presenter_spec.rb
index a29942c3dac..3a13aca6c7a 100644
--- a/spec/presenters/packages/detail/package_presenter_spec.rb
+++ b/spec/presenters/packages/detail/package_presenter_spec.rb
@@ -74,6 +74,15 @@ RSpec.describe ::Packages::Detail::PackagePresenter do
       end
     end
 
+    context 'with conan metadata' do
+      let(:package) { create(:conan_package, project: project) }
+      let(:expected_package_details) { super().merge(conan_metadatum: package.conan_metadatum) }
+
+      it 'returns conan_metadatum' do
+        expect(presenter.detail_view).to eq expected_package_details
+      end
+    end
+
     context 'with composer metadata' do
       let(:package) { create(:composer_package, :with_metadatum, sha: '123', project: project) }
       let(:expected_package_details) { super().merge(composer_metadatum: package.composer_metadatum) }
diff --git a/spec/services/event_create_service_spec.rb b/spec/services/event_create_service_spec.rb
index edd585cb4b6..a91519a710f 100644
--- a/spec/services/event_create_service_spec.rb
+++ b/spec/services/event_create_service_spec.rb
@@ -202,7 +202,6 @@ RSpec.describe EventCreateService do
       end
 
       it 'records the event in the event counter' do
-        stub_feature_flags(Gitlab::UsageDataCounters::TrackUniqueActions::FEATURE_FLAG => true)
         counter_class = Gitlab::UsageDataCounters::TrackUniqueActions
         tracking_params = { event_action: counter_class::WIKI_ACTION, date_from: Date.yesterday, date_to: Date.today }
 
@@ -244,7 +243,6 @@ RSpec.describe EventCreateService do
     it_behaves_like 'service for creating a push event', PushEventPayloadService
 
     it 'records the event in the event counter' do
-      stub_feature_flags(Gitlab::UsageDataCounters::TrackUniqueActions::FEATURE_FLAG => true)
       counter_class = Gitlab::UsageDataCounters::TrackUniqueActions
       tracking_params = { event_action: counter_class::PUSH_ACTION, date_from: Date.yesterday, date_to: Date.today }
 
@@ -268,7 +266,6 @@ RSpec.describe EventCreateService do
     it_behaves_like 'service for creating a push event', BulkPushEventPayloadService
 
     it 'records the event in the event counter' do
-      stub_feature_flags(Gitlab::UsageDataCounters::TrackUniqueActions::FEATURE_FLAG => true)
       counter_class = Gitlab::UsageDataCounters::TrackUniqueActions
       tracking_params = { event_action: counter_class::PUSH_ACTION, date_from: Date.yesterday, date_to: Date.today }
 
@@ -323,7 +320,6 @@ RSpec.describe EventCreateService do
       end
 
       it 'records the event in the event counter' do
-        stub_feature_flags(Gitlab::UsageDataCounters::TrackUniqueActions::FEATURE_FLAG => true)
         counter_class = Gitlab::UsageDataCounters::TrackUniqueActions
         tracking_params = { event_action: counter_class::DESIGN_ACTION, date_from: Date.yesterday, date_to: Date.today }
 
@@ -351,7 +347,6 @@ RSpec.describe EventCreateService do
       end
 
       it 'records the event in the event counter' do
-        stub_feature_flags(Gitlab::UsageDataCounters::TrackUniqueActions::FEATURE_FLAG => true)
         counter_class = Gitlab::UsageDataCounters::TrackUniqueActions
         tracking_params = { event_action: counter_class::DESIGN_ACTION, date_from: Date.yesterday, date_to: Date.today }
 
diff --git a/spec/services/jira_import/cloud_users_mapper_service_spec.rb b/spec/services/jira_import/cloud_users_mapper_service_spec.rb
new file mode 100644
index 00000000000..591f80f3efc
--- /dev/null
+++ b/spec/services/jira_import/cloud_users_mapper_service_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe JiraImport::CloudUsersMapperService do
+  let(:start_at) { 7 }
+  let(:url) { "/rest/api/2/users?maxResults=50&startAt=#{start_at}" }
+  let(:jira_users) do
+    [
+      { 'accountId' => 'abcd', 'displayName' => 'user1' },
+      { 'accountId' => 'efg' },
+      { 'accountId' => 'hij', 'displayName' => 'user3', 'emailAddress' => 'user3@example.com' }
+    ]
+  end
+
+  describe '#execute' do
+    it_behaves_like 'mapping jira users'
+  end
+end
diff --git a/spec/services/jira_import/server_users_mapper_service_spec.rb b/spec/services/jira_import/server_users_mapper_service_spec.rb
new file mode 100644
index 00000000000..22cb0327cc5
--- /dev/null
+++ b/spec/services/jira_import/server_users_mapper_service_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe JiraImport::ServerUsersMapperService do
+  let(:start_at) { 7 }
+  let(:url) { "/rest/api/2/user/search?username=''&maxResults=50&startAt=#{start_at}" }
+  let(:jira_users) do
+    [
+      { 'key' => 'abcd', 'name' => 'user1' },
+      { 'key' => 'efg' },
+      { 'key' => 'hij', 'name' => 'user3', 'emailAddress' => 'user3@example.com' }
+    ]
+  end
+
+  describe '#execute' do
+    it_behaves_like 'mapping jira users'
+  end
+end
diff --git a/spec/services/jira_import/users_importer_spec.rb b/spec/services/jira_import/users_importer_spec.rb
index 64cdc70f612..efb303dab9f 100644
--- a/spec/services/jira_import/users_importer_spec.rb
+++ b/spec/services/jira_import/users_importer_spec.rb
@@ -14,6 +14,27 @@ RSpec.describe JiraImport::UsersImporter do
   subject { importer.execute }
 
   describe '#execute' do
+    let(:mapped_users) do
+      [
+        {
+          jira_account_id: 'acc1',
+          jira_display_name: 'user1',
+          jira_email: 'sample@jira.com',
+          gitlab_id: nil,
+          gitlab_username: nil,
+          gitlab_name: nil
+        },
+        {
+          jira_account_id: 'acc2',
+          jira_display_name: 'user2',
+          jira_email: nil,
+          gitlab_id: nil,
+          gitlab_username: nil,
+          gitlab_name: nil
+        }
+      ]
+    end
+
     before do
       stub_jira_service_test
       project.add_maintainer(user)
@@ -25,53 +46,83 @@ RSpec.describe JiraImport::UsersImporter do
       end
     end
 
-    context 'when Jira import is configured correctly' do
-      let_it_be(:jira_service) { create(:jira_service, project: project, active: true) }
-      let(:client) { double }
+    RSpec.shared_examples 'maps jira users to gitlab users' do
+      context 'when Jira import is configured correctly' do
+        let_it_be(:jira_service) { create(:jira_service, project: project, active: true) }
+        let(:client) { double }
 
-      before do
-        expect(importer).to receive(:client).and_return(client)
-      end
-
-      context 'when jira client raises an error' do
-        it 'returns an error response' do
-          expect(client).to receive(:get).and_raise(Timeout::Error)
-
-          expect(subject.error?).to be_truthy
-          expect(subject.message).to include('There was an error when communicating to Jira')
-        end
-      end
-
-      context 'when jira client returns result' do
         before do
-          allow(client).to receive(:get).with('/rest/api/2/users?maxResults=50&startAt=7')
-            .and_return(jira_users)
+          expect(importer).to receive(:client).at_least(1).and_return(client)
+          allow(client).to receive_message_chain(:ServerInfo, :all, :deploymentType).and_return(deployment_type)
         end
 
-        context 'when jira client returns an empty array' do
-          let(:jira_users) { [] }
+        context 'when jira client raises an error' do
+          it 'returns an error response' do
+            expect(client).to receive(:get).and_raise(Timeout::Error)
 
-          it 'retturns nil payload' do
-            expect(subject.success?).to be_truthy
-            expect(subject.payload).to be_nil
+            expect(subject.error?).to be_truthy
+            expect(subject.message).to include('There was an error when communicating to Jira')
           end
         end
 
-        context 'when jira client returns an results' do
-          let(:jira_users)   { [{ 'name' => 'user1' }, { 'name' => 'user2' }] }
-          let(:mapped_users) { [{ jira_display_name: 'user1', gitlab_id: 5 }] }
+        context 'when jira client returns result' do
+          context 'when jira client returns an empty array' do
+            let(:jira_users) { [] }
 
-          before do
-            expect(JiraImport::UsersMapper).to receive(:new).with(project, jira_users)
-            .and_return(double(execute: mapped_users))
+            it 'retturns nil payload' do
+              expect(subject.success?).to be_truthy
+              expect(subject.payload).to be_empty
+            end
           end
 
-          it 'returns the mapped users' do
-            expect(subject.success?).to be_truthy
-            expect(subject.payload).to eq(mapped_users)
+          context 'when jira client returns an results' do
+            it 'returns the mapped users' do
+              expect(subject.success?).to be_truthy
+              expect(subject.payload).to eq(mapped_users)
+            end
           end
         end
       end
     end
+
+    context 'when Jira instance is of Server deployment type' do
+      let(:deployment_type) { 'Server' }
+      let(:url) { "/rest/api/2/user/search?username=''&maxResults=50&startAt=#{start_at}" }
+      let(:jira_users) do
+        [
+          { 'key' => 'acc1', 'name' => 'user1', 'emailAddress' => 'sample@jira.com' },
+          { 'key' => 'acc2', 'name' => 'user2' }
+        ]
+      end
+
+      before do
+        allow_next_instance_of(JiraImport::ServerUsersMapperService) do |instance|
+          allow(instance).to receive(:client).and_return(client)
+          allow(client).to receive(:get).with(url).and_return(jira_users)
+        end
+      end
+
+      it_behaves_like 'maps jira users to gitlab users'
+    end
+
+    context 'when Jira instance is of Cloud deploymet type' do
+      let(:deployment_type) { 'Cloud' }
+      let(:url) { "/rest/api/2/users?maxResults=50&startAt=#{start_at}" }
+      let(:jira_users) do
+        [
+          { 'accountId' => 'acc1', 'displayName' => 'user1', 'emailAddress' => 'sample@jira.com' },
+          { 'accountId' => 'acc2', 'displayName' => 'user2' }
+        ]
+      end
+
+      before do
+        allow_next_instance_of(JiraImport::CloudUsersMapperService) do |instance|
+          allow(instance).to receive(:client).and_return(client)
+          allow(client).to receive(:get).with(url).and_return(jira_users)
+        end
+      end
+
+      it_behaves_like 'maps jira users to gitlab users'
+    end
   end
 end
diff --git a/spec/services/jira_import/users_mapper_spec.rb b/spec/services/jira_import/users_mapper_spec.rb
deleted file mode 100644
index e5e8279a6fb..00000000000
--- a/spec/services/jira_import/users_mapper_spec.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe JiraImport::UsersMapper do
-  let_it_be(:project) { create(:project) }
-
-  subject { described_class.new(project, jira_users).execute }
-
-  describe '#execute' do
-    context 'jira_users is nil' do
-      let(:jira_users) { nil }
-
-      it 'returns an empty array' do
-        expect(subject).to be_empty
-      end
-    end
-
-    context 'when jira_users is present' do
-      let(:jira_users) do
-        [
-          { 'accountId' => 'abcd', 'displayName' => 'user1' },
-          { 'accountId' => 'efg' },
-          { 'accountId' => 'hij', 'displayName' => 'user3', 'emailAddress' => 'user3@example.com' }
-        ]
-      end
-
-      # TODO: now we only create an array in a proper format
-      # mapping is tracked in https://gitlab.com/gitlab-org/gitlab/-/issues/219023
-      let(:mapped_users) do
-        [
-          { jira_account_id: 'abcd', jira_display_name: 'user1', jira_email: nil, gitlab_id: nil, gitlab_username: nil, gitlab_name: nil },
-          { jira_account_id: 'efg', jira_display_name: nil, jira_email: nil, gitlab_id: nil, gitlab_username: nil, gitlab_name: nil },
-          { jira_account_id: 'hij', jira_display_name: 'user3', jira_email: 'user3@example.com', gitlab_id: nil, gitlab_username: nil, gitlab_name: nil }
-        ]
-      end
-
-      it 'returns users mapped to Gitlab' do
-        expect(subject).to eq(mapped_users)
-      end
-    end
-  end
-end
diff --git a/spec/support/shared_examples/services/jira_import/user_mapper_services_shared_examples.rb b/spec/support/shared_examples/services/jira_import/user_mapper_services_shared_examples.rb
new file mode 100644
index 00000000000..7fc7ff8a8de
--- /dev/null
+++ b/spec/support/shared_examples/services/jira_import/user_mapper_services_shared_examples.rb
@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'mapping jira users' do
+  let(:client) { double }
+
+  let_it_be(:project) { create(:project) }
+  let_it_be(:jira_service) { create(:jira_service, project: project, active: true) }
+
+  before do
+    allow(subject).to receive(:client).and_return(client)
+    allow(client).to receive(:get).with(url).and_return(jira_users)
+  end
+
+  subject { described_class.new(jira_service, start_at) }
+
+  context 'jira_users is nil' do
+    let(:jira_users) { nil }
+
+    it 'returns an empty array' do
+      expect(subject.execute).to be_empty
+    end
+  end
+
+  context 'when jira_users is present' do
+    # TODO: now we only create an array in a proper format
+    # mapping is tracked in https://gitlab.com/gitlab-org/gitlab/-/issues/219023
+    let(:mapped_users) do
+      [
+        { jira_account_id: 'abcd', jira_display_name: 'user1', jira_email: nil, gitlab_id: nil, gitlab_username: nil, gitlab_name: nil },
+        { jira_account_id: 'efg', jira_display_name: nil, jira_email: nil, gitlab_id: nil, gitlab_username: nil, gitlab_name: nil },
+        { jira_account_id: 'hij', jira_display_name: 'user3', jira_email: 'user3@example.com', gitlab_id: nil, gitlab_username: nil, gitlab_name: nil }
+      ]
+    end
+
+    it 'returns users mapped to Gitlab' do
+      expect(subject.execute).to eq(mapped_users)
+    end
+  end
+end
diff --git a/yarn.lock b/yarn.lock
index c05f247332a..1e928bc3c57 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -848,22 +848,22 @@
   resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.158.0.tgz#300d416184a2b0e05f15a96547f726e1825b08a1"
   integrity sha512-5OJl+7TsXN9PJhY6/uwi+mTwmDZa9n/6119rf77orQ/joFYUypaYhBmy/1TcKVPsy5Zs6KCxE1kmGsfoXc1TYA==
 
-"@gitlab/ui@18.7.0":
-  version "18.7.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-18.7.0.tgz#aee0054d50e50aaf9e7c4ea4b9e36ca4b97102bf"
-  integrity sha512-y1Gix1aCHvVO+zh6TCDmsCr97nLLHFnfEZRtg69EBnLBCLgwBcucC3mNeR4Q2EHTWjy/5U035UkyW6LDRX05mA==
+"@gitlab/ui@20.1.1":
+  version "20.1.1"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-20.1.1.tgz#990ce3a0883af5c62b0f56be1e0b244b918a9159"
+  integrity sha512-xtWdvzC33p8i76afHtnQKuUN7fGWV89uIKfIf9/WyygXZqUFKbSW076m/9iLRxHaCYNW7ucJe3fbEW+iAgWcuA==
   dependencies:
     "@babel/standalone" "^7.0.0"
     "@gitlab/vue-toasted" "^1.3.0"
     bootstrap-vue "2.13.1"
     copy-to-clipboard "^3.0.8"
+    dompurify "^2.0.12"
     echarts "^4.2.1"
     highlight.js "^9.13.1"
     js-beautify "^1.8.8"
     lodash "^4.17.14"
     portal-vue "^2.1.6"
     resize-observer-polyfill "^1.5.1"
-    sanitize-html "^1.22.0"
     url-search-params-polyfill "^5.0.0"
     vue-runtime-helpers "^1.1.2"
 
@@ -4094,7 +4094,7 @@ dom-serialize@^2.2.0:
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dom-serializer@0, dom-serializer@^0.2.1:
+dom-serializer@0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
   integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
@@ -4143,17 +4143,10 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domhandler@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz#51cd13efca31da95bbb0c5bee3a48300e333b3e9"
-  integrity sha512-eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw==
-  dependencies:
-    domelementtype "^2.0.1"
-
-dompurify@^2.0.11:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.11.tgz#cd47935774230c5e478b183a572e726300b3891d"
-  integrity sha512-qVoGPjIW9IqxRij7klDQQ2j6nSe4UNWANBhZNLnsS7ScTtLb+3YdxkRY8brNTpkUiTtcXsCJO+jS0UCDfenLuA==
+dompurify@^2.0.11, dompurify@^2.0.12:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.0.12.tgz#284a2b041e1c60b8e72d7b4d2fadad36141254ae"
+  integrity sha512-Fl8KseK1imyhErHypFPA8qpq9gPzlsJ/EukA6yk9o0gX23p1TzC+rh9LqNg1qvErRTc0UNMYlKxEGSfSh43NDg==
 
 domutils@^1.5.1:
   version "1.6.2"
@@ -4163,15 +4156,6 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz#15b8278e37bfa8468d157478c58c367718133c08"
-  integrity sha512-n5SelJ1axbO636c2yUtOGia/IcJtVtlhQbFiVDBZHKV5ReJO1ViX7sFEemtuyoAnBxk5meNSYgA8V4s0271efg==
-  dependencies:
-    dom-serializer "^0.2.1"
-    domelementtype "^2.0.1"
-    domhandler "^3.0.0"
-
 dot-prop@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
@@ -5843,16 +5827,6 @@ htmlparser2@^3.10.0:
     inherits "^2.0.1"
     readable-stream "^3.0.6"
 
-htmlparser2@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz#9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"
-  integrity sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^3.0.0"
-    domutils "^2.0.0"
-    entities "^2.0.0"
-
 http-cache-semantics@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
@@ -7646,11 +7620,6 @@ lodash.differencewith@~4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.differencewith/-/lodash.differencewith-4.5.0.tgz#bafafbc918b55154e179176a00bb0aefaac854b7"
   integrity sha1-uvr7yRi1UVTheRdqALsK76rIVLc=
 
-lodash.escaperegexp@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
-  integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
-
 lodash.find@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.find/-/lodash.find-4.6.0.tgz#cb0704d47ab71789ffa0de8b97dd926fb88b13b1"
@@ -7706,11 +7675,6 @@ lodash.isplainobject@^4.0.6:
   resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
   integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
 
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-  integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
-
 lodash.kebabcase@4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
@@ -7731,11 +7695,6 @@ lodash.mapvalues@^4.6.0:
   resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
   integrity sha1-G6+lAF3p3W9PJmaMMMo3IwzJaJw=
 
-lodash.mergewith@^4.6.1:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55"
-  integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==
-
 lodash.pick@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
@@ -9500,7 +9459,7 @@ postcss-value-parser@^4.0.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz#99a983d365f7b2ad8d0f9b8c3094926eab4b936d"
   integrity sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==
 
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
   version "7.0.30"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.30.tgz#cc9378beffe46a02cbc4506a0477d05fcea9a8e2"
   integrity sha512-nu/0m+NtIzoubO+xdAlwZl/u5S5vi/y6BCsoL8D+8IxsD3XvBS8X4YEADNIVXKVuQvduiucnRv+vPIqj56EGMQ==
@@ -10453,22 +10412,6 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sanitize-html@^1.22.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.0.tgz#9df779c53cf5755adb2322943c21c1c1dffca7bf"
-  integrity sha512-3RPo65mbTKpOAdAYWU496MSty1YbB3Y5bjwL5OclgaSSMtv65xvM7RW/EHRumzaZ1UddEJowCbSdK0xl5sAu0A==
-  dependencies:
-    chalk "^2.4.1"
-    htmlparser2 "^4.1.0"
-    lodash.clonedeep "^4.5.0"
-    lodash.escaperegexp "^4.1.2"
-    lodash.isplainobject "^4.0.6"
-    lodash.isstring "^4.0.1"
-    lodash.mergewith "^4.6.1"
-    postcss "^7.0.27"
-    srcset "^2.0.1"
-    xtend "^4.0.1"
-
 sass-graph@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
@@ -10968,11 +10911,6 @@ sql.js@^0.4.0:
   resolved "https://registry.yarnpkg.com/sql.js/-/sql.js-0.4.0.tgz#23be9635520eb0ff43a741e7e830397266e88445"
   integrity sha1-I76WNVIOsP9Dp0Hn6DA5cmbohEU=
 
-srcset@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz#8f842d357487eb797f413d9c309de7a5149df5ac"
-  integrity sha512-00kZI87TdRKwt+P8jj8UZxbfp7mK2ufxcIMWvhAOZNJTRROimpHeruWrGvCZneiuVDLqdyHefVp748ECTnyUBQ==
-
 sshpk@^1.7.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.15.2.tgz#c946d6bd9b1a39d0e8635763f5242d6ed6dcb629"