diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-08 18:13:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-08 18:13:15 +0000 |
| commit | 3a563d7c1e15023f205d2a357e5d8a38a3b53ecc (patch) | |
| tree | b7979f23104af9ed6d0ef077ce9964ba5d7ad65e /app/components | |
| parent | dcc56fe601580b5d8f6c3da32550c6523f2baff3 (diff) | |
| download | gitlab-ce-3a563d7c1e15023f205d2a357e5d8a38a3b53ecc.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/components')
| -rw-r--r-- | app/components/diffs/base_component.rb | 2 | ||||
| -rw-r--r-- | app/components/diffs/overflow_warning_component.html.haml | 4 | ||||
| -rw-r--r-- | app/components/layouts/horizontal_section_component.rb | 2 | ||||
| -rw-r--r-- | app/components/pajamas/component.rb | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/app/components/diffs/base_component.rb b/app/components/diffs/base_component.rb index 9e1347d1e84..f5bc59cb314 100644 --- a/app/components/diffs/base_component.rb +++ b/app/components/diffs/base_component.rb @@ -2,6 +2,8 @@ module Diffs class BaseComponent < ViewComponent::Base + warn_on_deprecated_slot_setter + # To make converting the partials to components easier, # we delegate all missing methods to the helpers, # where they probably are. diff --git a/app/components/diffs/overflow_warning_component.html.haml b/app/components/diffs/overflow_warning_component.html.haml index bfc2f3f23a7..19048c5058e 100644 --- a/app/components/diffs/overflow_warning_component.html.haml +++ b/app/components/diffs/overflow_warning_component.html.haml @@ -1,9 +1,9 @@ = render Pajamas::AlertComponent.new(title: _('Some changes are not shown.'), variant: :warning, alert_options: { class: 'gl-mb-5', data: { testid: "too-many-changes-alert" } }) do |c| - = c.body do + = c.with_body do = message - = c.actions do + = c.with_actions do = diff_link = patch_link diff --git a/app/components/layouts/horizontal_section_component.rb b/app/components/layouts/horizontal_section_component.rb index 48c960f17d9..caeaa1782c0 100644 --- a/app/components/layouts/horizontal_section_component.rb +++ b/app/components/layouts/horizontal_section_component.rb @@ -2,6 +2,8 @@ module Layouts class HorizontalSectionComponent < ViewComponent::Base + warn_on_deprecated_slot_setter + # @param [Boolean] border # @param [Hash] options def initialize(border: true, options: {}) diff --git a/app/components/pajamas/component.rb b/app/components/pajamas/component.rb index 3b1826a646c..a7b45ffd7fd 100644 --- a/app/components/pajamas/component.rb +++ b/app/components/pajamas/component.rb @@ -2,6 +2,8 @@ module Pajamas class Component < ViewComponent::Base + warn_on_deprecated_slot_setter + private # Filter a given a value against a list of allowed values |