7 files changed, 110 insertions, 21 deletions

diff --git a/app/assets/javascripts/design_management/pages/design/index.vue b/app/assets/javascripts/design_management/pages/design/index.vue
index d51bdc4687a..3e56379dc47 100644
--- a/app/assets/javascripts/design_management/pages/design/index.vue
+++ b/app/assets/javascripts/design_management/pages/design/index.vue
@@ -35,6 +35,7 @@ import {
   UPDATE_NOTE_ERROR,
   designDeletionError,
 } from '../../utils/error_messages';
+import { trackDesignDetailView } from '../../utils/tracking';
 import { DESIGNS_ROUTE_NAME } from '../../router/constants';
 
 export default {
@@ -257,8 +258,21 @@ export default {
         query: this.$route.query,
       });
     },
+    trackEvent() {
+      trackDesignDetailView(
+        'issue-design-collection',
+        this.$route.query.version || this.latestVersionId,
+        this.isLatestVersion,
+      );
+    },
+  },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.trackEvent();
+    });
   },
   beforeRouteUpdate(to, from, next) {
+    this.trackEvent();
     this.closeCommentForm();
     next();
   },
diff --git a/app/assets/javascripts/design_management/utils/tracking.js b/app/assets/javascripts/design_management/utils/tracking.js
new file mode 100644
index 00000000000..c94aa83ecc0
--- /dev/null
+++ b/app/assets/javascripts/design_management/utils/tracking.js
@@ -0,0 +1,22 @@
+import Tracking from '~/tracking';
+
+function assembleDesignPayload(payloadArr) {
+  return {
+    value: {
+      'internal-object-refrerer': payloadArr[0],
+      'version-number': payloadArr[1],
+      'current-version': payloadArr[2],
+    },
+  };
+}
+
+// Tracking Constants
+const DESIGN_TRACKING_PAGE_NAME = 'projects:issues:design';
+
+// eslint-disable-next-line import/prefer-default-export
+export function trackDesignDetailView(refrerer = '', designVersion = 1, latestVersion = false) {
+  Tracking.event(DESIGN_TRACKING_PAGE_NAME, 'design_viewed', {
+    label: 'design_viewed',
+    ...assembleDesignPayload([refrerer, designVersion, latestVersion]),
+  });
+}
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 6eb010c4882..d759983dafa 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -86,11 +86,13 @@ class Projects::IssuesController < Projects::ApplicationController
     )
     build_params = issue_params.merge(
       merge_request_to_resolve_discussions_of: params[:merge_request_to_resolve_discussions_of],
-      discussion_to_resolve: params[:discussion_to_resolve]
+      discussion_to_resolve: params[:discussion_to_resolve],
+      confidential: !!Gitlab::Utils.to_boolean(params[:issue][:confidential])
     )
     service = Issues::BuildService.new(project, current_user, build_params)
 
     @issue = @noteable = service.execute
+
     @merge_request_to_resolve_discussions_of = service.merge_request_to_resolve_discussions_of
     @discussion_to_resolve = service.discussions_to_resolve.first if params[:discussion_to_resolve]
 
diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb
index 17f5a400eec..b2bb32239aa 100644
--- a/app/helpers/projects/alert_management_helper.rb
+++ b/app/helpers/projects/alert_management_helper.rb
@@ -7,7 +7,7 @@ module Projects::AlertManagementHelper
       'enable-alert-management-path' => edit_project_service_path(project, AlertsService),
       'empty-alert-svg-path' => image_path('illustrations/alert-management-empty-state.svg'),
       'user-can-enable-alert-management' => can?(current_user, :admin_project, project).to_s,
-      'alert-management-enabled' => Feature.enabled?(:alert_management_minimal, project).to_s
+      'alert-management-enabled' => (!!project.alerts_service_activated?).to_s
     }
   end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 5f614d30e2d..9eac01c3c06 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1436,20 +1436,12 @@ class Project < ApplicationRecord
 
   # Expires various caches before a project is renamed.
   def expire_caches_before_rename(old_path)
