Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.dockerignore

@@ -49,7 +49,6 @@
 /lib/registry/
 /lib/policy/
 /lib/feature/
-/lib/flowdock/
 /lib/generators/
 /lib/gitaly/
 /lib/api/

.rubocop_todo/gitlab/strong_memoize_attr.yml

@@ -565,7 +565,6 @@ Gitlab/StrongMemoizeAttr:
     - 'lib/container_registry/client.rb'
     - 'lib/container_registry/gitlab_api_client.rb'
     - 'lib/container_registry/tag.rb'
-    - 'lib/flowdock/git/builder.rb'
     - 'lib/gitlab/alert_management/alert_status_counts.rb'
     - 'lib/gitlab/alert_management/payload/base.rb'
     - 'lib/gitlab/alert_management/payload/managed_prometheus.rb'

.rubocop_todo/layout/line_length.yml

@@ -391,7 +391,6 @@ Layout/LineLength:
     - 'app/models/integrations/emails_on_push.rb'
     - 'app/models/integrations/ewm.rb'
     - 'app/models/integrations/external_wiki.rb'
-    - 'app/models/integrations/flowdock.rb'
     - 'app/models/integrations/hangouts_chat.rb'
     - 'app/models/integrations/harbor.rb'
     - 'app/models/integrations/jenkins.rb'

.rubocop_todo/layout/space_in_lambda_literal.yml

@@ -3,23 +3,6 @@
 Layout/SpaceInLambdaLiteral:
   Details: grace period
   Exclude:
-    - 'app/controllers/concerns/issuable_actions.rb'
-    - 'app/controllers/projects/ci/daily_build_group_report_results_controller.rb'
-    - 'app/controllers/projects/merge_requests_controller.rb'
-    - 'app/finders/releases/group_releases_finder.rb'
-    - 'app/graphql/mutations/ci/runner/update.rb'
-    - 'app/models/abuse_report.rb'
-    - 'app/models/alert_management/alert.rb'
-    - 'app/models/alert_management/http_integration.rb'
-    - 'app/models/analytics/cycle_analytics/aggregation.rb'
-    - 'app/models/analytics/usage_trends/measurement.rb'
-    - 'app/models/application_setting.rb'
-    - 'app/models/audit_event.rb'
-    - 'app/models/award_emoji.rb'
-    - 'app/models/board_group_recent_visit.rb'
-    - 'app/models/board_project_recent_visit.rb'
-    - 'app/models/bulk_import.rb'
-    - 'app/models/bulk_imports/entity.rb'
     - 'app/models/bulk_imports/tracker.rb'
     - 'app/models/ci/build.rb'
     - 'app/models/ci/daily_build_group_report_result.rb'

.rubocop_todo/style/format_string.yml

@@ -105,7 +105,6 @@ Style/FormatString:
     - 'app/models/integrations/emails_on_push.rb'
     - 'app/models/integrations/ewm.rb'
     - 'app/models/integrations/external_wiki.rb'
-    - 'app/models/integrations/flowdock.rb'
     - 'app/models/integrations/hangouts_chat.rb'
     - 'app/models/integrations/irker.rb'
     - 'app/models/integrations/jenkins.rb'
@@ -281,7 +280,6 @@ Style/FormatString:
     - 'lib/api/helpers/packages/conan/api_helpers.rb'
     - 'lib/bulk_imports/network_error.rb'
     - 'lib/bulk_imports/users_mapper.rb'
-    - 'lib/flowdock/git/builder.rb'
     - 'lib/gitlab/bitbucket_server_import/importer.rb'
     - 'lib/gitlab/checks/push_file_count_check.rb'
     - 'lib/gitlab/ci/ansi2json/line.rb'

.rubocop_todo/style/percent_literal_delimiters.yml

@@ -87,7 +87,6 @@ Style/PercentLiteralDelimiters:
     - 'app/models/integrations/emails_on_push.rb'
     - 'app/models/integrations/external_wiki.rb'
     - 'app/models/integrations/field.rb'
-    - 'app/models/integrations/flowdock.rb'
     - 'app/models/integrations/jenkins.rb'
     - 'app/models/integrations/jira.rb'
     - 'app/models/integrations/packagist.rb'
@@ -485,7 +484,6 @@ Style/PercentLiteralDelimiters:
     - 'lib/bitbucket/representation/issue.rb'
     - 'lib/container_registry/path.rb'
     - 'lib/feature.rb'
-    - 'lib/flowdock/git/builder.rb'
     - 'lib/generators/gitlab/usage_metric_definition_generator.rb'
     - 'lib/generators/gitlab/usage_metric_generator.rb'
     - 'lib/gitlab.rb'

Gemfile

@@ -264,9 +264,6 @@ gem 'discordrb-webhooks', '~> 3.4', require: false
 gem 'jira-ruby', '~> 2.1.4'
 gem 'atlassian-jwt', '~> 0.2.0'
 
-# Flowdock integration
-gem 'flowdock', '~> 0.7'
-
 # Slack integration
 gem 'slack-messenger', '~> 2.3.4'
 

Gemfile.checksum

