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:
Diffstat (limited to 'app/views/shared/web_hooks')
-rw-r--r--app/views/shared/web_hooks/_form.html.haml2
-rw-r--r--app/views/shared/web_hooks/_index.html.haml2
-rw-r--r--app/views/shared/web_hooks/_web_hook_disabled_alert.html.haml13
3 files changed, 15 insertions, 2 deletions
diff --git a/app/views/shared/web_hooks/_form.html.haml b/app/views/shared/web_hooks/_form.html.haml
index fe68244f1da..afe72767b9a 100644
--- a/app/views/shared/web_hooks/_form.html.haml
+++ b/app/views/shared/web_hooks/_form.html.haml
@@ -1,4 +1,4 @@
-= form_errors(hook, pajamas_alert: true)
+= form_errors(hook)
.form-group
= form.label :url, s_('Webhooks|URL'), class: 'label-bold'
diff --git a/app/views/shared/web_hooks/_index.html.haml b/app/views/shared/web_hooks/_index.html.haml
index 5d07b0f95ab..5ec82ad6702 100644
--- a/app/views/shared/web_hooks/_index.html.haml
+++ b/app/views/shared/web_hooks/_index.html.haml
@@ -1,5 +1,5 @@
%hr
-.card
+.card#webhooks-index
.card-header
%h5
= hook_class.underscore.humanize.titleize.pluralize
diff --git a/app/views/shared/web_hooks/_web_hook_disabled_alert.html.haml b/app/views/shared/web_hooks/_web_hook_disabled_alert.html.haml
new file mode 100644
index 00000000000..d9155b397b8
--- /dev/null
+++ b/app/views/shared/web_hooks/_web_hook_disabled_alert.html.haml
@@ -0,0 +1,13 @@
+- return unless show_project_hook_failed_callout?(project: @project)
+
+- content_for :after_flash_content do
+ = render Pajamas::AlertComponent.new(variant: :danger,
+ title: s_('Webhooks|Webhook disabled'),
+ alert_options: { class: 'gl-my-4 js-web-hook-disabled-callout',
+ data: { feature_id: Users::CalloutsHelper::WEB_HOOK_DISABLED, dismiss_endpoint: project_callouts_path, project_id: @project.id, defer_links: 'true'} }) do |c|
+ = c.body do
+ = s_('Webhooks|A webhook in this project was automatically disabled after being retried multiple times.')
+ = succeed '.' do
+ = link_to _('Learn more'), help_page_path('user/project/integrations/webhooks', anchor: 'troubleshoot-webhooks'), target: '_blank', rel: 'noopener noreferrer'
+ = c.actions do
+ = link_to s_('Webhooks|Go to webhooks'), project_hooks_path(@project, anchor: 'webhooks-index'), class: 'btn gl-alert-action btn-confirm gl-button'