-    repo = Repository.new(old_path, self, shard: repository_storage)
-    wiki = Repository.new("#{old_path}.wiki", self, shard: repository_storage, repo_type: Gitlab::GlRepository::WIKI)
-    design = Repository.new("#{old_path}#{Gitlab::GlRepository::DESIGN.path_suffix}", self, shard: repository_storage, repo_type: Gitlab::GlRepository::DESIGN)
+    project_repo = Repository.new(old_path, self, shard: repository_storage)
+    wiki_repo = Repository.new("#{old_path}#{Gitlab::GlRepository::WIKI.path_suffix}", self, shard: repository_storage, repo_type: Gitlab::GlRepository::WIKI)
+    design_repo = Repository.new("#{old_path}#{Gitlab::GlRepository::DESIGN.path_suffix}", self, shard: repository_storage, repo_type: Gitlab::GlRepository::DESIGN)
 
-    if repo.exists?
-      repo.before_delete
-    end
-
-    if wiki.exists?
-      wiki.before_delete
-    end
-
-    if design.exists?
-      design.before_delete
+    [project_repo, wiki_repo, design_repo].each do |repo|
+      repo.before_delete if repo.exists?
     end
   end
 
diff --git a/app/presenters/projects/prometheus/alert_presenter.rb b/app/presenters/projects/prometheus/alert_presenter.rb
index c03925c0871..2114e06a8c5 100644
--- a/app/presenters/projects/prometheus/alert_presenter.rb
+++ b/app/presenters/projects/prometheus/alert_presenter.rb
@@ -7,6 +7,7 @@ module Projects
       GENERIC_ALERT_SUMMARY_ANNOTATIONS = %w(monitoring_tool service hosts).freeze
       MARKDOWN_LINE_BREAK = "  \n".freeze
       INCIDENT_LABEL_NAME = IncidentManagement::CreateIssueService::INCIDENT_LABEL[:title].freeze
+      METRIC_TIME_WINDOW = 30.minutes
 
       def full_title
         [environment_name, alert_title].compact.join(': ')
@@ -119,9 +120,63 @@ module Projects
         Array(hosts.value).join(' ')
       end
 
-      def metric_embed_for_alert; end
+      def metric_embed_for_alert
+        url = embed_url_for_gitlab_alert || embed_url_for_self_managed_alert
+
+        "\n[](#{url})" if url
+      end
+
+      def embed_url_for_gitlab_alert
+        return unless gitlab_alert
+
+        metrics_dashboard_project_prometheus_alert_url(
+          project,
+          gitlab_alert.prometheus_metric_id,
+          environment_id: environment.id,
+          **alert_embed_window_params(embed_time)
+        )
+      end
+
+      def embed_url_for_self_managed_alert
+        return unless environment && full_query && title
+
+        metrics_dashboard_project_environment_url(
+          project,
+          environment,
+          embed_json: dashboard_for_self_managed_alert.to_json,
+          **alert_embed_window_params(embed_time)
+        )
+      end
+
+      def embed_time
+        starts_at ? Time.rfc3339(starts_at) : Time.current
+      end
+
+      def alert_embed_window_params(time)
+        {
+          start: format_embed_timestamp(time - METRIC_TIME_WINDOW),
+          end: format_embed_timestamp(time + METRIC_TIME_WINDOW)
+        }
+      end
+
+      def format_embed_timestamp(time)
+        time.utc.strftime('%FT%TZ')
+      end
+
+      def dashboard_for_self_managed_alert
+        {
+          panel_groups: [{
+            panels: [{
+              type: 'line-graph',
+              title: title,
+              y_label: y_label,
+              metrics: [{
+                query_range: full_query
+              }]
+            }]
+          }]
+        }
+      end
     end
   end
 end
-
-Projects::Prometheus::AlertPresenter.prepend_if_ee('EE::Projects::Prometheus::AlertPresenter')
diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb
index daef468987e..e62315de5f9 100644
--- a/app/services/issues/build_service.rb
+++ b/app/services/issues/build_service.rb
@@ -65,15 +65,19 @@ module Issues
     private
 
     def whitelisted_issue_params
+      base_params = [:title, :description, :confidential]
+      admin_params = [:milestone_id]
+
       if can?(current_user, :admin_issue, project)
-        params.slice(:title, :description, :milestone_id)
+        params.slice(*(base_params + admin_params))
       else
-        params.slice(:title, :description)
+        params.slice(*base_params)
       end
     end
 
     def build_issue_params
-      issue_params_with_info_from_discussions.merge(whitelisted_issue_params)
+      { author: current_user }.merge(issue_params_with_info_from_discussions)
+        .merge(whitelisted_issue_params)
     end
   end
 end