@@ -178,7 +178,6 @@
 {"name":"flipper","version":"0.25.0","platform":"ruby","checksum":"ccb2776752b8378bc994c9d873ccde290c090341940761b873494695ee697add"},
 {"name":"flipper-active_record","version":"0.25.0","platform":"ruby","checksum":"85a5c99465e2cc6a09e91931a9998b0dbd463cd6c80dd513129377132e3eb67f"},
 {"name":"flipper-active_support_cache_store","version":"0.25.0","platform":"ruby","checksum":"7282bf994b08d1a076b65c6f3b51e3dc04fcb00fa6e7b20089e60db25c7b531b"},
-{"name":"flowdock","version":"0.7.1","platform":"ruby","checksum":"cfa95b2ac96e5f883f6e419d7a891f76cfcc17a28c416b6b714bbdffc8dbd912"},
 {"name":"fog-aliyun","version":"0.3.3","platform":"ruby","checksum":"d0aa317f7c1473a1d684fff51699f216bb9cb78b9ee9ce55a81c9bcc93fb85ee"},
 {"name":"fog-aws","version":"3.15.0","platform":"ruby","checksum":"09752931ea0c6165b018e1a89253248d86b246645086ccf19bc44fabe3381e8c"},
 {"name":"fog-core","version":"2.1.0","platform":"ruby","checksum":"53e5d793554d7080d015ef13cd44b54027e421d924d9dba4ce3d83f95f37eda9"},

Gemfile.lock

@@ -484,9 +484,6 @@ GEM
     flipper-active_support_cache_store (0.25.0)
       activesupport (>= 4.2, < 8)
       flipper (~> 0.25.0)
-    flowdock (0.7.1)
-      httparty (~> 0.7)
-      multi_json
     fog-aliyun (0.3.3)
       fog-core
       fog-json
@@ -1649,7 +1646,6 @@ DEPENDENCIES
   flipper (~> 0.25.0)
   flipper-active_record (~> 0.25.0)
   flipper-active_support_cache_store (~> 0.25.0)
-  flowdock (~> 0.7)
   fog-aliyun (~> 0.3)
   fog-aws (~> 3.15)
   fog-core (= 2.1.0)

app/assets/javascripts/batch_comments/components/draft_note.vue

@@ -85,32 +85,25 @@ export default {
 };
 </script>
 <template>
-  <article
-    class="draft-note-component note-wrapper"
-    @mouseenter="handleMouseEnter(draft)"
-    @mouseleave="handleMouseLeave(draft)"
+  <noteable-note
+    :note="draft"
+    :line="line"
+    :discussion-root="true"
+    :class="{ 'gl-mb-0!': glFeatures.mrReviewSubmitComment }"
+    class="draft-note-component draft-note"
+    @handleEdit="handleEditing"
+    @cancelForm="handleNotEditing"
+    @updateSuccess="handleNotEditing"
+    @handleDeleteNote="deleteDraft"
+    @handleUpdateNote="update"
+    @toggleResolveStatus="toggleResolveDiscussion(draft.id)"
+    @mouseenter.native="handleMouseEnter(draft)"
+    @mouseleave.native="handleMouseLeave(draft)"
   >
-    <ul class="notes draft-notes">
-      <noteable-note
-        :note="draft"
-        :line="line"
-        :discussion-root="true"
-        :class="{ 'gl-mb-0!': glFeatures.mrReviewSubmitComment }"
-        class="draft-note"
-        @handleEdit="handleEditing"
-        @cancelForm="handleNotEditing"
-        @updateSuccess="handleNotEditing"
-        @handleDeleteNote="deleteDraft"
-        @handleUpdateNote="update"
-        @toggleResolveStatus="toggleResolveDiscussion(draft.id)"
-      >
-        <template #note-header-info>
-          <gl-badge variant="warning" class="gl-mr-2">{{ __('Pending') }}</gl-badge>
-        </template>
-      </noteable-note>
-    </ul>
-
-    <template v-if="!isEditingDraft">
+    <template #note-header-info>
+      <gl-badge variant="warning" class="gl-mr-2">{{ __('Pending') }}</gl-badge>
+    </template>
+    <template v-if="!isEditingDraft" #after-note-body>
       <div
         v-if="draftCommands"
         v-safe-html:[$options.safeHtmlConfig]="draftCommands"
