diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-06-12 12:41:54 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-06-12 12:41:54 +0300 |
| commit | d8f4779c7f7f0b75b89d7f48f8228c610b73c98a (patch) | |
| tree | 627015b45f866769a2f54358781910b767497afa /locale | |
| parent | 6cf619668bc31464e588728424cfdff9a640b014 (diff) | |
| parent | 059b3e369ddea3cab03eccf3c1c18546a62b9c13 (diff) | |
Merge branch 'ce-remove-merge-request-pipeline-checkes' into 'master'
CE backport for gitlab-org/gitlab-ee!12309: Remove merge request pipeline check in mergeable method
See merge request gitlab-org/gitlab-ce!29074
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/gitlab.pot | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 136fd6f9e3e..88ace6057cf 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -12411,9 +12411,6 @@ 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 "" |