.dockerignore

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

.gitignore

@@ -73,6 +73,7 @@ eslint-report.html
 /.gitlab_workhorse_secret
 /.gitlab_pages_secret
 /.gitlab_kas_secret
+/.gitlab_suggested_reviewers_secret
 /webpack-report/
 /crystalball/
 /test_results/

.gitlab/CODEOWNERS

@@ -18,7 +18,7 @@ GITALY_SERVER_VERSION @project_278964_bot6 @gitlab-org/maintainers/rails-backend
 /doc/**/*.md
 /doc/**/*.png
 /data/deprecations/*.yml
-/data/removals/*.yml
+/data/removals/**/*.yml
 
 ## Technical writing files that do need approval
 /data/deprecations/templates/ @marcel.amirault @gitlab-org/tw-leadership @sarahgerman

.gitlab/ci/notify.gitlab-ci.yml

@@ -59,7 +59,9 @@ notify-pipeline-failure:
       fi
     - |
       scripts/generate-failed-pipeline-slack-message.rb -i ${BROKEN_MASTER_INCIDENT_JSON} -f ${FAILED_PIPELINE_SLACK_MESSAGE_FILE};
-      curl -X POST -H 'Content-Type: application/json' --data @${FAILED_PIPELINE_SLACK_MESSAGE_FILE} "$CI_SLACK_WEBHOOK_URL";
+      curl -X POST -H 'Content-Type: application/json' --data @${FAILED_PIPELINE_SLACK_MESSAGE_FILE} "$CI_SLACK_WEBHOOK_URL" ||
+        scripts/slack ${SLACK_CHANNEL} "☠️  Broken pipeline notification failed! ☠️  See ${CI_JOB_URL}" ci_failing "Failed pipeline reporter"
+
   artifacts:
     paths:
       - ${BROKEN_MASTER_INCIDENT_JSON}

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

@@ -330,6 +330,7 @@
   - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/background_migration/**/*"
   - "{,ee/,jh/}{,spec/}lib/{,ee/,jh/}gitlab/background_migration{,_spec}.rb"
   - "{,ee/,jh/}spec/support/helpers/database/**/*"
+  - "{,ee/,jh/}spec/support/helpers/migrations_helpers/**/*"
   - "lib/gitlab/markdown_cache/active_record/**/*"
   - "lib/api/admin/batched_background_migrations.rb"
   - "spec/requests/api/admin/batched_background_migrations_spec.rb"

.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/first_hash_element_indentation.yml

@@ -2,22 +2,6 @@
 # Cop supports --autocorrect.
 Layout/FirstHashElementIndentation:
   Exclude:
-    - 'app/components/diffs/stats_component.rb'
-    - 'app/controllers/admin/ci/variables_controller.rb'
-    - 'app/controllers/admin/system_info_controller.rb'
-    - 'app/controllers/concerns/milestone_actions.rb'
-    - 'app/controllers/concerns/render_service_results.rb'
-    - 'app/controllers/concerns/sourcegraph_decorator.rb'
-    - 'app/controllers/profiles/two_factor_auths_controller.rb'
-    - 'app/controllers/projects/badges_controller.rb'
-    - 'app/controllers/repositories/lfs_locks_api_controller.rb'
-    - 'app/experiments/concerns/project_commit_count.rb'
-    - 'app/graphql/mutations/clusters/agent_tokens/create.rb'
-    - 'app/graphql/mutations/notes/create/diff_note.rb'
-    - 'app/graphql/mutations/notes/create/image_diff_note.rb'
-    - 'app/graphql/mutations/notes/create/note.rb'
-    - 'app/graphql/mutations/todos/restore_many.rb'
-    - 'app/graphql/resolvers/group_packages_resolver.rb'
     - 'app/helpers/avatars_helper.rb'
     - 'app/helpers/breadcrumbs_helper.rb'
     - 'app/helpers/broadcast_messages_helper.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/rspec/example_wording.yml

----
-# Cop supports --autocorrect.
-RSpec/ExampleWording:
-  Details: grace period
-  Exclude:
-    - 'ee/spec/graphql/types/global_id_type_spec.rb'
-    - 'spec/features/markdown/copy_as_gfm_spec.rb'
-    - 'spec/lib/gitlab/auth/ldap/config_spec.rb'
-    - 'spec/models/concerns/schedulable_spec.rb'
-    - 'spec/models/container_repository_spec.rb'
-    - 'spec/scripts/lib/glfm/shared_spec.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'

GITALY_SERVER_VERSION

-86eec1d558bd631ee9fd8ef8fb30deaf16b159ce
+22722e29aa21a554ed1e729f9b23a485929ac4cf

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"},
@@ -414,7 +413,7 @@
 {"name":"pact-mock_service","version":"3.10.0","platform":"ruby","checksum":"898ec3b8d96f1934d15941c701ca7d5fef5ccff32022d9a196fb82073cd95e27"},
 {"name":"pact-support","version":"1.18.1","platform":"ruby","checksum":"4a25961c8b1c4132e433a8eaa838b1e6914c6d3aae48eee705b9860a5e8b0476"},
 {"name":"parallel","version":"1.22.1","platform":"ruby","checksum":"ebdf1f0c51f182df38522f70ba770214940bef998cdb6e00f36492b29699761f"},
