Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

app/assets/javascripts/ci/common/private/job_name_component.vue

@@ -37,7 +37,7 @@ export default {
       :use-link="false"
       class="gl-leading-0"
     />
-    <span class="mw-70p gl-inline-block gl-truncate gl-pl-3" :title="name">
+    <span class="gl-inline-block gl-max-w-7/10 gl-truncate gl-pl-3" :title="name">
       {{ name }}
     </span>
   </span>

app/assets/javascripts/issues/index.js

@@ -49,4 +49,12 @@ export function initShow() {
   import(/* webpackChunkName: 'design_management' */ '~/design_management')
     .then((module) => module.default())
     .catch(() => {});
+
+  if (gon.features.workItemsViewPreference) {
+    import(/* webpackChunkName: 'work_items_feedback' */ '~/work_items_feedback')
+      .then(({ initWorkItemsFeedback }) => {
+        initWorkItemsFeedback();
+      })
+      .catch({});
+  }
 }

app/assets/javascripts/packages_and_registries/container_registry/explorer/components/details_page/tags_list_row.vue

@@ -116,7 +116,7 @@ export default {
       return this.tag.layers ? n__('%d layer', '%d layers', this.tag.layers) : '';
     },
     mobileClasses() {
-      return this.isMobile ? 'mw-s' : '';
+      return this.isMobile ? 'gl-max-w-20' : '';
     },
     shortDigest() {
       // remove sha256: from the string, and show only the first 7 char

app/assets/javascripts/pages/projects/work_items/index.js

@@ -1,3 +1,11 @@
 import { initWorkItemsRoot } from '~/work_items';
 
 initWorkItemsRoot();
+
+if (gon.features.work_items_view_preference) {
+  import('~/work_items_feedback')
+    .then(({ initWorkItemsFeedback }) => {
+      initWorkItemsFeedback();
+    })
+    .catch({});
+}

app/assets/javascripts/vue_shared/components/upload_dropzone/upload_dropzone.vue

@@ -198,7 +198,7 @@ export default {
         v-show="dragging && !enableDragBehavior"
         class="card upload-dropzone-border upload-dropzone-overlay gl-absolute gl-flex gl-h-full gl-w-full gl-items-center gl-justify-center gl-p-4"
       >
-        <div v-show="!isDragDataValid" class="mw-50 gl-text-center">
+        <div v-show="!isDragDataValid" class="gl-max-w-1/2 gl-text-center">
           <slot name="invalid-drag-data-slot">
             <h3 :class="{ 'gl-inline gl-text-base': !displayAsCard }">
               {{ __('Oh no!') }}
@@ -210,7 +210,7 @@ export default {
             }}</span>
           </slot>
         </div>
-        <div v-show="isDragDataValid" class="mw-50 gl-text-center">
+        <div v-show="isDragDataValid" class="gl-max-w-1/2 gl-text-center">
           <slot name="valid-drag-data-slot">
             <h3 :class="{ 'gl-inline gl-text-base': !displayAsCard }">
               {{ __('Incoming!') }}

app/assets/javascripts/work_items/index.js

@@ -81,6 +81,14 @@ export const initWorkItemsRoot = ({ workItemType, workspaceType } = {}) => {
     },
   });
 
