Automatic merge of gitlab-org/gitlab master

app/assets/javascripts/diffs/components/diff_row.vue

@@ -140,16 +140,13 @@ export default {
     },
     (line) => line.type,
   ),
-  lineContent: memoize(
-    (line) => {
-      if (line.isConflictMarker) {
-        return line.type === CONFLICT_MARKER_THEIR ? 'HEAD//our changes' : 'origin//their changes';
-      }
+  lineContent: (line) => {
+    if (line.isConflictMarker) {
+      return line.type === CONFLICT_MARKER_THEIR ? 'HEAD//our changes' : 'origin//their changes';
+    }
 
-      return line.rich_text;
-    },
-    (line) => line.line_code,
-  ),
+    return line.rich_text;
+  },
   CONFLICT_MARKER,
   CONFLICT_MARKER_THEIR,
   CONFLICT_OUR,

app/assets/javascripts/runner/components/runner_type_alert.vue

@@ -6,28 +6,19 @@ import { INSTANCE_TYPE, GROUP_TYPE, PROJECT_TYPE } from '../constants';
 
 const ALERT_DATA = {
   [INSTANCE_TYPE]: {
-    title: s__(
-      'Runners|This runner is available to all groups and projects in your GitLab instance.',
-    ),
     message: s__(
-      'Runners|Shared runners are available to every project in a GitLab instance. If you want a runner to build only specific projects, restrict the project in the table below. After you restrict a runner to a project, you cannot change it back to a shared runner.',
+      'Runners|This runner is available to all groups and projects in your GitLab instance.',
     ),
     variant: 'success',
     anchor: 'shared-runners',
   },
   [GROUP_TYPE]: {
-    title: s__('Runners|This runner is available to all projects and subgroups in a group.'),
-    message: s__(
-      'Runners|Use Group runners when you want all projects in a group to have access to a set of runners.',
-    ),
+    message: s__('Runners|This runner is available to all projects and subgroups in a group.'),
     variant: 'success',
     anchor: 'group-runners',
   },
   [PROJECT_TYPE]: {
-    title: s__('Runners|This runner is associated with specific projects.'),
-    message: s__(
-      'Runners|You can set up a specific runner to be used by multiple projects but you cannot make this a shared runner.',
-    ),
+    message: s__('Runners|This runner is associated with one or more projects.'),
     variant: 'info',
     anchor: 'specific-runners',
   },
@@ -59,7 +50,7 @@ export default {
 };
 </script>
 <template>
-  <gl-alert v-if="alert" :variant="alert.variant" :title="alert.title" :dismissible="false">
+  <gl-alert v-if="alert" :variant="alert.variant" :dismissible="false">
     {{ alert.message }}
     <gl-link :href="helpHref">{{ __('Learn more.') }}</gl-link>
   </gl-alert>

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

 <script>
 import { GlTooltipDirective, GlLink } from '@gitlab/ui';
-import { __, sprintf } from '~/locale';
+import { __ } from '~/locale';
 import { isUserBusy } from '~/set_status_modal/utils';
 import AssigneeAvatar from './assignee_avatar.vue';
 
@@ -32,10 +32,9 @@ const generateAssigneeTooltip = ({
   }
 
   if (tooltipHasName && statusInformation.length) {
-    return sprintf(__('%{name} %{status}'), {
-      name,
-      status: statusInformation.map(paranthesize).join(' '),
-    });
+    const status = statusInformation.map(paranthesize).join(' ');
+
+    return `${name} ${status}`;
   }
 
   return name;

locale/gitlab.pot

@@ -733,9 +733,6 @@ msgstr ""
 msgid "%{name_with_link} namespace has run out of Shared Runner Pipeline minutes. No new jobs or pipelines in its projects will run."
 msgstr ""
 
-msgid "%{name} %{status}"
-msgstr ""
-
 msgid "%{name} (Busy)"
 msgstr ""
 
@@ -28604,6 +28601,9 @@ msgstr ""
 msgid "Runners|Tags"
 msgstr ""
 
+msgid "Runners|This runner is associated with one or more projects."
+msgstr ""
+
 msgid "Runners|This runner is associated with specific projects."
 msgstr ""
 

spec/frontend/runner/components/runner_type_alert_spec.js

@@ -23,10 +23,10 @@ describe('RunnerTypeAlert', () => {
   });
 
   describe.each`
-    type             | exampleText                                                           | anchor                 | variant
-    ${INSTANCE_TYPE} | ${'Shared runners are available to every project'}                    | ${'#shared-runners'}   | ${'success'}
-    ${GROUP_TYPE}    | ${'Use Group runners when you want all projects in a group'}          | ${'#group-runners'}    | ${'success'}
-    ${PROJECT_TYPE}  | ${'You can set up a specific runner to be used by multiple projects'} | ${'#specific-runners'} | ${'info'}
+    type             | exampleText                                                            | anchor                 | variant
+    ${INSTANCE_TYPE} | ${'This runner is available to all groups and projects'}               | ${'#shared-runners'}   | ${'success'}
+    ${GROUP_TYPE}    | ${'This runner is available to all projects and subgroups in a group'} | ${'#group-runners'}    | ${'success'}
+    ${PROJECT_TYPE}  | ${'This runner is associated with one or more projects'}               | ${'#specific-runners'} | ${'info'}
   `('When it is an $type level runner', ({ type, exampleText, anchor, variant }) => {
     beforeEach(() => {
       createComponent({ props: { type } });

spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js

@@ -81,30 +81,33 @@ describe('AssigneeAvatarLink component', () => {
   );
 
   describe.each`
-    tooltipHasName | availability | canMerge | expected
-    ${true}        | ${'Busy'}    | ${false} | ${'Root (Busy) (cannot merge)'}
-    ${true}        | ${'Busy'}    | ${true}  | ${'Root (Busy)'}
-    ${true}        | ${''}        | ${false} | ${'Root (cannot merge)'}
-    ${true}        | ${''}        | ${true}  | ${'Root'}
-    ${false}       | ${'Busy'}    | ${false} | ${'Cannot merge'}
-    ${false}       | ${'Busy'}    | ${true}  | ${''}
-    ${false}       | ${''}        | ${false} | ${'Cannot merge'}
-    ${false}       | ${''}        | ${true}  | ${''}
+    tooltipHasName | name               | availability | canMerge | expected
+    ${true}        | ${"Rabbit O'Hare"} | ${''}        | ${true}  | ${"Rabbit O'Hare"}
+    ${true}        | ${"Rabbit O'Hare"} | ${'Busy'}    | ${false} | ${"Rabbit O'Hare (Busy) (cannot merge)"}
+    ${true}        | ${'Root'}          | ${'Busy'}    | ${false} | ${'Root (Busy) (cannot merge)'}
+    ${true}        | ${'Root'}          | ${'Busy'}    | ${true}  | ${'Root (Busy)'}
+    ${true}        | ${'Root'}          | ${''}        | ${false} | ${'Root (cannot merge)'}
+    ${true}        | ${'Root'}          | ${''}        | ${true}  | ${'Root'}
+    ${false}       | ${'Root'}          | ${'Busy'}    | ${false} | ${'Cannot merge'}
+    ${false}       | ${'Root'}          | ${'Busy'}    | ${true}  | ${''}
+    ${false}       | ${'Root'}          | ${''}        | ${false} | ${'Cannot merge'}
+    ${false}       | ${'Root'}          | ${''}        | ${true}  | ${''}
   `(
-    "with tooltipHasName=$tooltipHasName and availability='$availability' and canMerge=$canMerge",
-    ({ tooltipHasName, availability, canMerge, expected }) => {
+    "with name=$name tooltipHasName=$tooltipHasName and availability='$availability' and canMerge=$canMerge",
+    ({ name, tooltipHasName, availability, canMerge, expected }) => {
       beforeEach(() => {
         createComponent({
           tooltipHasName,
           user: {
             ...userDataMock(),
+            name,
             can_merge: canMerge,
             availability,
           },
         });
       });
 
-      it('sets tooltip to $expected', () => {
+      it(`sets tooltip to "${expected}"`, () => {
         expect(findTooltipText()).toBe(expected);
       });
     },