diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-10 14:52:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-10 14:52:08 +0000 |
| commit | b40e71d6f3c71cd7d46bb64561ee2b291b3f8394 (patch) | |
| tree | fc25a29043c7040fd00b23c42f1fd2cf8cf36fce /changelogs | |
| parent | c9e4def9c8f3f459b32985439173cd0a20f9e942 (diff) | |
| parent | 57fc7cd8f35525f772d7c59a2aa45c96467cb882 (diff) | |
| download | gitlab-ce-b40e71d6f3c71cd7d46bb64561ee2b291b3f8394.tar.gz | |
Merge branch 'fix-conflicts-exception-for-submodules' into 'master'
Make sure ConflictsService does not raise for conflicting submodules
See merge request gitlab-org/gitlab-ce!20528
Diffstat (limited to 'changelogs')
0 files changed, 0 insertions, 0 deletions