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>2023-07-12 12:09:19 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-07-12 12:09:19 +0300
commit447c1bba679be70f9c311326ca03923c6988f127 (patch)
treefeef28edad5bf8c6b6f0be27f929ae6b6119e8a1 /app/components
parent09acddd7fd2b59afa69eca95b1e34739e1f1b31b (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/components')
-rw-r--r--app/components/pajamas/banner_component.html.haml2
-rw-r--r--app/components/pajamas/banner_component.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/components/pajamas/banner_component.html.haml b/app/components/pajamas/banner_component.html.haml
index 4fa2ed09cd3..c2eeae2d8c9 100644
--- a/app/components/pajamas/banner_component.html.haml
+++ b/app/components/pajamas/banner_component.html.haml
@@ -14,7 +14,7 @@
- if primary_action?
= primary_action
- else
- = link_to @button_text, @button_link, { **@button_options, class: 'btn btn-md btn-confirm gl-button js-close-callout' }
+ = link_button_to @button_text, @button_link, **@button_options, class: 'js-close-callout', variant: :confirm
- actions.each do |action|
= action
diff --git a/app/components/pajamas/banner_component.rb b/app/components/pajamas/banner_component.rb
index 6082762f22c..1a03f3fdd58 100644
--- a/app/components/pajamas/banner_component.rb
+++ b/app/components/pajamas/banner_component.rb
@@ -49,7 +49,7 @@ module Pajamas
end
end
- delegate :sprite_icon, to: :helpers
+ delegate :sprite_icon, :link_button_to, to: :helpers
renders_one :title
renders_one :illustration