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-05-17 19:05:49 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-17 19:05:49 +0300
commit43a25d93ebdabea52f99b05e15b06250cd8f07d7 (patch)
treedceebdc68925362117480a5d672bcff122fb625b /app/components
parent20c84b99005abd1c82101dfeff264ac50d2df211 (diff)
Add latest changes from gitlab-org/gitlab@16-0-stable-eev16.0.0-rc42
Diffstat (limited to 'app/components')
-rw-r--r--app/components/diffs/base_component.rb2
-rw-r--r--app/components/diffs/overflow_warning_component.html.haml6
-rw-r--r--app/components/diffs/overflow_warning_component.rb4
-rw-r--r--app/components/layouts/horizontal_section_component.rb2
-rw-r--r--app/components/pajamas/component.rb2
5 files changed, 11 insertions, 5 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 551d995cb22..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: _('Too many changes to show.'),
+= 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/diffs/overflow_warning_component.rb b/app/components/diffs/overflow_warning_component.rb
index 5123809cfdc..34882885027 100644
--- a/app/components/diffs/overflow_warning_component.rb
+++ b/app/components/diffs/overflow_warning_component.rb
@@ -54,8 +54,8 @@ module Diffs
def message_text
_(
- "To preserve performance only %{strong_open}%{display_size} " \
- "of %{real_size}%{strong_close} files are displayed."
+ "For a faster browsing experience, only %{strong_open}%{display_size} of %{real_size}%{strong_close} " \
+ "files are shown. Download one of the files below to see all changes."
)
end
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