Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-30 18:08:48 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-30 18:08:48 +0300
commit340f15b402eec795fca0e0f29709baef0ecf14a7 (patch)
tree6a7eac5d394f4002b9e5b0c9da12bc12e59ed59c /app/presenters/alert_management
parent1e254d9f5a46a85c9bb6f24da8265a30fd388db4 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/presenters/alert_management')
-rw-r--r--app/presenters/alert_management/alert_presenter.rb2
-rw-r--r--app/presenters/alert_management/prometheus_alert_presenter.rb4
2 files changed, 6 insertions, 0 deletions
diff --git a/app/presenters/alert_management/alert_presenter.rb b/app/presenters/alert_management/alert_presenter.rb
index 36294c88b8c..efd403aa21c 100644
--- a/app/presenters/alert_management/alert_presenter.rb
+++ b/app/presenters/alert_management/alert_presenter.rb
@@ -37,6 +37,8 @@ module AlertManagement
MARKDOWN
end
+ def metrics_dashboard_url; end
+
private
attr_reader :alert, :project
diff --git a/app/presenters/alert_management/prometheus_alert_presenter.rb b/app/presenters/alert_management/prometheus_alert_presenter.rb
index b3a27d0632f..3bcc98e6784 100644
--- a/app/presenters/alert_management/prometheus_alert_presenter.rb
+++ b/app/presenters/alert_management/prometheus_alert_presenter.rb
@@ -2,6 +2,10 @@
module AlertManagement
class PrometheusAlertPresenter < AlertManagement::AlertPresenter
+ def metrics_dashboard_url
+ alerting_alert.metrics_dashboard_url
+ end
+
private
def alert_markdown