diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-19 18:03:06 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-19 18:03:06 +0000 |
| commit | 8c8c4f8c5a5f5845b9ebca415aaa29278cb904c7 (patch) | |
| tree | 04eac1446c4ba989d395787e0a5edddd2368cfaa /app/views/ci/status | |
| parent | 696aa2aee32f69d8c5a7352f03bae3dda2e660ba (diff) | |
| parent | 0631c7bcdce5dcb2aac94b1b755e63022a62469f (diff) | |
| download | gitlab-ce-8c8c4f8c5a5f5845b9ebca415aaa29278cb904c7.tar.gz | |
Merge branch 'fix/import-export-mr-error' into 'master'
Fix import/export merge requests error
When MWBS is set and the MR exported/imported an error gets thrown. We should ignore this so it can succeed as the merge user may no longer exist in the target instance.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24009 and https://gitlab.com/gitlab-com/support-forum/issues/1345
See merge request !8134
Diffstat (limited to 'app/views/ci/status')
0 files changed, 0 insertions, 0 deletions