diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-04-15 10:25:48 -0300 |
|---|---|---|
| committer | Nathan Friend <nathan@gitlab.com> | 2019-04-15 10:25:48 -0300 |
| commit | 12170f8320c3bbe5b6bbdbda83ac7a163826b34a (patch) | |
| tree | b541b90a01ce8062ce5e0edd8da49e5ced6e7346 /locale | |
| parent | b99b6bb0960f749e1ba9a129be9c0365e306ed96 (diff) | |
| download | gitlab-ce-12170f8320c3bbe5b6bbdbda83ac7a163826b34a.tar.gz | |
Add two warning messages to the MR widgetnfriend-update-merge-request-widget-for-post-merge-pipelines
This commit adds two new warning messages to the MR widget that handle
cases involving merge request pipelines.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9de34dd92ea..08e534ed59a 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -9755,6 +9755,9 @@ msgstr "" msgid "mrWidget|Fast-forward merge is not possible. To merge this request, first rebase locally." msgstr "" +msgid "mrWidget|Fork merge requests do not create merge request pipelines which validate a post merge result" +msgstr "" + msgid "mrWidget|If the %{branch} branch exists in your local repository, you can merge this merge request manually using the" msgstr "" @@ -9848,6 +9851,9 @@ msgstr "" msgid "mrWidget|The source branch will not be deleted" msgstr "" +msgid "mrWidget|The target branch has advanced, which invalidates the merge request pipeline. Please update the source branch and retry merging" +msgstr "" + msgid "mrWidget|There are merge conflicts" msgstr "" |