diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-06-30 12:31:36 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-07-02 19:42:23 +0800 |
| commit | d907b894bed848e5c60f101a3cd3172df35dd27a (patch) | |
| tree | 666c0c04be2d09fe9e081686c5d07f0a3b41146b /changelogs | |
| parent | 3c0ff4ddb9a910a2da0472cfc6ced745a421a623 (diff) | |
| download | gitlab-ce-d907b894bed848e5c60f101a3cd3172df35dd27a.tar.gz | |
Fix notify_conflict? raising exception when branches do not exist
repository.can_be_merged? can raise error if diff_head_sha or
target_branch are absent, therefore check those explicitly.
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/48653-mr-target-branch-missing.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/48653-mr-target-branch-missing.yml b/changelogs/unreleased/48653-mr-target-branch-missing.yml new file mode 100644 index 00000000000..c2b342b87d2 --- /dev/null +++ b/changelogs/unreleased/48653-mr-target-branch-missing.yml @@ -0,0 +1,5 @@ +--- +title: Fix merge request page rendering error when its target/source branch is missing +merge_request: 20280 +author: +type: fixed |