Commit 2064b8d3 authored by David O'Regan's avatar David O'Regan

Merge branch 'yo-btn-default-whooks' into 'master'

Apply new GitLab UI buttons in the webhooks list

See merge request gitlab-org/gitlab!51977
parents 1b3d1878 9031d9a5
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
= hook.enable_ssl_verification ? _('enabled') : _('disabled') = hook.enable_ssl_verification ? _('enabled') : _('disabled')
.col-md-4.col-lg-5.text-right-md.gl-mt-2 .col-md-4.col-lg-5.text-right-md.gl-mt-2
%span>= render 'shared/web_hooks/test_button', hook: hook, button_class: 'btn-sm gl-mr-3' %span>= render 'shared/web_hooks/test_button', hook: hook, button_class: 'btn-sm btn-default gl-mr-3'
%span>= link_to _('Edit'), edit_hook_path(hook), class: 'gl-button btn btn-sm gl-mr-3' %span>= link_to _('Edit'), edit_hook_path(hook), class: 'btn gl-button btn-default btn-sm gl-mr-3'
= link_to _('Delete'), destroy_hook_path(hook), data: { confirm: _('Are you sure?') }, method: :delete, class: 'gl-button btn btn-sm' = link_to _('Delete'), destroy_hook_path(hook), data: { confirm: _('Are you sure?') }, method: :delete, class: 'btn gl-button btn-default btn-sm'
...@@ -2,11 +2,12 @@ ...@@ -2,11 +2,12 @@
- hook = local_assigns.fetch(:hook) - hook = local_assigns.fetch(:hook)
- triggers = hook.class.triggers - triggers = hook.class.triggers
.hook-test-button.dropdown.inline> .hook-test-button.dropdown.gl-new-dropdown.inline>
%button.btn.gl-button{ 'data-toggle' => 'dropdown', class: button_class } %button.btn.gl-button{ 'data-toggle' => 'dropdown', class: button_class }
= _('Test') = _('Test')
= sprite_icon('chevron-down') = sprite_icon('chevron-down')
%ul.dropdown-menu.dropdown-menu-right{ role: 'menu' } %ul.dropdown-menu.dropdown-menu-right{ role: 'menu' }
.gl-new-dropdown-inner
- triggers.each_value do |event| - triggers.each_value do |event|
%li %li.gl-new-dropdown-item
= link_to_test_hook(hook, event) = link_to_test_hook(hook, event)
---
title: Apply new GitLab UI buttons in the webhooks list
merge_request: 51977
author: Yogi (@yo)
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment