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-10-02 21:11:51 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-10-02 21:11:51 +0300
commit11ece334ec544e2a6f6213ce63ba9efcf819050b (patch)
tree1c336c73ed43a16cf3a0c4ce41dce93da61f9906 /app/views/groups
parentf9adc222bc1b5085e36baf7745b436e7c12ce026 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/_home_panel.html.haml2
-rw-r--r--app/views/groups/settings/_general.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/_home_panel.html.haml b/app/views/groups/_home_panel.html.haml
index f87db07d751..ca7798257cb 100644
--- a/app/views/groups/_home_panel.html.haml
+++ b/app/views/groups/_home_panel.html.haml
@@ -40,7 +40,7 @@
- if @group.description.present?
.group-home-desc.mt-1
- .home-panel-description.text-break
+ .home-panel-description
.home-panel-description-markdown.read-more-container{ itemprop: 'description' }
= markdown_field(@group, :description)
= render Pajamas::ButtonComponent.new(variant: :link, button_options: { class: 'js-read-more-trigger gl-lg-display-none' }) do
diff --git a/app/views/groups/settings/_general.html.haml b/app/views/groups/settings/_general.html.haml
index 115ed0f0fa4..22ed6ea4403 100644
--- a/app/views/groups/settings/_general.html.haml
+++ b/app/views/groups/settings/_general.html.haml
@@ -17,7 +17,7 @@
.row.gl-mt-3
.form-group.col-md-9
= f.label :description, s_('Groups|Group description (optional)'), class: 'label-bold'
- = f.text_area :description, class: 'form-control', rows: 3
+ = f.text_area :description, class: 'form-control', rows: 3, maxlength: 250
.row.gl-mt-3
.form-group.col-md-5