summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-03-24 18:09:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-03-24 18:09:30 +0000
commit96fe4609c9acd574cbf61be4d28c63dda2db34d4 (patch)
tree598462923695f496ca8bc00d2c4d7650d0bf1327 /app
parentcaf737f2912581c4851977aa27c74ae4aef825bc (diff)
downloadgitlab-ce-96fe4609c9acd574cbf61be4d28c63dda2db34d4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r--app/views/projects/merge_requests/_description.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_description.html.haml b/app/views/projects/merge_requests/_description.html.haml
index 1dd4cc6495c..5590f9e6184 100644
--- a/app/views/projects/merge_requests/_description.html.haml
+++ b/app/views/projects/merge_requests/_description.html.haml
@@ -1,6 +1,6 @@
%div
- if @merge_request.description.present?
- .description{ class: can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : '' , data: { qa_selector: 'description_content' } }
+ .description{ class: ['gl-mt-4!', can?(current_user, :update_merge_request, @merge_request) ? 'js-task-list-container' : ''], data: { qa_selector: 'description_content' } }
.md
= markdown_field(@merge_request, :description)
%textarea.hidden.js-task-list-field{ data: { value: @merge_request.description } }