Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.gitlab-ci.yml

@@ -56,7 +56,7 @@ default:
 workflow:
   name: '$PIPELINE_NAME'
   rules:
-    - if: '$CI_PROJECT_PATH == "gitlab-org/gitaly" && $CI_PIPELINE_SOURCE == "parent_pipeline" && $GITALY_TEST'
+    - if: '$CI_PIPELINE_SOURCE == "pipeline" && $GITALY_TEST'
       variables:
         <<: *default-ruby-variables
         PIPELINE_NAME: 'Gitaly Rails Test Pipeline'

.gitlab/ci/rules.gitlab-ci.yml

@@ -1151,13 +1151,15 @@
       when: never
     # If any of the files that are DIRECTLY related to generating or managing the GLFM specification change,
     # run `glfm-verify` to get quick feedback on any needed updates, even if the MR is not yet approved
+    - <<: *if-default-refs
     - changes: *glfm-patterns
     # Otherwise do not run `glfm-verify` if the MR is not approved
     - <<: *if-merge-request-not-approved
       when: never
     # If we passed all the previous rules, run `glfm-verify` if there are any changes that could impact `glfm-verify`.
     # This could potentially be a wide range of files, so we reuse `setup-test-env-patterns`, which includes
     # almost all app files except docs files.
+    - <<: *if-default-refs
     - changes: *setup-test-env-patterns
     # If we are forcing all rspec to run, run this job too.
     - <<: *if-merge-request-labels-run-all-rspec
@@ -1233,6 +1235,7 @@
 .frontend:rules:compile-test-assets:
   rules:
     - if: '$ENABLE_COMPILE_TEST_ASSETS == "true"'
+    - if: '$ENABLE_RSPEC == "true"'
     - <<: *if-merge-request-labels-run-all-rspec
     - <<: *if-merge-request
       changes: *backend-patterns

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

@@ -20,7 +20,7 @@ import {
   sprintfWorkItem,
   I18N_WORK_ITEM_ERROR_CREATING,
   I18N_WORK_ITEM_ERROR_DELETING,
-  TASK_TYPE_NAME,
+  WORK_ITEM_TYPE_VALUE_TASK,
 } from '~/work_items/constants';
 import { renderGFM } from '~/behaviors/markdown/render_gfm';
 import eventHub from '../event_hub';
