Merge branch '330158-msj-insights-settings' into 'master'

Review group Insights settings UI text

See merge request gitlab-org/gitlab!72123

doc/user/group/insights/index.md

@@ -9,9 +9,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/725) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.0.
 
-Configure the Insights that matter for your groups to explore data such as
-triage hygiene, issues created/closed per a given period, average time for merge
-requests to be merged and much more.
+Configure the Insights that matter for your groups. Explore data such as
+triage hygiene, issues created or closed for a given period, average time for merge
+requests to be merged, and much more.
 
 ![Insights example stacked bar chart](img/insights_example_stacked_bar_chart_v13_11.png)
 
@@ -24,23 +24,20 @@ To access your group's Insights:
 
 ## Configure your Insights
 
+GitLab reads Insights from the [default configuration file](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/fixtures/insights/default.yml).
+If you want to customize it:
+
+1. Create a new file [`.gitlab/insights.yml`](../../project/insights/index.md)
+in a project that belongs to your group.
 1. On the top bar, select **Menu > Groups** and find your group.
 1. On the left sidebar, select **Settings > General**.
 1. Expand **Insights**.
-1. Choose the project that contains your `.gitlab/insights.yml` configuration file:
-
-![group insights configuration](img/insights_group_configuration.png)
-
-If no configuration was set, a
-[default configuration file](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/fixtures/insights/default.yml)
-is used.
-
-See the [project's Insights documentation](../../project/insights/index.md) for
-details about the `.gitlab/insights.yml` configuration file.
+1. Select the project that contains your `.gitlab/insights.yml` configuration file.
+1. Select **Save changes**.
 
 ## Permissions
 
-If you have access to view a group, then you have access to view their Insights.
+If you have access to view a group, then you have access to view its Insights.
 
 NOTE:
 Issues or merge requests that you don't have access to (because you don't have

ee/app/views/groups/_insights.html.haml

@@ -7,7 +7,8 @@
     %button.btn.gl-button.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _('Select a project to read Insights configuration file')
+      = s_('GroupSettings|Select the project that contains your custom Insights file.')
+      = link_to _('Learn more.'), help_page_path('user/group/insights/index.md'), target: '_blank', rel: 'noopener noreferrer'
   .settings-content
     = form_for @group, html: { class: 'fieldset-form' } do |form|
       = form_errors(@group)
@@ -19,8 +20,7 @@
             = insight_form.hidden_field :id
             = insight_form.label :project_id, class: 'label-light' do
               .form-text.text-muted
-                = _('Select a repository')
-                = link_to sprite_icon('question-o'), help_page_path('user/group/insights/index.md'), target: '_blank'
+                = html_escape(s_('GroupSettings|Select a project with the %{code_start}.gitlab/insights.yml%{code_end} file')) % { code_start: '<code>'.html_safe, code_end: '</code>'.html_safe }
             = project_select_tag('group[insight_attributes][project_id]', class: 'project-item-select hidden-filter-value', toggle_class: 'js-project-search js-project-filter js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit',
               placeholder: _('Search projects'), idAttribute: 'id', data: { order_by: 'last_activity_at', idattribute: 'id', simple_filter: true, allow_clear: true, include_projects_in_subgroups: true }, value: insight.project_id)
       = form.submit _('Save changes'), class: "btn gl-button btn-success"

locale/gitlab.pot

@@ -16522,9 +16522,15 @@ msgstr ""
 msgid "GroupSettings|Projects will be permanently deleted after a %{waiting_period}-day delay. This delay can be %{link_start}customized by an admin%{link_end} in instance settings. Inherited by subgroups."
 msgstr ""
 
+msgid "GroupSettings|Select a project with the %{code_start}.gitlab/insights.yml%{code_end} file"
+msgstr ""
+
 msgid "GroupSettings|Select a subgroup to use as the source for custom project templates for this group."
 msgstr ""
 
+msgid "GroupSettings|Select the project that contains your custom Insights file."
+msgstr ""
+
 msgid "GroupSettings|Set the maximum size of GitLab Pages for this group. %{link_start}Learn more.%{link_end}"
 msgstr ""
 
@@ -30706,15 +30712,9 @@ msgstr ""
 msgid "Select a project"
 msgstr ""
 
-msgid "Select a project to read Insights configuration file"
-msgstr ""
-
 msgid "Select a reason"
 msgstr ""
 
-msgid "Select a repository"
-msgstr ""
-
 msgid "Select a repository containing templates for common files."
 msgstr ""