Add latest changes from gitlab-org/gitlab@master

6 files changed, 38 insertions, 12 deletions

diff --git a/app/assets/javascripts/graphql_shared/issuable_client.js b/app/assets/javascripts/graphql_shared/issuable_client.js
index a223c7fa360..3849bd0289d 100644
--- a/app/assets/javascripts/graphql_shared/issuable_client.js
+++ b/app/assets/javascripts/graphql_shared/issuable_client.js
@@ -19,8 +19,14 @@ export const temporaryConfig = {
       WorkItem: {
         fields: {
           widgets: {
-            merge(_, incoming) {
-              return incoming;
+            merge(existing = [], incoming) {
+              if (existing.length === 0) {
+                return incoming;
+              }
+              return existing.map((existingWidget) => {
+                const incomingWidget = incoming.find((w) => w.type === existingWidget.type);
+                return incomingWidget || existingWidget;
+              });
             },
           },
         },
diff --git a/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql b/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql
index f4c77ed2ec0..bb05c9b2135 100644
--- a/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql
+++ b/app/assets/javascripts/work_items/graphql/work_item.fragment.graphql
@@ -1,4 +1,3 @@
-#import "~/graphql_shared/fragments/user.fragment.graphql"
 #import "ee_else_ce/work_items/graphql/work_item_widgets.fragment.graphql"
 
 fragment WorkItem on WorkItem {
diff --git a/app/assets/javascripts/work_items/graphql/work_item_assignees.subscription.graphql b/app/assets/javascripts/work_items/graphql/work_item_assignees.subscription.graphql
index 9015469d61a..d5b2de8c4c6 100644
--- a/app/assets/javascripts/work_items/graphql/work_item_assignees.subscription.graphql
+++ b/app/assets/javascripts/work_items/graphql/work_item_assignees.subscription.graphql
@@ -1,9 +1,21 @@
-#import "./work_item.fragment.graphql"
+#import "~/graphql_shared/fragments/user.fragment.graphql"
 
 subscription issuableAssignees($issuableId: IssuableID!) {
   issuableAssigneesUpdated(issuableId: $issuableId) {
     ... on WorkItem {
-      ...WorkItem
+      id
+      widgets {
+        ... on WorkItemWidgetAssignees {
+          type
+          allowsMultipleAssignees
+          canInviteMembers
+          assignees {
+            nodes {
+              ...User
+            }
+          }
+        }
+      }
     }
   }
 }
diff --git a/app/assets/javascripts/work_items/graphql/work_item_dates.subscription.graphql b/app/assets/javascripts/work_items/graphql/work_item_dates.subscription.graphql
index bee2458fb91..d8760f147e1 100644
--- a/app/assets/javascripts/work_items/graphql/work_item_dates.subscription.graphql
+++ b/app/assets/javascripts/work_items/graphql/work_item_dates.subscription.graphql
@@ -1,9 +1,14 @@
-#import "./work_item.fragment.graphql"
-
 subscription issuableDatesUpdated($issuableId: IssuableID!) {
   issuableDatesUpdated(issuableId: $issuableId) {
     ... on WorkItem {
-      ...WorkItem
+      id
+      widgets {
+        ... on WorkItemWidgetStartAndDueDate {
+          type
+          dueDate
+          startDate
+        }
+      }
     }
   }
 }
diff --git a/app/services/work_items/update_service.rb b/app/services/work_items/update_service.rb
index f66639b0149..1351445f6f3 100644
--- a/app/services/work_items/update_service.rb
+++ b/app/services/work_items/update_service.rb
@@ -58,5 +58,13 @@ module WorkItems
     def payload(work_item)
       { work_item: work_item }
     end
+
+    def handle_label_changes(issuable, old_labels)
+      return false unless super
+
+      Gitlab::UsageDataCounters::WorkItemActivityUniqueCounter.track_work_item_labels_changed_action(
+        author: current_user
+      )
+    end
   end
 end
diff --git a/app/views/shared/runners/_shared_runners_description.html.haml b/app/views/shared/runners/_shared_runners_description.html.haml
index 01b601ef986..c8ddb5d5176 100644
--- a/app/views/shared/runners/_shared_runners_description.html.haml
+++ b/app/views/shared/runners/_shared_runners_description.html.haml
@@ -1,5 +1,3 @@
--# "MaxBuilds" is a runner configuration keyword so it must not be translated.
-- link = link_to 'MaxBuilds', 'https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnersmachine-section', target: '_blank', rel: 'noopener noreferrer'
 - shared_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('ci/runners/runners_scope.md', anchor: 'shared-runners') }
 
 %h4
@@ -9,5 +7,3 @@
   %p= s_('Runners|%{link_start}These runners%{link_end} are available to all groups and projects.').html_safe % { link_start: shared_link_start, link_end: '</a>'.html_safe }
   - if Gitlab::CurrentSettings.shared_runners_text.present?
     = markdown(Gitlab::CurrentSettings.current_application_settings.shared_runners_text)
-  - else
-    %p= _('The same shared runner executes code from multiple projects, unless you configure autoscaling with %{link} set to 1 (which it is on GitLab.com).').html_safe % { link: link }