diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-05-18 22:13:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-05-18 22:13:20 +0000 |
| commit | bcc504d3c3ed0436935ca076d6be5db5ca10a664 (patch) | |
| tree | 88abcddab66bde62a1177548c2f785dddf42282c /rubocop | |
| parent | e5cc8e0aa81c3012eff5303543b11931158478cf (diff) | |
| parent | 7a7e9288d4dea50a9797b3f624bf8174fa7060d4 (diff) | |
| download | gitlab-ce-bcc504d3c3ed0436935ca076d6be5db5ca10a664.tar.gz | |
Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master'
Stop MR conflict code from blowing up when branches are missing
Closes #32544
See merge request !11501
Diffstat (limited to 'rubocop')
0 files changed, 0 insertions, 0 deletions