+  if (gon.features.workItemsViewPreference) {
+    import(/* webpackChunkName: 'work_items_feedback' */ '~/work_items_feedback')
+      .then(({ initWorkItemsFeedback }) => {
+        initWorkItemsFeedback();
+      })
+      .catch({});
+  }
+
   return new Vue({
     el,
     name: 'WorkItemsRoot',

app/assets/javascripts/work_items/router/index.js

@@ -10,7 +10,6 @@ Vue.use(VueRouter);
 
 export function createRouter({
   fullPath,
-  workItemType = 'work_items',
   workspaceType = WORKSPACE_PROJECT,
   defaultBranch,
   isGroup,
@@ -24,6 +23,6 @@ export function createRouter({
   return new VueRouter({
     routes: routes(isGroup),
     mode: 'history',
-    base: joinPaths(gon?.relative_url_root, workspacePath, fullPath, '-', workItemType),
+    base: joinPaths(gon?.relative_url_root, workspacePath, fullPath, '-'),
   });
 }

app/assets/javascripts/work_items/router/routes.js

@@ -5,7 +5,7 @@ import { ROUTES } from '../constants';
 function getRoutes(isGroup) {
   const routes = [
     {
-      path: '/:iid',
+      path: '/:type(issues|epics|work_items)/:iid',
       name: ROUTES.workItem,
       component: () => import('../pages/work_item_root.vue'),
       props: true,
@@ -27,15 +27,15 @@ function getRoutes(isGroup) {
 
   if (isGroup) {
     routes.unshift({
-      path: '/',
+      path: '/:type(issues|epics|work_items)',
       name: ROUTES.index,
       component: WorkItemList,
     });
   }
 
   if (gon.features?.workItemsAlpha) {
     routes.unshift({
-      path: '/new',
+      path: '/:type(issues|epics|work_items)/new',
       name: ROUTES.new,
       component: () => import('../pages/create_work_item.vue'),
     });

app/assets/javascripts/work_items_feedback/components/work_item_view_toggle.vue

@@ -0,0 +1,104 @@
+<script>
+import { GlBadge, GlPopover, GlLink, GlToggle } from '@gitlab/ui';
+import { uniqueId } from 'lodash';
+import { createAlert } from '~/alert';
+import { __ } from '~/locale';
+import * as Sentry from '~/sentry/sentry_browser_wrapper';
+import getUserPreferences from '../graphql/user_preferences.query.graphql';
+import setUseWorkItemsView from '../graphql/set_use_work_items_view.mutation.graphql';
+
+export default {
+  name: 'WorkItemToggle',
+  components: {
+    GlBadge,
+    GlPopover,
+    GlLink,
+    GlToggle,
+  },
+  data() {
+    return {
+      currentUser: {
+        userPreferences: {},
+      },
+      feedbackIssue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/463598',
+    };
+  },
+  apollo: {
+    currentUser: {
+      query: getUserPreferences,
+    },
+  },
+  computed: {
+    onOff() {
+      return this.currentUser.userPreferences.useWorkItemsView ? __('On') : __('Off');
+    },
+  },
+  methods: {
+    setWorkItemsView(val) {
+      this.$apollo
+        .mutate({
+          mutation: setUseWorkItemsView,
+          variables: {
+            useWorkItemsView: val,
+          },
+          update: (cache, { data: { userPreferencesUpdate } }) => {
+            cache.modify({
+              id: cache.identify(this.currentUser),
+              fields: {
+                userPreferences(existingPreferences = {}) {
+                  return {
+                    ...existingPreferences,
+                    ...userPreferencesUpdate.userPreferences,
+                  };
+                },
+              },
+            });
+
+            window.location.reload();
+          },
+        })
+        .catch((error) => {
+          createAlert({
+            message: __('Something went wrong. Please try again.'),
+          });
+          Sentry.captureException(error);
+        });
+    },
+  },
+  badgeId: uniqueId(),
+  i18n: {
+    previewWorkItems: __(
+      'Preview the new issues experience, with real time updates and refreshed design. Some features are not yet supported, see feedback issue for details.',
+    ),
+    leaveFeedback: __('Leave feedback'),
+    newIssueLook: __('New issue look'),
+  },
+};
+</script>
+
+<template>
+  <div class="gl-flex gl-content-center">
+    <gl-badge :id="$options.badgeId" variant="info" icon="information-o" href="#"
+      >{{ $options.i18n.newIssueLook }}: {{ onOff }}</gl-badge
+    >
+    <gl-popover
+      :target="$options.badgeId"
+      data-testid="work-item-feedback-popover"
+      triggers="focus click manual blur"
+      placement="bottom"
+      show-close-button
+      :title="$options.i18n.newIssueLook"
+    >
+      <gl-toggle
+        :value="currentUser.userPreferences.useWorkItemsView"
+        :label="onOff"
+        label-position="left"
+        @change="setWorkItemsView"
+      />
+      <div class="gl-pt-2">
+        {{ $options.i18n.previewWorkItems }}
+      </div>
+      <gl-link target="_blank" :href="feedbackIssue">{{ $options.i18n.leaveFeedback }}</gl-link>
+    </gl-popover>
+  </div>
+</template>

app/assets/javascripts/work_items_feedback/graphql/set_use_work_items_view.mutation.graphql

@@ -0,0 +1,7 @@
+mutation setUseWorkItemsView($useWorkItemsView: Boolean) {
+  userPreferencesUpdate(input: { useWorkItemsView: $useWorkItemsView }) {
+    userPreferences {
+      useWorkItemsView
+    }
+  }
+}

app/assets/javascripts/work_items_feedback/graphql/user_preferences.query.graphql

@@ -0,0 +1,8 @@
+query getUserPreferences {
+  currentUser {
+    id
+    userPreferences {
+      useWorkItemsView
+    }
+  }
+}

app/assets/javascripts/work_items_feedback/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue';
 import VueApollo from 'vue-apollo';
 import { apolloProvider } from '~/graphql_shared/issuable_client';
 import WorkItemFeedback from './components/work_item_feedback.vue';
+import WorkItemViewToggle from './components/work_item_view_toggle.vue';
 
 Vue.use(VueApollo);
 
@@ -12,7 +13,7 @@ export const initWorkItemsFeedback = ({
   content,
   expiry,
   featureName,
-}) => {
+} = {}) => {
   if (expiry) {
     const expiryDate = new Date(expiry);
     if (Date.now() > expiryDate) {
@@ -34,7 +35,7 @@ export const initWorkItemsFeedback = ({
       featureName,
     },
     render(h) {
-      return h(WorkItemFeedback);
+      return h(feedbackIssue ? WorkItemFeedback : WorkItemViewToggle);
     },
   });
 };

app/assets/stylesheets/framework/common.scss

@@ -364,7 +364,6 @@ li.note {
 .h-32-px { height: 32px;}
 
 .mw-6em { max-width: 6em; }
-.mw-70p { max-width: 70%; }
 
 // By default flex items don't shrink below their minimum content size.
 // To change this, these clases set a min-width or min-height

app/controllers/projects/issues_controller.rb

@@ -67,6 +67,7 @@ class Projects::IssuesController < Projects::ApplicationController
     push_force_frontend_feature_flag(:work_items_alpha, project&.work_items_alpha_feature_flag_enabled?)
     push_frontend_feature_flag(:epic_widget_edit_confirmation, project)
     push_frontend_feature_flag(:namespace_level_work_items, project&.group)
+    push_frontend_feature_flag(:work_items_view_preference, current_user)
   end
 
   around_action :allow_gitaly_ref_name_caching, only: [:discussions]
@@ -140,6 +141,15 @@ def new
     respond_with(@issue)
   end
 
+  def show
+    return super unless show_work_item? && request.format.html?
+
+    @right_sidebar = false
+    @work_item = issue.becomes(::WorkItem) # rubocop:disable Cop/AvoidBecomes -- We need the instance to be a work item
+
+    render 'projects/work_items/show'
+  end
+
   def edit
     respond_with(@issue)
   end
@@ -390,6 +400,10 @@ def disable_query_limiting
 
   private
 
+  def show_work_item?
+    Feature.enabled?(:work_items_view_preference, current_user) && current_user&.user_preference&.use_work_items_view
+  end
+
   def work_item_redirect_except_actions
     ISSUES_EXCEPT_ACTIONS
   end

app/models/bulk_import.rb

@@ -55,7 +55,7 @@ class BulkImport < ApplicationRecord
     # rubocop:disable Style/SymbolProc
     after_transition any => [:finished, :failed, :timeout] do |bulk_import|
       bulk_import.update_has_failures
-      bulk_import.notify_owners_of_completion
+      bulk_import.send_completion_notification
     end
     # rubocop:enable Style/SymbolProc
 
@@ -103,24 +103,12 @@ def completed?
     finished? || failed? || timeout? || canceled?
   end
 
-  def notify_owners_of_completion
-    users_to_notify = parent_group_entity&.group&.owners
-
-    return if users_to_notify.blank?
-
-    users_to_notify.each do |owner|
-      run_after_commit do
-        Notify.bulk_import_complete(owner.id, id).deliver_later
-      end
+  def send_completion_notification
+    run_after_commit do
+      Notify.bulk_import_complete(user.id, id).deliver_later
     end
   end
 
-  # Finds the root group entity of the BulkImport's entity tree.
-  # @return [BulkImports::Entity, nil]
-  def parent_group_entity
-    entities.group_entity.where(parent: nil).first
-  end
-
   def destination_group_roots
     entities.where(parent: nil).filter_map do |entity|
       entity.group || entity.project

app/workers/process_commit_worker.rb

@@ -67,6 +67,7 @@ def issues_to_close(project, commit, user)
     Gitlab::ClosingIssueExtractor
       .new(project, user)
       .closed_by_message(commit.safe_message)
+      .reject { |issue| issue.is_a?(Issue) && !issue.autoclose_by_merged_closing_merge_request? }
   end
 
   def update_issue_metrics(commit, author)

config/feature_flags/beta/work_items_view_preference.yml

@@ -0,0 +1,9 @@
+---
+name: work_items_view_preference
+feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/461855
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165085
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/482931
+milestone: '17.4'
+group: group::project management
+type: beta
+default_enabled: false

doc/administration/backup_restore/restore_gitlab.md

@@ -504,4 +504,4 @@ To resolve this, you can update the Git [server hooks](../server_hooks.md) for G
 ### Successful restore with repositories showing as empty when using `fapolicyd`
 
 When using `fapolicyd` for increased security, GitLab can report that a restore was successful but repositories show as empty. For more troubleshooting help, see
-[Gitaly Troubleshooting documentation](../../administration/gitaly/troubleshooting.md#repositories-are-shown-as-empty-after-a-gitlab-restore).
+[Gitaly Troubleshooting documentation](../gitaly/troubleshooting.md#repositories-are-shown-as-empty-after-a-gitlab-restore).