Automatic merge of gitlab-org/gitlab master

app/assets/javascripts/vue_shared/components/issuable/init_issuable_header_warning.js → app/assets/javascripts/issuable/init_issuable_header_warning.js

 import Vue from 'vue';
 import { parseBoolean } from '~/lib/utils/common_utils';
-import IssuableHeaderWarnings from './issuable_header_warnings.vue';
+import IssuableHeaderWarnings from './components/issuable_header_warnings.vue';
 
 export default function issuableHeaderWarnings(store) {
   const el = document.getElementById('js-issuable-header-warnings');

app/assets/javascripts/issue_show/components/description.vue → app/assets/javascripts/issues/show/components/description.vue

@@ -3,7 +3,7 @@ import { GlSafeHtmlDirective as SafeHtml } from '@gitlab/ui';
 import $ from 'jquery';
 import createFlash from '~/flash';
 import { __, sprintf } from '~/locale';
-import TaskList from '../../task_list';
+import TaskList from '~/task_list';
 import animateMixin from '../mixins/animate';
 
 export default {

app/assets/javascripts/issue_show/components/edited.vue → app/assets/javascripts/issues/show/components/edited.vue

 <script>
 /* eslint-disable @gitlab/vue-require-i18n-strings */
-import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
+import timeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
 
 export default {
   components: {

app/assets/javascripts/issue_show/components/fields/description_template.vue → app/assets/javascripts/issues/show/components/fields/description_template.vue

 <script>
 import { GlIcon } from '@gitlab/ui';
 import $ from 'jquery';
-import IssuableTemplateSelectors from '../../../templates/issuable_template_selectors';
+import IssuableTemplateSelectors from '~/templates/issuable_template_selectors';
 
 export default {
   components: {

app/assets/javascripts/issue_show/components/form.vue → app/assets/javascripts/issues/show/components/form.vue

@@ -2,7 +2,7 @@
 import { GlAlert } from '@gitlab/ui';
 import $ from 'jquery';
 import Autosave from '~/autosave';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import eventHub from '../event_hub';
 import EditActions from './edit_actions.vue';
 import DescriptionField from './fields/description.vue';

app/assets/javascripts/issue_show/components/header_actions.vue → app/assets/javascripts/issues/show/components/header_actions.vue

@@ -4,7 +4,7 @@ import { mapActions, mapGetters, mapState } from 'vuex';
 import createFlash, { FLASH_TYPES } from '~/flash';
 import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants';
 import { IssuableType } from '~/issuable_show/constants';
-import { IssuableStatus, IssueStateEvent } from '~/issue_show/constants';
+import { IssuableStatus, IssueStateEvent } from '~/issues/show/constants';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
 import { visitUrl } from '~/lib/utils/url_utility';
 import { s__, __, sprintf } from '~/locale';

app/assets/javascripts/issue_show/services/index.js → app/assets/javascripts/issues/show/services/index.js

-import axios from '../../lib/utils/axios_utils';
+import axios from '~/lib/utils/axios_utils';
 
 export default class Service {
   constructor(endpoint) {

app/assets/javascripts/notes/components/sidebar_subscription.vue

 <script>
 import { mapActions } from 'vuex';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { fetchPolicies } from '~/lib/graphql';
 import { confidentialityQueries } from '~/sidebar/constants';
 import { defaultClient as gqlClient } from '~/sidebar/graphql';

app/assets/javascripts/pages/projects/issues/show.js

@@ -3,14 +3,14 @@ import ShortcutsIssuable from '~/behaviors/shortcuts/shortcuts_issuable';
 import initIssuableSidebar from '~/init_issuable_sidebar';
 import { IssuableType } from '~/issuable_show/constants';
 import Issue from '~/issue';
-import { initIncidentApp, initIncidentHeaderActions } from '~/issue_show/incident';
-import { initIssuableApp, initIssueHeaderActions } from '~/issue_show/issue';
-import { parseIssuableData } from '~/issue_show/utils/parse_data';
+import { initIncidentApp, initIncidentHeaderActions } from '~/issues/show/incident';
+import { initIssuableApp, initIssueHeaderActions } from '~/issues/show/issue';
+import { parseIssuableData } from '~/issues/show/utils/parse_data';
 import initNotesApp from '~/notes';
 import { store } from '~/notes/stores';
 import initRelatedMergeRequestsApp from '~/related_merge_requests';
 import initSentryErrorStackTraceApp from '~/sentry_error_stack_trace';
-import initIssuableHeaderWarning from '~/vue_shared/components/issuable/init_issuable_header_warning';
+import initIssuableHeaderWarning from '~/issuable/init_issuable_header_warning';
 import ZenMode from '~/zen_mode';
 
 export default function initShowIssue() {

app/assets/javascripts/pages/projects/merge_requests/show/index.js

@@ -2,7 +2,7 @@ import { initReviewBar } from '~/batch_comments';
 import initMrNotes from '~/mr_notes';
 import store from '~/mr_notes/stores';
 import initSidebarBundle from '~/sidebar/sidebar_bundle';
-import initIssuableHeaderWarning from '~/vue_shared/components/issuable/init_issuable_header_warning';
+import initIssuableHeaderWarning from '~/issuable/init_issuable_header_warning';
 import initShow from '../init_merge_request_show';
 
 initMrNotes();

app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue

@@ -3,7 +3,7 @@ import { GlLink, GlLoadingIcon, GlIcon } from '@gitlab/ui';
 import { mapState, mapActions } from 'vuex';
 import { sprintf, __, n__ } from '~/locale';
 import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue';
-import { parseIssuableData } from '../../issue_show/utils/parse_data';
+import { parseIssuableData } from '~/issues/show/utils/parse_data';
 
 export default {
   name: 'RelatedMergeRequests',

app/assets/javascripts/sidebar/components/assignees/assignees_realtime.vue

 <script>
 import produce from 'immer';
 import { convertToGraphQLId, getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { assigneesQueries } from '~/sidebar/constants';
 
 export default {

app/assets/javascripts/sidebar/components/assignees/sidebar_assignees_widget.vue

@@ -3,7 +3,7 @@ import { GlDropdownItem } from '@gitlab/ui';
 import { cloneDeep } from 'lodash';
 import Vue from 'vue';
 import createFlash from '~/flash';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { __, n__ } from '~/locale';
 import SidebarAssigneesRealtime from '~/sidebar/components/assignees/assignees_realtime.vue';
 import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees.vue';

app/assets/javascripts/sidebar/components/assignees/uncollapsed_assignee_list.vue

 <script>
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { __, sprintf } from '~/locale';
 import AttentionRequestedToggle from '../attention_requested_toggle.vue';
 import AssigneeAvatarLink from './assignee_avatar_link.vue';

app/assets/javascripts/sidebar/components/confidential/sidebar_confidentiality_form.vue

 <script>
 import { GlSprintf, GlButton } from '@gitlab/ui';
 import createFlash from '~/flash';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { __, sprintf } from '~/locale';
 import { confidentialityQueries } from '~/sidebar/constants';
 

app/assets/javascripts/sidebar/components/date/sidebar_date_widget.vue

 <script>
 import { GlIcon, GlDatepicker, GlTooltipDirective, GlLink, GlPopover } from '@gitlab/ui';
 import createFlash from '~/flash';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { dateInWords, formatDate, parsePikadayDate } from '~/lib/utils/datetime_utility';
 import { __, sprintf } from '~/locale';
 import SidebarEditableItem from '~/sidebar/components/sidebar_editable_item.vue';

app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue

@@ -12,7 +12,7 @@ import {
 } from '@gitlab/ui';
 import createFlash from '~/flash';
 import { getIdFromGraphQLId } from '~/graphql_shared/utils';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { timeFor } from '~/lib/utils/datetime_utility';
 import { __ } from '~/locale';
 import SidebarEditableItem from '~/sidebar/components/sidebar_editable_item.vue';

app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions_widget.vue

 <script>
 import { GlIcon, GlLoadingIcon, GlToggle, GlTooltipDirective } from '@gitlab/ui';
 import createFlash from '~/flash';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { isLoggedIn } from '~/lib/utils/common_utils';
 import { __, sprintf } from '~/locale';
 import SidebarEditableItem from '~/sidebar/components/sidebar_editable_item.vue';

app/assets/javascripts/sidebar/components/time_tracking/time_tracker.vue

 <script>
 import { GlIcon, GlLink, GlModal, GlModalDirective, GlLoadingIcon } from '@gitlab/ui';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { s__, __ } from '~/locale';
 import { timeTrackingQueries } from '~/sidebar/constants';
 

app/assets/javascripts/sidebar/constants.js

 import { s__, sprintf } from '~/locale';
 import updateIssueLabelsMutation from '~/boards/graphql/issue_set_labels.mutation.graphql';
-import { IssuableType, WorkspaceType } from '~/issue_show/constants';
+import { IssuableType, WorkspaceType } from '~/issues/show/constants';
 import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
 import epicConfidentialQuery from '~/sidebar/queries/epic_confidential.query.graphql';
 import epicDueDateQuery from '~/sidebar/queries/epic_due_date.query.graphql';

app/assets/javascripts/sidebar/graphql.js

 import { IntrospectionFragmentMatcher } from 'apollo-cache-inmemory';
 import produce from 'immer';
 import VueApollo from 'vue-apollo';
-import getIssueStateQuery from '~/issue_show/queries/get_issue_state.query.graphql';
+import getIssueStateQuery from '~/issues/show/queries/get_issue_state.query.graphql';
 import createDefaultClient from '~/lib/graphql';
 import introspectionQueryResultData from './fragmentTypes.json';
 

app/assets/javascripts/sidebar/mount_milestone_sidebar.js

 import Vue from 'vue';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import timeTracker from './components/time_tracking/time_tracker.vue';
 

app/assets/javascripts/sidebar/mount_sidebar.js

@@ -5,7 +5,7 @@ import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
 import initInviteMembersModal from '~/invite_members/init_invite_members_modal';
 import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import {
   isInIssuePage,
   isInDesignPage,

app/assets/javascripts/vue_shared/components/sidebar/labels_select_widget/labels_select_root.vue

@@ -2,7 +2,7 @@
 import { debounce } from 'lodash';
 import { MutationOperationMode, getIdFromGraphQLId } from '~/graphql_shared/utils';
 import createFlash from '~/flash';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { __ } from '~/locale';
 import SidebarEditableItem from '~/sidebar/components/sidebar_editable_item.vue';
 import { issuableLabelsQueries } from '~/sidebar/constants';

app/mailers/emails/in_product_marketing.rb

@@ -29,7 +29,7 @@ module Emails
         format.html do
           @message.format = :html
 
-          render layout: nil
+          render layout: 'in_product_marketing_mailer'
         end
 
         format.text do

app/models/ci/pipeline.rb

@@ -82,8 +82,6 @@ module Ci
     # Merge requests for which the current pipeline is running against
     # the merge request's latest commit.
     has_many :merge_requests_as_head_pipeline, foreign_key: "head_pipeline_id", class_name: 'MergeRequest'
-    has_many :package_build_infos, class_name: 'Packages::BuildInfo', dependent: :nullify, inverse_of: :pipeline # rubocop:disable Cop/ActiveRecordDependent
-    has_many :package_file_build_infos, class_name: 'Packages::PackageFileBuildInfo', dependent: :nullify, inverse_of: :pipeline # rubocop:disable Cop/ActiveRecordDependent
     has_many :pending_builds, -> { pending }, foreign_key: :commit_id, class_name: 'Ci::Build', inverse_of: :pipeline
     has_many :failed_builds, -> { latest.failed }, foreign_key: :commit_id, class_name: 'Ci::Build', inverse_of: :pipeline
     has_many :retryable_builds, -> { latest.failed_or_canceled.includes(:project) }, foreign_key: :commit_id, class_name: 'Ci::Build', inverse_of: :pipeline

app/models/merge_request.rb

@@ -506,12 +506,12 @@ class MergeRequest < ApplicationRecord
   def self.reference_pattern
     @reference_pattern ||= %r{
       (#{Project.reference_pattern})?
-      #{Regexp.escape(reference_prefix)}(?<merge_request>\d+)(?<format>\+)?
+      #{Regexp.escape(reference_prefix)}#{Gitlab::Regex.merge_request}
     }x
   end
 
   def self.link_reference_pattern
-    @link_reference_pattern ||= super("merge_requests", /(?<merge_request>\d+)/)
+    @link_reference_pattern ||= super("merge_requests", Gitlab::Regex.merge_request)
   end
 
   def self.reference_valid?(reference)

app/views/layouts/in_product_marketing_mailer.html.haml

+!!!
+%html{ lang: "en" }
+  %head
+    %meta{ content: "text/html; charset=utf-8", "http-equiv" => "Content-Type" }
+    %meta{ content: "width=device-width, initial-scale=1", name: "viewport" }
+    %link{ href: "https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600", rel: "stylesheet", type: "text/css", data: { premailer: 'ignore' } }
+    %title= message.subject
+    :css
+      /* CLIENT-SPECIFIC STYLES */
+      body,
+      table,
+      td,
+      a {
+        -webkit-text-size-adjust: 100%;
+        -ms-text-size-adjust: 100%;
+      }
+
+      table,
+      td {
+        mso-table-lspace: 0pt;
+        mso-table-rspace: 0pt;
+      }
+
+      img {
+        -ms-interpolation-mode: bicubic;
+      }
+
+      /* RESET STYLES */
+      img {
+        border: 0;
+        height: auto;
+        line-height: 100%;
+        outline: none;
+        text-decoration: none;
+      }
+
+      table {
+        border-collapse: collapse !important;
+      }
+
+      body {
+        height: 100% !important;
+        margin: 0 !important;
+        padding: 0 !important;
+        width: 100% !important;
+        background-color: #ffffff;
+        color: #424242;
+      }
+
+      a {
+        color: #6b4fbb;
+        text-decoration: underline;
+      }
+
+      .cta_link a {
+        font-size: 24px;
+        font-family: 'Source Sans Pro', helvetica, arial, sans-serif;
+        color: #ffffff;
+        text-decoration: none;
+        border-radius: 5px;
+        -webkit-border-radius: 5px;
+        background-color: #6e49cb;
+        border-top: 15px solid #6e49cb;
+        border-bottom: 15px solid #6e49cb;
+        border-right: 40px solid #6e49cb;
+        border-left: 40px solid #6e49cb;
+        display: inline-block;
+      }
+
+      .footernav {
+        display: inline !important;
+      }
+
+      .footernav a {
+        color: #6e49cb;
+      }
+
+      .address {
+        margin: 0;
+        font-size: 16px;
+        line-height: 26px;
+      }
+
+    :css
+      /* iOS BLUE LINKS */
+      a[x-apple-data-detectors] {
+      color: inherit !important;
+      text-decoration: none !important;
+      font-size: inherit !important;
+      font-family: inherit !important;
+      font-weight: inherit !important;
+      line-height: inherit !important;
+      }
+    /[if gte mso 9]
+      <xml>
+      <o:OfficeDocumentSettings>
+      <o:AllowPNG/>
+      <o:PixelsPerInch>96</o:PixelsPerInch>
+      </o:OfficeDocumentSettings>
+      </xml>
+    /[if (mso)|(mso 16)]
+      <style type="text/css">
+      body, table, td, a, span {  font-family: Arial, Helvetica, sans-serif !important;  }
+      </style>
+    :css
+      @media only screen and (max-width: 595px) {
+
+      .wrapper {
+        width: 100% !important;
+        margin: 0 auto !important;
+        padding: 0 !important;
+        }
+
+        p,
+        li {
+        font-size: 18px !important;
+        line-height: 26px !important;
+        }
+
+        .stack {
+          width: 100% !important;
+        }
+
+        .stack-mobile-padding {
+          width: 100% !important;
+          margin-top: 20px !important;
+        }
+
+        .callout {
+          padding-bottom: 20px !important;
+        }
+
+        .redbutton {
+          text-align: center;
+        }
+
+        .stack33 {
+          display: block !important;
+          width: 100% !important;
+          max-width: 100% !important;
+          direction: ltr !important;
+          text-align: center !important;
+        }
+      }
+
+      @media only screen and (max-width: 480px) {
+        u~div {
+          width: 100vw !important;
+        }
+
+        div>u~div {
+          width: 100% !important;
+        }
+      }
+  %body#body{ width: "100%" }
+    %table{ border: "0", cellpadding: "0", cellspacing: "0", role: "presentation", width: "100%" }
+      %tr
+        %td{ align: "center", style: "padding: 0px;" }
+          %table.wrapper{ border: "0", cellpadding: "0", cellspacing: "0", role: "presentation", width: "600" }
+            %tr
+              %td{ style: "padding: 0px;" }
+                #main-story.mktEditable{ mktoname: "main-story" }
+                  %table{ border: "0", cellpadding: "0", cellspacing: "0", role: "presentation", width: "100%" }
+                    %tr
+                      %td{ align: "left", style: "padding: 0 20px;" }
+                        = about_link('mailers/in_product_marketing/gitlab-logo-gray-rgb.png', 200)
+                    %tr
+                      %td{ "aria-hidden" => "true", height: "30", style: "font-size: 0; line-height: 0;" }
+
+                    = yield
+
+                    %tr{ style: "background-color: #ffffff;" }
+                      %td{ align: "center", style: "padding:75px 20px 25px;" }
+                        = about_link('gitlab_logo.png', 80)
+                    %tr{ style: "background-color: #ffffff;" }
+                      %td{ align: "center", style: "padding:0px ;" }
+                    %tr{ style: "background-color: #ffffff;" }
+                      %td{ align: "center", style: "padding:0px 10px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif; " }
+                        %span.footernav{ style: "color: #6e49cb; font-size: 16px; line-height: 26px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif;" }
+                          = @message.footer_links.join('&nbsp;' * 3 + '|' + '&nbsp;' * 4).html_safe
+                    %tr{ style: "background-color:#ffffff;" }
+                      %td{ align: "center", style: "padding: 40px 30px 20px 30px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif;" }
+                        .address= @message.address
+                    %tr{ style: "background-color: #ffffff;" }
+                      %td{ align: "left", style: "padding:20px 30px 20px 30px;" }
+                        %span.footernav{ style: "color: #6e49cb; font-size: 14px; line-height: 20px; font-family: 'Source Sans Pro', helvetica, arial, sans-serif; color:#424242;" }
+                          = @message.unsubscribe.html_safe

doc/api/resource_groups.md

@@ -2,10 +2,9 @@
 stage: Release
 group: Release
 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/#assignments
-type: concepts, howto
 ---
 
-# Resource Groups API
+# Resource group API **(FREE)**
 
 You can read more about [controling the job concurrency with resource groups](../ci/resource_groups/index.md).
 

doc/ci/examples/semantic-release.md

@@ -56,7 +56,7 @@ default:
       {
         echo "@${CI_PROJECT_ROOT_NAMESPACE}:registry=${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/npm/"
         echo "${CI_API_V4_URL#https?}/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=\${CI_JOB_TOKEN}"
-      } | tee --append .npmrc
+      } | tee -a .npmrc
   cache:
     key: ${CI_COMMIT_REF_SLUG}
     paths:

doc/user/markdown.md

@@ -562,7 +562,7 @@ To include the title in the rendered link of an issue, merge request, or epic, a
 at the end of the reference. For example, a reference like `#123+` is rendered as
 `The issue title (#123)`.
 
-Expanding titles does not apply to URL references, like `https://gitlab.com/gitlab-org/gitlab/-/issues/1234`.
+URL references like `https://gitlab.com/gitlab-org/gitlab/-/issues/1234+` are also expanded.
 
 ### Embedding metrics in GitLab Flavored Markdown
 

ee/app/assets/javascripts/epic/components/epic_body.vue

 <script>
 import { mapState, mapGetters } from 'vuex';
 
-import IssuableBody from '~/issue_show/components/app.vue';
+import IssuableBody from '~/issues/show/components/app.vue';
 import { PathIdSeparator } from '~/related_issues/constants';
 
 import EpicSidebar from './epic_sidebar.vue';

ee/app/assets/javascripts/epic/components/epic_sidebar.vue

@@ -5,7 +5,7 @@ import SidebarAncestorsWidget from 'ee_component/sidebar/components/ancestors_tr
 
 import { TYPE_EPIC } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import notesEventHub from '~/notes/event_hub';
 import SidebarConfidentialityWidget from '~/sidebar/components/confidential/sidebar_confidentiality_widget.vue';
 import SidebarDateWidget from '~/sidebar/components/date/sidebar_date_widget.vue';

ee/app/assets/javascripts/epic/epic_bundle.js

@@ -3,7 +3,7 @@ import Cookies from 'js-cookie';
 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import { mapActions } from 'vuex';
-import { parseIssuableData } from '~/issue_show/utils/parse_data';
+import { parseIssuableData } from '~/issues/show/utils/parse_data';
 import { convertObjectPropsToCamelCase, parseBoolean } from '~/lib/utils/common_utils';
 import { defaultClient } from '~/sidebar/graphql';
 import labelsSelectModule from '~/vue_shared/components/sidebar/labels_select_vue/store';

ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue

@@ -6,7 +6,7 @@ import ExternalIssueAlert from 'ee/external_issues_show/components/external_issu
 import { fetchIssue } from 'ee/integrations/jira/issues_show/api';
 
 import JiraIssueSidebar from 'ee/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue';
-import { IssuableStatus, IssuableStatusText } from '~/issue_show/constants';
+import { IssuableStatus, IssuableStatusText } from '~/issues/show/constants';
 import IssuableShow from '~/issuable_show/components/issuable_show_root.vue';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { s__ } from '~/locale';

ee/app/assets/javascripts/integrations/zentao/issues_show/components/zentao_issues_show_root.vue

@@ -5,7 +5,7 @@ import Note from 'ee/external_issues_show/components/note.vue';
 import ExternalIssueAlert from 'ee/external_issues_show/components/external_issue_alert.vue';
 import { fetchIssue } from 'ee/integrations/zentao/issues_show/api';
 import ZentaoIssueSidebar from 'ee/integrations/zentao/issues_show/components/sidebar/zentao_issues_sidebar_root.vue';
-import { IssuableStatus, IssuableStatusText } from '~/issue_show/constants';
+import { IssuableStatus, IssuableStatusText } from '~/issues/show/constants';
 
 import IssuableShow from '~/issuable_show/components/issuable_show_root.vue';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';

ee/app/assets/javascripts/sidebar/components/iteration_sidebar_dropdown_widget.vue

@@ -9,7 +9,7 @@ import {
 import SidebarDropdownWidget from 'ee/sidebar/components/sidebar_dropdown_widget.vue';
 import IterationPeriod from 'ee/iterations/components/iteration_period.vue';
 import { getIterationPeriod, groupByIterationCadences } from 'ee/iterations/utils';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { IssuableAttributeType } from '../constants';
 
 export default {

ee/app/assets/javascripts/sidebar/components/sidebar_dropdown_widget.vue

 <script>
 import { __ } from '~/locale';
 import SidebarDropdownWidget from '~/sidebar/components/sidebar_dropdown_widget.vue';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import {
   IssuableAttributeType,
   IssuableAttributeState,

ee/app/assets/javascripts/sidebar/constants.js

-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { __, s__, sprintf } from '~/locale';
 import {
   IssuableAttributeType as IssuableAttributeTypeFoss,

ee/app/assets/javascripts/sidebar/mount_sidebar.js

 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import { apolloProvider } from '~/sidebar/graphql';
 import * as CEMountSidebar from '~/sidebar/mount_sidebar';

ee/app/models/ee/epic.rb

@@ -221,7 +221,7 @@ module EE
           }x
           %r{
             (#{group_regexp})?
-            (?:#{combined_prefix})(?<epic>\d+)(?<format>\+)?
+            (?:#{combined_prefix})#{::Gitlab::Regex.epic}
           }x
         end
       end
@@ -236,7 +236,7 @@ module EE
             #{Regexp.escape(::Gitlab.config.gitlab.url)}
             \/groups\/(?<group>#{::Gitlab::PathRegex::FULL_NAMESPACE_FORMAT_REGEX})
             \/-\/epics
-            \/(?<epic>\d+)
+            \/#{::Gitlab::Regex.epic}
             (?<path>
               (\/[a-z0-9_=-]+)*\/*
             )?

ee/lib/ee/gitlab/regex.rb

+# frozen_string_literal: true
+
+module EE
+  module Gitlab
+    module Regex
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def epic
+          @epic ||= /(?<epic>\d+)(?<format>\+)?/
+        end
+      end
+    end
+  end
+end

ee/spec/frontend/epic/components/epic_body_spec.js

 import { shallowMount } from '@vue/test-utils';
 import EpicBody from 'ee/epic/components/epic_body.vue';
 import createStore from 'ee/epic/store';
-import IssuableBody from '~/issue_show/components/app.vue';
+import IssuableBody from '~/issues/show/components/app.vue';
 import { mockEpicMeta, mockEpicData } from '../mock_data';
 
 describe('EpicBodyComponent', () => {

ee/spec/frontend/integrations/jira/issues_show/components/jira_issues_show_root_spec.js

@@ -4,7 +4,7 @@ import MockAdapter from 'axios-mock-adapter';
 
 import JiraIssuesShow from 'ee/integrations/jira/issues_show/components/jira_issues_show_root.vue';
 import JiraIssueSidebar from 'ee/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue';
-import { IssuableStatus } from '~/issue_show/constants';
+import { IssuableStatus } from '~/issues/show/constants';
 import waitForPromises from 'helpers/wait_for_promises';
 import IssuableHeader from '~/issuable_show/components/issuable_header.vue';
 import IssuableShow from '~/issuable_show/components/issuable_show_root.vue';

ee/spec/frontend/integrations/zentao/issues_show/components/zentao_issues_show_root_spec.js

 import { GlAlert, GlLoadingIcon, GlBadge } from '@gitlab/ui';
 import MockAdapter from 'axios-mock-adapter';
-import { IssuableStatus } from '~/issue_show/constants';
+import { IssuableStatus } from '~/issues/show/constants';
 import ZentaoIssuesShow from 'ee/integrations/zentao/issues_show/components/zentao_issues_show_root.vue';
 
 import waitForPromises from 'helpers/wait_for_promises';

ee/spec/frontend/sidebar/components/iteration_sidebar_dropdown_widget_spec.js

 import { shallowMount } from '@vue/test-utils';
 import IterationSidebarDropdownWidget from 'ee/sidebar/components/iteration_sidebar_dropdown_widget.vue';
 import SidebarDropdownWidget from 'ee/sidebar/components/sidebar_dropdown_widget.vue';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 
 describe('IterationSidebarDropdownWidget', () => {
   let wrapper;

ee/spec/frontend/sidebar/components/sidebar_dropdown_widget_spec.js

@@ -18,7 +18,7 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
 import createFlash from '~/flash';
-import { IssuableType } from '~/issue_show/constants';
+import { IssuableType } from '~/issues/show/constants';
 import SidebarEditableItem from '~/sidebar/components/sidebar_editable_item.vue';
 
 import {

ee/spec/lib/banzai/filter/references/epic_reference_filter_spec.rb

@@ -72,6 +72,13 @@ RSpec.describe Banzai::Filter::References::EpicReferenceFilter do
       expect(link.attr('data-reference-format')).to eq('+')
     end
 
+    it 'includes a data-reference-format attribute for URL references' do
+      link = doc("#{urls.group_epic_url(group, epic)}+").css('a').first
+
+      expect(link).to have_attribute('data-reference-format')
+      expect(link.attr('data-reference-format')).to eq('+')
+    end
+
     it 'ignores invalid epic IIDs' do
       text = "Check &#{non_existing_record_iid}"
 

lib/banzai/filter/references/reference_filter.rb

@@ -184,7 +184,9 @@ module Banzai
         end
 
         def unescape_link(href)
-          CGI.unescape(href)
+          # We cannot use CGI.unescape here because it also converts `+` to spaces.
+          # We need to keep the `+` for expanded reference formats.
+          Addressable::URI.unescape(href)
         end
 
         def unescape_html_entities(text)

lib/gitlab/database/gitlab_loose_foreign_keys.yml

@@ -29,3 +29,11 @@ ci_project_mirrors:
   - table: namespaces
     column: namespace_id
     on_delete: async_delete
+packages_build_infos:
+  - table: ci_pipelines
+    column: pipeline_id
+    on_delete: async_nullify
+packages_package_file_build_infos:
+  - table: ci_pipelines
+    column: pipeline_id
+    on_delete: async_nullify

lib/gitlab/email/message/in_product_marketing/base.rb

@@ -88,29 +88,6 @@ module Gitlab
             end
           end
 
-          def address
-            s_('InProductMarketing|%{strong_start}GitLab Inc.%{strong_end} 268 Bush Street, #350, San Francisco, CA 94104, USA').html_safe % strong_options
-          end
-
-          def footer_links
-            links = [
-              [s_('InProductMarketing|Blog'), 'https://about.gitlab.com/blog'],
-              [s_('InProductMarketing|Twitter'), 'https://twitter.com/gitlab'],
-              [s_('InProductMarketing|Facebook'), 'https://www.facebook.com/gitlab'],
-              [s_('InProductMarketing|YouTube'), 'https://www.youtube.com/channel/UCnMGQ8QHMAnVIsI3xJrihhg']
-            ]
-            case format
-            when :html
-              links.map do |text, link|
-                ActionController::Base.helpers.link_to(text, link)
-              end
-            else
-              '| ' + links.map do |text, link|
-                [text, link].join(' ')
-              end.join("\n| ")
-            end
-          end
-
           def logo_path
             ["mailers/in_product_marketing", "#{track}-#{series}.png"].join('/')
           end

lib/gitlab/email/message/in_product_marketing/helper.rb

@@ -8,6 +8,29 @@ module Gitlab
           include ActionView::Context
           include ActionView::Helpers::TagHelper
 
+          def footer_links
+            links = [
+              [s_('InProductMarketing|Blog'), 'https://about.gitlab.com/blog'],
+              [s_('InProductMarketing|Twitter'), 'https://twitter.com/gitlab'],
+              [s_('InProductMarketing|Facebook'), 'https://www.facebook.com/gitlab'],
+              [s_('InProductMarketing|YouTube'), 'https://www.youtube.com/channel/UCnMGQ8QHMAnVIsI3xJrihhg']
+            ]
+            case format
+            when :html
+              links.map do |text, link|
+                ActionController::Base.helpers.link_to(text, link)
+              end
+            else
+              '| ' + links.map do |text, link|
+                [text, link].join(' ')
+              end.join("\n| ")
+            end
+          end
+
+          def address
+            s_('InProductMarketing|%{strong_start}GitLab Inc.%{strong_end} 268 Bush Street, #350, San Francisco, CA 94104, USA').html_safe % strong_options
+          end
+
           private
 
           def list(array)

lib/gitlab/regex.rb

@@ -427,6 +427,10 @@ module Gitlab
       @issue ||= /(?<issue>\d+)(?<format>\+)?(?=\W|\z)/
     end
 
+    def merge_request
+      @merge_request ||= /(?<merge_request>\d+)(?<format>\+)?/
+    end
+
     def base64_regex
       @base64_regex ||= %r{(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?}.freeze
     end
@@ -441,3 +445,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Regex.prepend_mod

package.json

@@ -115,7 +115,7 @@
     "codesandbox-api": "0.0.23",
     "compression-webpack-plugin": "^5.0.2",
     "copy-webpack-plugin": "^6.4.1",
-    "core-js": "^3.19.2",
+    "core-js": "^3.19.3",
     "cron-validator": "^1.1.1",
     "cronstrue": "^1.122.0",
     "cropper": "^2.3.0",

qa/qa/mobile/page/project/issue/show.rb

@@ -12,7 +12,7 @@ module QA
               super
 
               base.class_eval do
-                view 'app/assets/javascripts/issue_show/components/header_actions.vue' do
+                view 'app/assets/javascripts/issues/show/components/header_actions.vue' do
                   element :issue_actions_dropdown
                   element :mobile_close_issue_button
                   element :mobile_reopen_issue_button

qa/qa/page/component/issuable/common.rb

@@ -10,20 +10,20 @@ module QA
           def self.included(base)
             super
 
-            base.view 'app/assets/javascripts/issue_show/components/title.vue' do
+            base.view 'app/assets/javascripts/issues/show/components/title.vue' do
               element :edit_button
               element :title, required: true
             end
 
-            base.view 'app/assets/javascripts/issue_show/components/fields/title.vue' do
+            base.view 'app/assets/javascripts/issues/show/components/fields/title.vue' do
               element :title_input
             end
 
-            base.view 'app/assets/javascripts/issue_show/components/fields/description.vue' do
+            base.view 'app/assets/javascripts/issues/show/components/fields/description.vue' do
               element :description_textarea
             end
 
-            base.view 'app/assets/javascripts/issue_show/components/edit_actions.vue' do
+            base.view 'app/assets/javascripts/issues/show/components/edit_actions.vue' do
               element :save_button
               element :delete_button
             end

qa/qa/page/project/issue/show.rb

@@ -15,7 +15,7 @@ module QA
             element :remove_related_issue_button
           end
 
-          view 'app/assets/javascripts/issue_show/components/header_actions.vue' do
+          view 'app/assets/javascripts/issues/show/components/header_actions.vue' do
             element :close_issue_button
             element :reopen_issue_button
           end

spec/db/schema_spec.rb

@@ -66,8 +66,6 @@ RSpec.describe 'Database schema' do
     oauth_access_grants: %w[resource_owner_id application_id],
     oauth_access_tokens: %w[resource_owner_id application_id],
     oauth_applications: %w[owner_id],
-    packages_build_infos: %w[pipeline_id],
-    packages_package_file_build_infos: %w[pipeline_id],
     product_analytics_events_experimental: %w[event_id txn_id user_id],
     project_group_links: %w[group_id],
     project_statistics: %w[namespace_id],

spec/frontend/vue_shared/components/issuable/issuable_header_warnings_spec.js → spec/frontend/issuable/components/issuable_header_warnings_spec.js

@@ -4,7 +4,7 @@ import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import { createStore as createMrStore } from '~/mr_notes/stores';
 import createIssueStore from '~/notes/stores';
-import IssuableHeaderWarnings from '~/vue_shared/components/issuable/issuable_header_warnings.vue';
+import IssuableHeaderWarnings from '~/issuable/components/issuable_header_warnings.vue';
 
 const ISSUABLE_TYPE_ISSUE = 'issue';
 const ISSUABLE_TYPE_MR = 'merge request';

spec/frontend/issue_show/components/app_spec.js → spec/frontend/issues/show/components/app_spec.js

@@ -4,12 +4,12 @@ import { nextTick } from 'vue';
 import { createMockDirective, getBinding } from 'helpers/vue_mock_directive';
 import { mountExtended } from 'helpers/vue_test_utils_helper';
 import '~/behaviors/markdown/render_gfm';
-import IssuableApp from '~/issue_show/components/app.vue';
-import DescriptionComponent from '~/issue_show/components/description.vue';
-import IncidentTabs from '~/issue_show/components/incidents/incident_tabs.vue';
-import PinnedLinks from '~/issue_show/components/pinned_links.vue';
-import { IssuableStatus, IssuableStatusText, POLLING_DELAY } from '~/issue_show/constants';
-import eventHub from '~/issue_show/event_hub';
+import IssuableApp from '~/issues/show/components/app.vue';
+import DescriptionComponent from '~/issues/show/components/description.vue';
+import IncidentTabs from '~/issues/show/components/incidents/incident_tabs.vue';
+import PinnedLinks from '~/issues/show/components/pinned_links.vue';
+import { IssuableStatus, IssuableStatusText, POLLING_DELAY } from '~/issues/show/constants';
+import eventHub from '~/issues/show/event_hub';
 import axios from '~/lib/utils/axios_utils';
 import { visitUrl } from '~/lib/utils/url_utility';
 import {
@@ -25,7 +25,7 @@ function formatText(text) {
 }
 
 jest.mock('~/lib/utils/url_utility');
-jest.mock('~/issue_show/event_hub');
+jest.mock('~/issues/show/event_hub');
 
 const REALTIME_REQUEST_STACK = [initialRequest, secondRequest];
 

spec/frontend/issue_show/components/description_spec.js → spec/frontend/issues/show/components/description_spec.js

@@ -3,7 +3,7 @@ import Vue from 'vue';
 import '~/behaviors/markdown/render_gfm';
 import { TEST_HOST } from 'helpers/test_constants';
 import mountComponent from 'helpers/vue_mount_component_helper';
-import Description from '~/issue_show/components/description.vue';
+import Description from '~/issues/show/components/description.vue';
 import TaskList from '~/task_list';
 import { descriptionProps as props } from '../mock_data/mock_data';
 

spec/frontend/issue_show/components/edit_actions_spec.js → spec/frontend/issues/show/components/edit_actions_spec.js

@@ -4,8 +4,8 @@ import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
-import IssuableEditActions from '~/issue_show/components/edit_actions.vue';
-import eventHub from '~/issue_show/event_hub';
+import IssuableEditActions from '~/issues/show/components/edit_actions.vue';
+import eventHub from '~/issues/show/event_hub';
 
 import {
   getIssueStateQueryResponse,

spec/frontend/issue_show/components/edited_spec.js → spec/frontend/issues/show/components/edited_spec.js

 import Vue from 'vue';
-import edited from '~/issue_show/components/edited.vue';
+import edited from '~/issues/show/components/edited.vue';
 
 function formatText(text) {
   return text.trim().replace(/\s\s+/g, ' ');

spec/frontend/issue_show/components/fields/description_spec.js → spec/frontend/issues/show/components/fields/description_spec.js

 import { shallowMount } from '@vue/test-utils';
-import DescriptionField from '~/issue_show/components/fields/description.vue';
-import eventHub from '~/issue_show/event_hub';
+import DescriptionField from '~/issues/show/components/fields/description.vue';
+import eventHub from '~/issues/show/event_hub';
 import MarkdownField from '~/vue_shared/components/markdown/field.vue';
 
 describe('Description field component', () => {

spec/frontend/issue_show/components/fields/description_template_spec.js → spec/frontend/issues/show/components/fields/description_template_spec.js

 import Vue from 'vue';
-import descriptionTemplate from '~/issue_show/components/fields/description_template.vue';
+import descriptionTemplate from '~/issues/show/components/fields/description_template.vue';
 
 describe('Issue description template component with templates as hash', () => {
   let vm;

spec/frontend/issue_show/components/fields/title_spec.js → spec/frontend/issues/show/components/fields/title_spec.js

 import { shallowMount } from '@vue/test-utils';
-import TitleField from '~/issue_show/components/fields/title.vue';
-import eventHub from '~/issue_show/event_hub';
+import TitleField from '~/issues/show/components/fields/title.vue';
+import eventHub from '~/issues/show/event_hub';
 
 describe('Title field component', () => {
   let wrapper;

spec/frontend/issue_show/components/fields/type_spec.js → spec/frontend/issues/show/components/fields/type_spec.js

@@ -3,8 +3,8 @@ import { shallowMount, createLocalVue } from '@vue/test-utils';
 import VueApollo from 'vue-apollo';
 import createMockApollo from 'helpers/mock_apollo_helper';
 import waitForPromises from 'helpers/wait_for_promises';
-import IssueTypeField, { i18n } from '~/issue_show/components/fields/type.vue';
-import { IssuableTypes } from '~/issue_show/constants';
+import IssueTypeField, { i18n } from '~/issues/show/components/fields/type.vue';
+import { IssuableTypes } from '~/issues/show/constants';
 import {
   getIssueStateQueryResponse,
   updateIssueStateQueryResponse,

spec/frontend/issue_show/components/form_spec.js → spec/frontend/issues/show/components/form_spec.js

 import { GlAlert } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import Autosave from '~/autosave';
-import DescriptionTemplate from '~/issue_show/components/fields/description_template.vue';
-import IssueTypeField from '~/issue_show/components/fields/type.vue';
-import formComponent from '~/issue_show/components/form.vue';
-import LockedWarning from '~/issue_show/components/locked_warning.vue';
-import eventHub from '~/issue_show/event_hub';
+import DescriptionTemplate from '~/issues/show/components/fields/description_template.vue';
+import IssueTypeField from '~/issues/show/components/fields/type.vue';
+import formComponent from '~/issues/show/components/form.vue';
+import LockedWarning from '~/issues/show/components/locked_warning.vue';
+import eventHub from '~/issues/show/event_hub';
 
 jest.mock('~/autosave');
 

spec/frontend/issue_show/components/header_actions_spec.js → spec/frontend/issues/show/components/header_actions_spec.js

@@ -3,9 +3,9 @@ import { createLocalVue, shallowMount } from '@vue/test-utils';
 import Vuex from 'vuex';
 import createFlash, { FLASH_TYPES } from '~/flash';
 import { IssuableType } from '~/issuable_show/constants';
-import HeaderActions from '~/issue_show/components/header_actions.vue';
-import { IssuableStatus, IssueStateEvent } from '~/issue_show/constants';
-import promoteToEpicMutation from '~/issue_show/queries/promote_to_epic.mutation.graphql';
+import HeaderActions from '~/issues/show/components/header_actions.vue';
+import { IssuableStatus, IssueStateEvent } from '~/issues/show/constants';
+import promoteToEpicMutation from '~/issues/show/queries/promote_to_epic.mutation.graphql';
 import * as urlUtility from '~/lib/utils/url_utility';
 import eventHub from '~/notes/event_hub';
 import createStore from '~/notes/stores';

spec/frontend/issue_show/components/incidents/highlight_bar_spec.js → spec/frontend/issues/show/components/incidents/highlight_bar_spec.js

 import { GlLink } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import merge from 'lodash/merge';
-import HighlightBar from '~/issue_show/components/incidents/highlight_bar.vue';
+import HighlightBar from '~/issues/show/components/incidents/highlight_bar.vue';
 import { formatDate } from '~/lib/utils/datetime_utility';
 
 jest.mock('~/lib/utils/datetime_utility');

spec/frontend/issue_show/components/incidents/incident_tabs_spec.js → spec/frontend/issues/show/components/incidents/incident_tabs_spec.js

@@ -3,9 +3,9 @@ import { shallowMount } from '@vue/test-utils';
 import merge from 'lodash/merge';
 import waitForPromises from 'helpers/wait_for_promises';
 import { trackIncidentDetailsViewsOptions } from '~/incidents/constants';
-import DescriptionComponent from '~/issue_show/components/description.vue';
-import HighlightBar from '~/issue_show/components/incidents/highlight_bar.vue';
-import IncidentTabs from '~/issue_show/components/incidents/incident_tabs.vue';
+import DescriptionComponent from '~/issues/show/components/description.vue';
+import HighlightBar from '~/issues/show/components/incidents/highlight_bar.vue';
+import IncidentTabs from '~/issues/show/components/incidents/incident_tabs.vue';
 import INVALID_URL from '~/lib/utils/invalid_url';
 import Tracking from '~/tracking';
 import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue';

spec/frontend/issue_show/components/pinned_links_spec.js → spec/frontend/issues/show/components/pinned_links_spec.js

 import { GlButton } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
-import PinnedLinks from '~/issue_show/components/pinned_links.vue';
-import { STATUS_PAGE_PUBLISHED, JOIN_ZOOM_MEETING } from '~/issue_show/constants';
+import PinnedLinks from '~/issues/show/components/pinned_links.vue';
+import { STATUS_PAGE_PUBLISHED, JOIN_ZOOM_MEETING } from '~/issues/show/constants';
 
 const plainZoomUrl = 'https://zoom.us/j/123456789';
 const plainStatusUrl = 'https://status.com';

spec/frontend/issue_show/components/title_spec.js → spec/frontend/issues/show/components/title_spec.js

 import Vue from 'vue';
-import titleComponent from '~/issue_show/components/title.vue';
-import eventHub from '~/issue_show/event_hub';
-import Store from '~/issue_show/stores';
+import titleComponent from '~/issues/show/components/title.vue';
+import eventHub from '~/issues/show/event_hub';
+import Store from '~/issues/show/stores';
 
 describe('Title component', () => {
   let vm;