Commit 2f450617 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'aqualls-group-general-template' into 'master'

Add helptext links to Groups-Settings-General

See merge request gitlab-org/gitlab!70301
parents 17c9a8fb 121ab5df
- breadcrumb_title _("General Settings") - breadcrumb_title _("General settings")
- page_title _("General Settings") - page_title _("General settings")
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
- expanded = expanded_by_default? - expanded = expanded_by_default?
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
= _('Collapse') = _('Collapse')
%p %p
= _('Update your group name, description, avatar, and visibility.') = _('Update your group name, description, avatar, and visibility.')
= link_to s_('Learn more about groups.'), help_page_path('user/group/index')
.settings-content .settings-content
= render 'groups/settings/general' = render 'groups/settings/general'
......
...@@ -14,8 +14,9 @@ ...@@ -14,8 +14,9 @@
.row.gl-mt-3 .row.gl-mt-3
.form-group.col-md-9 .form-group.col-md-9
= f.label :description, _('Group description (optional)'), class: 'label-bold' = f.label :description, _('Group description'), class: 'label-bold'
= f.text_area :description, class: 'form-control', rows: 3, maxlength: 250 = f.text_area :description, class: 'form-control', rows: 3, maxlength: 250
.form-text.text-muted= _('Optional.')
= render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group = render_if_exists 'shared/repository_size_limit_setting', form: f, type: :group
......
...@@ -14950,6 +14950,9 @@ msgstr "" ...@@ -14950,6 +14950,9 @@ msgstr ""
msgid "General pipelines" msgid "General pipelines"
msgstr "" msgstr ""
msgid "General settings"
msgstr ""
msgid "Generate a default set of labels" msgid "Generate a default set of labels"
msgstr "" msgstr ""
...@@ -16012,6 +16015,9 @@ msgstr "" ...@@ -16012,6 +16015,9 @@ msgstr ""
msgid "Group by" msgid "Group by"
msgstr "" msgstr ""
msgid "Group description"
msgstr ""
msgid "Group description (optional)" msgid "Group description (optional)"
msgstr "" msgstr ""
...@@ -20106,6 +20112,9 @@ msgstr "" ...@@ -20106,6 +20112,9 @@ msgstr ""
msgid "Learn more about group-level project templates" msgid "Learn more about group-level project templates"
msgstr "" msgstr ""
msgid "Learn more about groups."
msgstr ""
msgid "Learn more about shards and replicas in the %{configuration_link_start}Advanced search configuration%{configuration_link_end} documentation. Changes won't take place until the index is %{recreated_link_start}recreated%{recreated_link_end}." msgid "Learn more about shards and replicas in the %{configuration_link_start}Advanced search configuration%{configuration_link_end} documentation. Changes won't take place until the index is %{recreated_link_start}recreated%{recreated_link_end}."
msgstr "" msgstr ""
...@@ -23971,6 +23980,9 @@ msgstr "" ...@@ -23971,6 +23980,9 @@ msgstr ""
msgid "Optional parameter \"variables\" must be a Hash. Ex: variables[key1]=value1" msgid "Optional parameter \"variables\" must be a Hash. Ex: variables[key1]=value1"
msgstr "" msgstr ""
msgid "Optional."
msgstr ""
msgid "Optionally, you can %{link_to_customize} how FogBugz email addresses and usernames are imported into GitLab." msgid "Optionally, you can %{link_to_customize} how FogBugz email addresses and usernames are imported into GitLab."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment