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-11 18:08:39 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-11 18:08:39 +0300
commit4564f677f8d71e814e89618e81709c86cf50e3d2 (patch)
tree9ba8fffbd8b3ec3d40dc12bfc4132d842f789cfc /app/views/projects/issues
parent0b54f87a31c23544ca5917bf772ce9c64a61562c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/issues')
-rw-r--r--app/views/projects/issues/_related_branches.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/issues/_related_branches.html.haml b/app/views/projects/issues/_related_branches.html.haml
index d26b0f96992..3d6a266dc4d 100644
--- a/app/views/projects/issues/_related_branches.html.haml
+++ b/app/views/projects/issues/_related_branches.html.haml
@@ -1,7 +1,7 @@
- if @related_branches.any?
- if @related_branches.any?
= render Pajamas::CardComponent.new(card_options: { class: 'gl-bg-gray-10 gl-mt-5 gl-mb-0' }, header_options: { class: 'gl-bg-white gl-pl-5 gl-pr-4 gl-py-4' } , body_options: { class: 'gl-py-3 gl-px-4' }) do |c|
- - c.header do
+ - c.with_header do
%h3.card-title.h5.gl-my-0.gl-display-flex.gl-align-items-center.gl-flex-grow-1.gl-relative.gl-line-height-24
= link_to "", "#related-branches", class: "gl-link anchor position-absolute gl-text-decoration-none", "aria-hidden": true
= _('Related branches')
@@ -9,7 +9,7 @@
.gl-display-inline-flex.gl-align-items-center
= sprite_icon('branch', css_class: "gl-mr-2 gl-text-gray-500 gl-icon")
= @related_branches.size
- - c.body do
+ - c.with_body do
%ul.related-merge-requests.content-list.gl-p-3!
- @related_branches.each do |branch|
%li.list-item{ class: "gl-py-0! gl-border-0!" }