summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-08 00:09:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-08 00:09:06 +0000
commitdcdc526104295b8922b27fd806ae8c3b262cbad9 (patch)
treeb641e4136dea04bb0a62833274101c07e9920053 /locale
parente49bd57279b72cf517853aec369e341fa3442d60 (diff)
downloadgitlab-ce-dcdc526104295b8922b27fd806ae8c3b262cbad9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot6
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 6a8d4d60f1b..3dfb18516da 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1008,6 +1008,9 @@ msgstr ""
msgid "A .NET Core console application template, customizable for any .NET Core project"
msgstr ""
+msgid "A CI/CD pipeline must run and be successful before merge."
+msgstr ""
+
msgid "A GitBook site that uses Netlify for CI/CD instead of GitLab, but still with all the other great GitLab features."
msgstr ""
@@ -16627,9 +16630,6 @@ msgstr ""
msgid "Pipelines for merge requests are configured. A detached pipeline runs in the context of the merge request, and not against the merged result. Learn more in the documentation for Pipelines for Merged Results."
msgstr ""
-msgid "Pipelines must succeed for merge requests to be eligible to merge. Please enable pipelines for this project to continue. For more information, see the %{linkStart}documentation.%{linkEnd}"
-msgstr ""
-
msgid "Pipelines settings for '%{project_name}' were successfully updated."
msgstr ""