diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/views/shared/form_elements/_description.html.haml | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/views/shared/form_elements/_description.html.haml')
-rw-r--r-- | app/views/shared/form_elements/_description.html.haml | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/app/views/shared/form_elements/_description.html.haml b/app/views/shared/form_elements/_description.html.haml index 94818c13f76..a87aa8de679 100644 --- a/app/views/shared/form_elements/_description.html.haml +++ b/app/views/shared/form_elements/_description.html.haml @@ -6,23 +6,22 @@ - supports_quick_actions = true - preview_url = preview_markdown_path(project, target_type: model.class.name) -.form-group.row.detail-page-description - = form.label :description, _('Description'), class: 'col-form-label col-sm-2' - .col-sm-10 - - if model.is_a?(MergeRequest) - = hidden_field_tag :merge_request_diff_head_sha, model.diff_head_sha +.form-group + = form.label :description, _('Description'), class: 'gl-display-block' + - if model.is_a?(MergeRequest) + = hidden_field_tag :merge_request_diff_head_sha, model.diff_head_sha - - if model.is_a?(Issuable) - = render 'shared/issuable/form/template_selector', issuable: model + - if model.is_a?(Issuable) + = render 'shared/issuable/form/template_selector', issuable: model - = render 'shared/form_elements/apply_template_warning', issuable: model + = render 'shared/form_elements/apply_template_warning', issuable: model - = render layout: 'shared/md_preview', locals: { url: preview_url, referenced_users: true } do - = render 'shared/zen', f: form, attr: :description, - classes: 'note-textarea rspec-issuable-form-description', - placeholder: placeholder, - supports_quick_actions: supports_quick_actions, - qa_selector: 'issuable_form_description' - = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions - .clearfix - .error-alert + = render layout: 'shared/md_preview', locals: { url: preview_url, referenced_users: true } do + = render 'shared/zen', f: form, attr: :description, + classes: 'note-textarea rspec-issuable-form-description', + placeholder: placeholder, + supports_quick_actions: supports_quick_actions, + qa_selector: 'issuable_form_description' + = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions + .clearfix + .error-alert |