diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-02 15:50:26 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-02 15:50:26 +0300 |
| commit | e7a5a3151492c0bc6b1a262e5caffd66bd25674c (patch) | |
| tree | b33a271d7a8b4ffe0120da68e01feffa6f461d31 /app/assets | |
| parent | 601eb8df30c5d84236fee190caa6fd72b1c37cb3 (diff) | |
| parent | d907b894bed848e5c60f101a3cd3172df35dd27a (diff) | |
Merge branch '48653-mr-target-branch-missing' into 'master'
Fix notify_conflict? raising exception due to absent branches
Closes #48653
See merge request gitlab-org/gitlab-ce!20280
Diffstat (limited to 'app/assets')
0 files changed, 0 insertions, 0 deletions