Add latest changes from gitlab-org/gitlab@master

6 files changed, 29 insertions, 5 deletions

diff --git a/app/assets/javascripts/error_tracking/components/error_details.vue b/app/assets/javascripts/error_tracking/components/error_details.vue
index 43e18486ae9..3d3447012db 100644
--- a/app/assets/javascripts/error_tracking/components/error_details.vue
+++ b/app/assets/javascripts/error_tracking/components/error_details.vue
@@ -2,7 +2,7 @@
 import { mapActions, mapGetters, mapState } from 'vuex';
 import dateFormat from 'dateformat';
 import createFlash from '~/flash';
-import { GlFormInput, GlLink, GlLoadingIcon, GlBadge } from '@gitlab/ui';
+import { GlButton, GlFormInput, GlLink, GlLoadingIcon, GlBadge } from '@gitlab/ui';
 import { __, sprintf, n__ } from '~/locale';
 import LoadingButton from '~/vue_shared/components/loading_button.vue';
 import Icon from '~/vue_shared/components/icon.vue';
@@ -17,6 +17,7 @@ import query from '../queries/details.query.graphql';
 export default {
   components: {
     LoadingButton,
+    GlButton,
     GlFormInput,
     GlLink,
     GlLoadingIcon,
@@ -188,6 +189,15 @@ export default {
             :loading="updatingResolveStatus"
             @click="updateIssueStatus('resolved')"
           />
+          <gl-button
+            v-if="error.gitlab_issue"
+            class="ml-2"
+            data-qa-selector="view_issue_button"
+            :href="error.gitlab_issue"
+            variant="success"
+          >
+            {{ __('View issue') }}
+          </gl-button>
           <form
             ref="sentryIssueForm"
             :action="projectIssuesPath"
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index 72be53c7af0..9eca324f0fc 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -16,6 +16,8 @@ module Ci
       archive: nil,
       metadata: nil,
       trace: nil,
+      metrics_referee: nil,
+      network_referee: nil,
       junit: 'junit.xml',
       codequality: 'gl-code-quality-report.json',
       sast: 'gl-sast-report.json',
@@ -37,6 +39,8 @@ module Ci
     REPORT_TYPES = {
       junit: :gzip,
       metrics: :gzip,
+      metrics_referee: :gzip,
+      network_referee: :gzip,
 
       # All these file formats use `raw` as we need to store them uncompressed
       # for Frontend to fetch the files and do analysis
@@ -108,7 +112,9 @@ module Ci
       license_management: 10, ## EE-specific
       license_scanning: 101, ## EE-specific till 13.0
       performance: 11, ## EE-specific
-      metrics: 12 ## EE-specific
+      metrics: 12, ## EE-specific
+      metrics_referee: 13, ## runner referees
+      network_referee: 14 ## runner referees
     }
 
     enum file_format: {
diff --git a/app/models/diff_viewer/collapsed.rb b/app/models/diff_viewer/collapsed.rb
new file mode 100644
index 00000000000..b533bd8b88d
--- /dev/null
+++ b/app/models/diff_viewer/collapsed.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module DiffViewer
+  class Collapsed < Base
+    include Simple
+    include Static
+
+    self.partial_name = 'collapsed'
+  end
+end
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index 1f311e9a4a4..01aa6f06b98 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -44,7 +44,7 @@
         - @group_notifications.each do |setting|
           = render 'group_settings', setting: setting, group: setting.source
       %h5
-        = _('Projects (%{count})') % { count: @project_notifications.count }
+        = _('Projects (%{count})') % { count: @project_notifications.size }
       %p.account-well
         = _('To specify the notification level per project of a group you belong to, you need to visit project page and change notification level there.')
       .append-bottom-default
diff --git a/app/views/projects/diffs/_viewer.html.haml b/app/views/projects/diffs/_viewer.html.haml
index 5c4d1760871..37ff03b4a59 100644
--- a/app/views/projects/diffs/_viewer.html.haml
+++ b/app/views/projects/diffs/_viewer.html.haml
@@ -3,8 +3,6 @@
 .diff-viewer{ data: { type: viewer.type }, class: ('hidden' if hidden) }
   - if viewer.render_error
     = render 'projects/diffs/render_error', viewer: viewer
-  - elsif viewer.collapsed?
-    = render 'projects/diffs/collapsed', viewer: viewer
   - else
     - viewer.prepare!
 
diff --git a/app/views/projects/diffs/_collapsed.html.haml b/app/views/projects/diffs/viewers/_collapsed.html.haml
index 94dcda38bd6..94dcda38bd6 100644
--- a/app/views/projects/diffs/_collapsed.html.haml
+++ b/app/views/projects/diffs/viewers/_collapsed.html.haml