diff options
Diffstat (limited to 'app/views/shared/web_hooks')
-rw-r--r-- | app/views/shared/web_hooks/_hook_errors.html.haml | 6 | ||||
-rw-r--r-- | app/views/shared/web_hooks/_index.html.haml | 4 | ||||
-rw-r--r-- | app/views/shared/web_hooks/_web_hook_disabled_alert.html.haml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/views/shared/web_hooks/_hook_errors.html.haml b/app/views/shared/web_hooks/_hook_errors.html.haml index 098cc19c435..0e5f6d844cd 100644 --- a/app/views/shared/web_hooks/_hook_errors.html.haml +++ b/app/views/shared/web_hooks/_hook_errors.html.haml @@ -8,12 +8,12 @@ root_namespace: hook.parent.root_namespace.path } = render Pajamas::AlertComponent.new(title: s_('Webhooks|Webhook rate limit has been reached'), variant: :danger) do |c| - = c.body do + - c.with_body do = s_("Webhooks|Webhooks for %{root_namespace} are now disabled because they've been triggered more than %{limit} times per minute. They'll be automatically re-enabled in the next minute.").html_safe % placeholders - elsif hook.permanently_disabled? = render Pajamas::AlertComponent.new(title: s_('Webhooks|Webhook failed to connect'), variant: :danger) do |c| - = c.body do + - c.with_body do = s_('Webhooks|The webhook failed to connect, and is disabled. To re-enable it, check %{strong_start}Recent events%{strong_end} for error details, then test your settings below.').html_safe % { strong_start: strong_start, strong_end: strong_end } - elsif hook.temporarily_disabled? - help_path = help_page_path('user/project/integrations/webhooks', anchor: 'webhook-fails-or-multiple-webhook-requests-are-triggered') @@ -24,5 +24,5 @@ help_link_end: link_end } = render Pajamas::AlertComponent.new(title: s_('Webhooks|Webhook fails to connect'), variant: :warning) do |c| - = c.body do + - c.with_body do = s_('Webhooks|The webhook %{help_link_start}failed to connect%{help_link_end}, and will retry in %{retry_time}. To re-enable it, check %{strong_start}Recent events%{strong_end} for error details, then test your settings below.').html_safe % placeholders diff --git a/app/views/shared/web_hooks/_index.html.haml b/app/views/shared/web_hooks/_index.html.haml index 868633143cd..8a81e697a59 100644 --- a/app/views/shared/web_hooks/_index.html.haml +++ b/app/views/shared/web_hooks/_index.html.haml @@ -1,9 +1,9 @@ %hr = render Pajamas::CardComponent.new(card_options: { id: 'webhooks-index' }, body_options: { class: 'gl-py-0'}) do |c| - - c.header do + - c.with_header do = hook_class.underscore.humanize.titleize.pluralize (#{hooks.size}) - - c.body do + - c.with_body do - if hooks.any? %ul.content-list - hooks.each do |hook| 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 index f8e2dc3d8dd..cbbb2f51fd5 100644 --- a/app/views/shared/web_hooks/_web_hook_disabled_alert.html.haml +++ b/app/views/shared/web_hooks/_web_hook_disabled_alert.html.haml @@ -5,9 +5,9 @@ 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 + - c.with_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: 'troubleshooting'), target: '_blank', rel: 'noopener noreferrer' - = c.actions do + - c.with_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' |