@@ -134,5 +127,5 @@ export default {
         </gl-button>
       </p>
     </template>
-  </article>
+  </noteable-note>
 </template>

app/assets/javascripts/ci/runner/components/cells/runner_summary_cell.vue

@@ -6,6 +6,7 @@ import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
 import RunnerName from '../runner_name.vue';
 import RunnerTags from '../runner_tags.vue';
 import RunnerTypeBadge from '../runner_type_badge.vue';
+import RunnerJobStatusBadge from '../runner_job_status_badge.vue';
 
 import { formatJobCount } from '../../utils';
 import {
@@ -25,6 +26,7 @@ export default {
     RunnerName,
     RunnerTags,
     RunnerTypeBadge,
+    RunnerJobStatusBadge,
     RunnerUpgradeStatusIcon: () =>
       import('ee_component/ci/runner/components/runner_upgrade_status_icon.vue'),
     TooltipOnTruncate,
@@ -81,6 +83,8 @@ export default {
     </div>
 
     <div>
+      <runner-job-status-badge :job-status="runner.jobExecutionStatus" />
+
       <runner-summary-field icon="clock">
         <gl-sprintf :message="$options.i18n.I18N_LAST_CONTACT_LABEL">
           <template #timeAgo>

app/assets/javascripts/ci/runner/components/runner_job_status_badge.vue

@@ -0,0 +1,54 @@
+<script>
+import { GlBadge, GlTooltipDirective } from '@gitlab/ui';
+import {
+  I18N_JOB_STATUS_RUNNING,
+  I18N_JOB_STATUS_IDLE,
+  JOB_STATUS_RUNNING,
+  JOB_STATUS_IDLE,
+} from '../constants';
+
+export default {
+  components: {
+    GlBadge,
+  },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
+  props: {
+    jobStatus: {
+      required: false,
+      default: null,
+      type: String,
+    },
+  },
+  computed: {
+    badge() {
+      switch (this.jobStatus) {
+        case JOB_STATUS_RUNNING:
+          return {
+            classes: 'gl-text-blue-600! gl-border gl-border-blue-600!',
+            label: I18N_JOB_STATUS_RUNNING,
+          };
+        case JOB_STATUS_IDLE:
+          return {
+            classes: 'gl-text-gray-700! gl-border gl-border-gray-500!',
+            label: I18N_JOB_STATUS_IDLE,
+          };
+        default:
+          return null;
+      }
+    },
+  },
+};
+</script>
+<template>
+  <gl-badge
+    v-if="badge"
+    size="sm"
+    class="gl-mr-3 gl-bg-transparent!"
+    variant="muted"
+    :class="badge.classes"
+  >
+    {{ badge.label }}
+  </gl-badge>
+</template>

app/assets/javascripts/ci/runner/constants.js

@@ -32,6 +32,10 @@ export const I18N_STATUS_NEVER_CONTACTED = s__('Runners|Never contacted');
 export const I18N_STATUS_OFFLINE = s__('Runners|Offline');
 export const I18N_STATUS_STALE = s__('Runners|Stale');
 
+// Executor Status
+export const I18N_JOB_STATUS_RUNNING = s__('Runners|Running');
+export const I18N_JOB_STATUS_IDLE = s__('Runners|Idle');
+
 // Status help popover
 export const I18N_STATUS_POPOVER_TITLE = s__('Runners|Runner statuses');
 
@@ -134,6 +138,11 @@ export const STATUS_NEVER_CONTACTED = 'NEVER_CONTACTED';
 export const STATUS_OFFLINE = 'OFFLINE';
 export const STATUS_STALE = 'STALE';
 
+// CiRunnerJobExecutionStatus
+
+export const JOB_STATUS_RUNNING = 'RUNNING';
+export const JOB_STATUS_IDLE = 'IDLE';
+
 // CiRunnerAccessLevel
 
 export const ACCESS_LEVEL_NOT_PROTECTED = 'NOT_PROTECTED';

app/assets/javascripts/ci/runner/graphql/list/list_item_shared.fragment.graphql

@@ -12,6 +12,7 @@ fragment ListItemShared on CiRunner {
   createdAt
   contactedAt
   status(legacyMode: null)
+  jobExecutionStatus
   userPermissions {
     updateRunner
     deleteRunner

app/assets/javascripts/clusters_list/components/agent_token.vue

@@ -1,22 +1,24 @@
 <script>
-import { GlAlert, GlFormInputGroup, GlLink, GlSprintf } from '@gitlab/ui';
+import { GlAlert, GlFormInputGroup, GlLink, GlSprintf, GlIcon } from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
 import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue';
 import CodeBlock from '~/vue_shared/components/code_block.vue';
 import { generateAgentRegistrationCommand } from '../clusters_util';
-import { I18N_AGENT_TOKEN } from '../constants';
+import { I18N_AGENT_TOKEN, HELM_VERSION_POLICY_URL } from '../constants';
 
 export default {
   i18n: I18N_AGENT_TOKEN,
   advancedInstallPath: helpPagePath('user/clusters/agent/install/index', {
     anchor: 'advanced-installation-method',
   }),
+  HELM_VERSION_POLICY_URL,
   components: {
     GlAlert,
     CodeBlock,
     GlFormInputGroup,
     GlLink,
     GlSprintf,
+    GlIcon,
     ModalCopyButton,
   },
   inject: ['kasAddress', 'kasVersion'],
@@ -77,6 +79,11 @@ export default {
 
     <p>
       {{ $options.i18n.basicInstallBody }}
+      <gl-sprintf :message="$options.i18n.helmVersionText">
+        <template #link="{ content }"
+          ><gl-link :href="$options.HELM_VERSION_POLICY_URL" target="_blank"
+            >{{ content }} <gl-icon name="external-link" :size="12" /></gl-link></template
+      ></gl-sprintf>
     </p>
 
     <p class="gl-display-flex gl-align-items-flex-start">