Commit 2164acac authored by Nathan Friend's avatar Nathan Friend

Merge branch...

Merge branch '12870-environments-dashboard-indicate-to-users-that-removing-adding-a-project-from-one-dashboard' into 'master'

Add text indicating removing project affects operation dashboard

Closes #12870

See merge request gitlab-org/gitlab!39450
parents 42b875d4 a5fc36db
......@@ -163,7 +163,7 @@ export default {
<gl-sprintf
:message="
s__(
'EnvironmentsDashboard|This dashboard displays a maximum of 7 projects and 3 environments per project. %{readMoreLink}',
'EnvironmentsDashboard|This dashboard displays a maximum of 7 projects and 3 environments per project, and is linked to the Operations Dashboard. When you add or remove a project from one dashboard, GitLab adds or removes the project from the other. %{readMoreLink}',
)
"
>
......
---
title: Update environment dashboard help text
merge_request: 39450
author:
type: fixed
......@@ -50,7 +50,7 @@ exports[`dashboard should match the snapshot 1`] = `
<p
class="mt-2 mb-4 js-page-limits-message"
>
This dashboard displays a maximum of 7 projects and 3 environments per project.
This dashboard displays a maximum of 7 projects and 3 environments per project, and is linked to the Operations Dashboard. When you add or remove a project from one dashboard, GitLab adds or removes the project from the other.
<gl-link-stub
href="/help/user/operations_dashboard/index.html"
rel="noopener noreferrer"
......
......@@ -76,7 +76,7 @@ describe('dashboard', () => {
it('renders the message', () => {
expect(trimText(message.text())).toBe(
'This dashboard displays a maximum of 7 projects and 3 environments per project. More information',
'This dashboard displays a maximum of 7 projects and 3 environments per project, and is linked to the Operations Dashboard. When you add or remove a project from one dashboard, GitLab adds or removes the project from the other. More information',
);
});
......
......@@ -9446,7 +9446,7 @@ msgstr ""
msgid "EnvironmentsDashboard|The environments dashboard provides a summary of each project's environments' status, including pipeline and alert statuses."
msgstr ""
msgid "EnvironmentsDashboard|This dashboard displays a maximum of 7 projects and 3 environments per project. %{readMoreLink}"
msgid "EnvironmentsDashboard|This dashboard displays a maximum of 7 projects and 3 environments per project, and is linked to the Operations Dashboard. When you add or remove a project from one dashboard, GitLab adds or removes the project from the other. %{readMoreLink}"
msgstr ""
msgid "Environments|An error occurred while canceling the auto stop, please try again"
......
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