Add latest changes from gitlab-org/gitlab@master

3 files changed, 33 insertions, 1 deletions

diff --git a/app/components/layouts/horizontal_section_component.haml b/app/components/layouts/horizontal_section_component.haml
new file mode 100644
index 00000000000..4b5b4f1d0df
--- /dev/null
+++ b/app/components/layouts/horizontal_section_component.haml
@@ -0,0 +1,10 @@
+%div{ formatted_options }
+  .row
+    .col-lg-4
+      %h4.gl-mt-0
+        = title
+      - if description?
+        %p
+          = description
+    .col-lg-8
+      = body
diff --git a/app/components/layouts/horizontal_section_component.rb b/app/components/layouts/horizontal_section_component.rb
new file mode 100644
index 00000000000..48c960f17d9
--- /dev/null
+++ b/app/components/layouts/horizontal_section_component.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Layouts
+  class HorizontalSectionComponent < ViewComponent::Base
+    # @param [Boolean] border
+    # @param [Hash] options
+    def initialize(border: true, options: {})
+      @border = border
+      @options = options
+    end
+
+    private
+
+    renders_one :title
+    renders_one :description
+    renders_one :body
+
+    def formatted_options
+      @options.merge({ class: [('gl-border-b' if @border), @options[:class]].flatten.compact })
+    end
+  end
+end
diff --git a/app/components/pajamas/button_component.rb b/app/components/pajamas/button_component.rb
index 4233e446d5b..b2dd798b718 100644
--- a/app/components/pajamas/button_component.rb
+++ b/app/components/pajamas/button_component.rb
@@ -112,7 +112,7 @@ module Pajamas
     def base_attributes
       attributes = {}
 
-      attributes['disabled'] = '' if @disabled || @loading
+      attributes['disabled'] = 'disabled' if @disabled || @loading
       attributes['aria-disabled'] = true if @disabled || @loading
       attributes['type'] = @type unless @href