diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 00:08:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 00:08:11 +0000 |
| commit | 93dcf45d441bc884b167f4338380c8c888e9b86f (patch) | |
| tree | f55e8c1d39013380d1ff7d2a4e3cca537a35192a /app/views | |
| parent | 0e68afab211a172b862a7acc774e1eda5da8e471 (diff) | |
| download | gitlab-ce-93dcf45d441bc884b167f4338380c8c888e9b86f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
3 files changed, 11 insertions, 1 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index 588ee63c56f..b3acf3320d3 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -162,4 +162,6 @@ = render_if_exists "groups/ee/settings_nav" + = render_if_exists "groups/ee/administration_nav" + = render 'shared/sidebar_toggle_button' diff --git a/app/views/projects/services/prometheus/_external_alerts.html.haml b/app/views/projects/services/prometheus/_external_alerts.html.haml new file mode 100644 index 00000000000..24ff0cc88a3 --- /dev/null +++ b/app/views/projects/services/prometheus/_external_alerts.html.haml @@ -0,0 +1,8 @@ +- return unless can?(current_user, :read_prometheus_alerts, @project) +- return unless @service.manual_configuration? + +- notify_url = notify_project_prometheus_alerts_url(@project, format: :json) +- authorization_key = @project.alerting_setting.try(:token) +- learn_more_url = help_page_path('user/project/integrations/prometheus', anchor: 'external-prometheus-instances') + +#js-settings-prometheus-alerts{ data: { notify_url: notify_url, authorization_key: authorization_key, change_key_url: reset_alerting_token_project_settings_operations_path(@project), learn_more_url: learn_more_url } } diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index c719661d8e8..926671845c7 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -6,4 +6,4 @@ .row.append-bottom-default.prometheus-metrics-monitoring.js-prometheus-metrics-monitoring = render 'projects/services/prometheus/metrics', project: @project -= render_if_exists 'projects/services/prometheus/external_alerts', project: @project += render 'projects/services/prometheus/external_alerts', project: @project |