@@ -129,7 +129,7 @@ export default {
   },
   computed: {
     taskWorkItemTypeId() {
-      return this.workItemTypes.find((type) => type.name === TASK_TYPE_NAME)?.id;
+      return this.workItemTypes.find((type) => type.name === WORK_ITEM_TYPE_VALUE_TASK)?.id;
     },
     issueGid() {
       return this.issueId ? convertToGraphQLId(TYPENAME_WORK_ITEM, this.issueId) : null;

app/assets/javascripts/work_items/components/notes/work_item_comment_form.vue

@@ -4,7 +4,11 @@ import { helpPagePath } from '~/helpers/help_page_helper';
 import { s__, __ } from '~/locale';
 import Tracking from '~/tracking';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
-import { STATE_OPEN, TRACKING_CATEGORY_SHOW, TASK_TYPE_NAME } from '~/work_items/constants';
+import {
+  STATE_OPEN,
+  TRACKING_CATEGORY_SHOW,
+  WORK_ITEM_TYPE_VALUE_TASK,
+} from '~/work_items/constants';
 import { getDraft, clearDraft, updateDraft } from '~/lib/utils/autosave';
 import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
 import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue';
@@ -127,10 +131,12 @@ export default {
       return this.isNoteInternal ? this.$options.i18n.addInternalNote : this.commentButtonText;
     },
     workItemDocPath() {
-      return this.workItemType === TASK_TYPE_NAME ? 'user/tasks.html' : 'user/okrs.html';
+      return this.workItemType === WORK_ITEM_TYPE_VALUE_TASK ? 'user/tasks.html' : 'user/okrs.html';
     },
     workItemDocAnchor() {
-      return this.workItemType === TASK_TYPE_NAME ? 'confidential-tasks' : 'confidential-okrs';
+      return this.workItemType === WORK_ITEM_TYPE_VALUE_TASK
+        ? 'confidential-tasks'
+        : 'confidential-okrs';
     },
     getWorkItemData() {
       return {

app/assets/javascripts/work_items/components/notes/work_item_comment_locked.vue

@@ -2,7 +2,7 @@
 import { GlLink, GlIcon } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
 import { helpPagePath } from '~/helpers/help_page_helper';
-import { TASK_TYPE_NAME } from '~/work_items/constants';
+import { WORK_ITEM_TYPE_VALUE_TASK } from '~/work_items/constants';
 
 export default {
   components: {
@@ -13,7 +13,7 @@ export default {
     workItemType: {
       required: false,
       type: String,
-      default: TASK_TYPE_NAME,
+      default: WORK_ITEM_TYPE_VALUE_TASK,
     },
     isProjectArchived: {
       required: false,

app/assets/javascripts/work_items/components/shared/work_item_link_child_contents.vue

@@ -6,14 +6,14 @@ import RichTimestampTooltip from '~/vue_shared/components/rich_timestamp_tooltip
 import WorkItemLinkChildMetadata from 'ee_else_ce/work_items/components/shared/work_item_link_child_metadata.vue';
 import {
   STATE_OPEN,
-  TASK_TYPE_NAME,
   WIDGET_TYPE_PROGRESS,
   WIDGET_TYPE_HIERARCHY,
   WIDGET_TYPE_HEALTH_STATUS,
   WIDGET_TYPE_MILESTONE,
   WIDGET_TYPE_ASSIGNEES,
   WIDGET_TYPE_LABELS,
   WORK_ITEM_NAME_TO_ICON_MAP,
+  WORK_ITEM_TYPE_VALUE_TASK,
 } from '../../constants';
 
 export default {
@@ -79,7 +79,7 @@ export default {
       return this.childItem.state === STATE_OPEN;
     },
     iconName() {
-      if (this.childItemType === TASK_TYPE_NAME && !this.showTaskIcon) {
+      if (this.childItemType === WORK_ITEM_TYPE_VALUE_TASK && !this.showTaskIcon) {
         return this.isChildItemOpen ? 'issue-open-m' : 'issue-close';
       }
       return WORK_ITEM_NAME_TO_ICON_MAP[this.childItemType];
@@ -88,7 +88,7 @@ export default {
       return this.childItem.workItemType.name;
     },
     iconClass() {
-      if (this.childItemType === TASK_TYPE_NAME && !this.showTaskIcon) {
+      if (this.childItemType === WORK_ITEM_TYPE_VALUE_TASK && !this.showTaskIcon) {
         return this.isChildItemOpen ? 'gl-text-green-500' : 'gl-text-blue-500';
       }
       return '';

app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue

@@ -8,10 +8,10 @@ import { createAlert } from '~/alert';
 import updateWorkItemMutation from '../../graphql/update_work_item.mutation.graphql';
 import {
   STATE_OPEN,
-  TASK_TYPE_NAME,
-  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
   WIDGET_TYPE_HIERARCHY,
   WORK_ITEM_NAME_TO_ICON_MAP,
+  WORK_ITEM_TYPE_VALUE_OBJECTIVE,
+  WORK_ITEM_TYPE_VALUE_TASK,
 } from '../../constants';
 import getWorkItemTreeQuery from '../../graphql/work_item_tree.query.graphql';
 import WorkItemLinkChildContents from '../shared/work_item_link_child_contents.vue';
@@ -76,13 +76,13 @@ export default {
       return this.childItem.workItemType.name;
     },
     iconName() {
-      if (this.childItemType === TASK_TYPE_NAME) {
+      if (this.childItemType === WORK_ITEM_TYPE_VALUE_TASK) {
         return this.isItemOpen ? 'issue-open-m' : 'issue-close';
       }
       return WORK_ITEM_NAME_TO_ICON_MAP[this.childItemType];
     },
     iconClass() {
-      if (this.childItemType === TASK_TYPE_NAME) {
+      if (this.childItemType === WORK_ITEM_TYPE_VALUE_TASK) {
         return this.isItemOpen ? 'gl-text-green-500' : 'gl-text-blue-500';
       }
       return '';

app/assets/javascripts/work_items/constants.js

@@ -10,8 +10,6 @@ export const STATE_EVENT_CLOSE = 'CLOSE';
 
 export const TRACKING_CATEGORY_SHOW = 'workItems:show';
 
-export const TASK_TYPE_NAME = 'Task';
-
 export const WIDGET_TYPE_ASSIGNEES = 'ASSIGNEES';
 export const WIDGET_TYPE_DESCRIPTION = 'DESCRIPTION';
 export const WIDGET_TYPE_AWARD_EMOJI = 'AWARD_EMOJI';
@@ -46,9 +44,6 @@ export const WORK_ITEM_TYPE_VALUE_REQUIREMENTS = 'Requirements';
 export const WORK_ITEM_TYPE_VALUE_KEY_RESULT = 'Key Result';
 export const WORK_ITEM_TYPE_VALUE_OBJECTIVE = 'Objective';
 
-export const NAMESPACE_GROUP = 'group';
-export const NAMESPACE_PROJECT = 'project';
-
 export const WORK_ITEM_TITLE_MAX_LENGTH = 255;
 
 export const i18n = {

app/graphql/mutations/notes/create/discussion.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Mutations
+  module Notes
+    module Create
+      class Discussion < Base
+        graphql_name 'CreateDiscussion'
+
+        private
+
+        def create_note_params(noteable, args)
+          super(noteable, args).merge({ type: 'DiscussionNote' })
+        end
+      end
+    end
+  end
+end

app/graphql/mutations/work_items/create.rb

@@ -60,7 +60,6 @@ def ready?(**args)
       def resolve(project_path: nil, namespace_path: nil, **attributes)
         container_path = project_path || namespace_path
         container = authorized_find!(container_path)
-        check_env_feature_available!(container)
         check_feature_available!(container)
 
         params = global_id_compatibility_params(attributes).merge(author_id: current_user.id)
@@ -84,15 +83,6 @@ def resolve(project_path: nil, namespace_path: nil, **attributes)
 
       private
 
-      # This is just a temporary measure while we migrate and backfill epic internal_ids
-      # More info in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139367
-      def check_env_feature_available!(container)
-        return unless container.is_a?(::Group) && Rails.env.production?
-
-        message = 'Group level work items are disabled. Only project paths allowed in `namespacePath`.'
-        raise Gitlab::Graphql::Errors::ArgumentError, message
-      end
-
       def check_feature_available!(container)
         return unless container.is_a?(::Group) && Feature.disabled?(:namespace_level_work_items, container)