Commit e5dbba3d authored by Phil Hughes's avatar Phil Hughes

Merge branch...

Merge branch '8444-update-error-message-displayed-when-adding-an-unsupported-project-to-ops-dashboard' into 'master'

Resolve "Update error message displayed when adding an unsupported project to Ops Dashboard"

Closes #8444

See merge request gitlab-org/gitlab-ee!8672
parents 60fb3ff6 2aeaaf19
...@@ -49,7 +49,7 @@ export const requestAddProjectsToDashboardSuccess = ({ dispatch, state }, data) ...@@ -49,7 +49,7 @@ export const requestAddProjectsToDashboardSuccess = ({ dispatch, state }, data)
createFlash( createFlash(
sprintf( sprintf(
s__( s__(
'OperationsDashboard|Unable to add %{invalidProjects}. The Operations Dashboard is available for projects with a Gold subscription.', 'OperationsDashboard|Unable to add %{invalidProjects}. The Operations Dashboard is available for public projects, and private projects in groups with a Gold plan.',
), ),
{ invalidProjects }, { invalidProjects },
), ),
......
---
title: Update Ops Dashboard error message to allow for public projects
merge_request: 8672
author:
type: changed
...@@ -189,7 +189,7 @@ describe('actions', () => { ...@@ -189,7 +189,7 @@ describe('actions', () => {
}); });
const errorMessage = const errorMessage =
'The Operations Dashboard is available for projects with a Gold subscription.'; 'The Operations Dashboard is available for public projects, and private projects in groups with a Gold plan.';
const addTokens = count => { const addTokens = count => {
for (let i = 0; i < count; i += 1) { for (let i = 0; i < count; i += 1) {
store.dispatch('addProjectToken', { store.dispatch('addProjectToken', {
......
...@@ -5959,7 +5959,7 @@ msgstr "" ...@@ -5959,7 +5959,7 @@ msgstr ""
msgid "OperationsDashboard|The operations dashboard provides a summary of each project's operational health, including pipeline and alert statuses." msgid "OperationsDashboard|The operations dashboard provides a summary of each project's operational health, including pipeline and alert statuses."
msgstr "" msgstr ""
msgid "OperationsDashboard|Unable to add %{invalidProjects}. The Operations Dashboard is available for projects with a Gold subscription." msgid "OperationsDashboard|Unable to add %{invalidProjects}. The Operations Dashboard is available for public projects, and private projects in groups with a Gold plan."
msgstr "" 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."
......
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