-{"name":"parser","version":"3.1.2.1","platform":"ruby","checksum":"57e49821b52d5fe7baffaca44ed77e9754688c9bbc68443b5293a722fdb161e0"},
+{"name":"parser","version":"3.1.3.0","platform":"ruby","checksum":"4593da6a6c0dc1b0a0b47b68aa79c36655e19b9d8636f7c27d02a76cb7840e9f"},
 {"name":"parslet","version":"1.8.2","platform":"ruby","checksum":"08d1ab3721cd3f175bfbee8788b2ddff71f92038f2d69bd65454c22bb9fbd98a"},
 {"name":"pastel","version":"0.8.0","platform":"ruby","checksum":"481da9fb7d2f6e6b1a08faf11fa10363172dc40fd47848f096ae21209f805a75"},
 {"name":"peek","version":"1.1.0","platform":"ruby","checksum":"d6501ead8cde46d8d8ed0d59eb6f0ba713d0a41c11a2c4a81447b2dce37b3ecc"},

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
@@ -1061,7 +1058,7 @@ GEM
       expgen (~> 0.1)
       rainbow (~> 3.1.1)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.1.3.0)
       ast (~> 2.4.1)
     parslet (1.8.2)
     pastel (0.8.0)
@@ -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/admin_runner_show/admin_runner_show_app.vue

 <script>
-import { GlBadge, GlTabs, GlTab, GlTooltipDirective } from '@gitlab/ui';
+import { GlBadge, GlTabs, GlTab } from '@gitlab/ui';
+import VueRouter from 'vue-router';
 import { createAlert, VARIANT_SUCCESS } from '~/flash';
 import { TYPE_CI_RUNNER } from '~/graphql_shared/constants';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
@@ -11,11 +12,28 @@ import RunnerPauseButton from '../components/runner_pause_button.vue';
 import RunnerHeader from '../components/runner_header.vue';
 import RunnerDetails from '../components/runner_details.vue';
 import RunnerJobs from '../components/runner_jobs.vue';
-import { I18N_DETAILS, I18N_FETCH_ERROR } from '../constants';
+import { I18N_DETAILS, I18N_JOBS, I18N_FETCH_ERROR } from '../constants';
 import runnerQuery from '../graphql/show/runner.query.graphql';
 import { captureException } from '../sentry_utils';
 import { saveAlertToLocalStorage } from '../local_storage_alert/save_alert_to_local_storage';
 
+const ROUTE_DETAILS = 'details';
+const ROUTE_JOBS = 'jobs';
+
+const routes = [
+  {
+    path: '/',
+    name: ROUTE_DETAILS,
+    component: RunnerDetails,
+  },
+  {
+    path: '/jobs',
+    name: ROUTE_JOBS,
+    component: RunnerJobs,
+  },
+  { path: '*', redirect: { name: ROUTE_DETAILS } },
+];
+
 export default {
   name: 'AdminRunnerShowApp',
   components: {
@@ -26,12 +44,10 @@ export default {
     RunnerEditButton,
     RunnerPauseButton,
     RunnerHeader,
-    RunnerDetails,
-    RunnerJobs,
-  },
-  directives: {
-    GlTooltip: GlTooltipDirective,
   },
+  router: new VueRouter({
+    routes,
+  }),
   props: {
     runnerId: {
       type: String,
@@ -72,11 +88,17 @@ export default {
     jobCount() {
       return formatJobCount(this.runner?.jobCount);
     },
+    tabIndex() {
+      return routes.findIndex(({ name }) => name === this.$route.name);
+    },
   },
   errorCaptured(error) {
     this.reportToSentry(error);
   },
   methods: {
+    goTo(name) {
+      this.$router.push({ name });
+    },
     reportToSentry(error) {
       captureException({ error, component: this.$options.name });
     },
@@ -85,7 +107,10 @@ export default {
       redirectTo(this.runnersPath);
     },
   },
+  ROUTE_DETAILS,
+  ROUTE_JOBS,
   I18N_DETAILS,
+  I18N_JOBS,
 };
 </script>
 <template>
@@ -98,15 +123,13 @@ export default {
       </template>
     </runner-header>
 
-    <gl-tabs>
-      <gl-tab>
+    <gl-tabs :value="tabIndex">
+      <gl-tab @click="goTo($options.ROUTE_DETAILS)">
         <template #title>{{ $options.I18N_DETAILS }}</template>
-
-        <runner-details v-if="runner" :runner="runner" />
       </gl-tab>
-      <gl-tab>
+      <gl-tab @click="goTo($options.ROUTE_JOBS)">
         <template #title>
-          {{ s__('Runners|Jobs') }}
+          {{ $options.I18N_JOBS }}
           <gl-badge
             v-if="jobCount"
             data-testid="job-count-badge"
@@ -116,9 +139,9 @@ export default {
             {{ jobCount }}
           </gl-badge>
         </template>
-
-        <runner-jobs v-if="runner" :runner="runner" />
       </gl-tab>
+
+      <router-view v-if="runner" :runner="runner" />
     </gl-tabs>
   </div>
 </template>

app/assets/javascripts/ci/runner/admin_runner_show/index.js

 import Vue from 'vue';
 import VueApollo from 'vue-apollo';
+import VueRouter from 'vue-router';
 import createDefaultClient from '~/lib/graphql';
 import { showAlertFromLocalStorage } from '../local_storage_alert/show_alert_from_local_storage';
 import AdminRunnerShowApp from './admin_runner_show_app.vue';
 
 Vue.use(VueApollo);
+Vue.use(VueRouter);
 
 export const initAdminRunnerShow = (selector = '#js-admin-runner-show') => {
   showAlertFromLocalStorage();

app/assets/javascripts/ci/runner/admin_runners/admin_runners_app.vue

@@ -69,6 +69,9 @@ export default {
   apollo: {
     runners: {
       query: allRunnersQuery,
+      context: {
+        isSingleRequest: true,
+      },
       fetchPolicy: fetchPolicies.NETWORK_ONLY,
       variables() {
         return this.variables;