spec/support/helpers/test_env.rb · e1530aa9314b0309cd128732c491003c37fba566 · Léo-Paul Géneau / gitlab-ce · GitLab

Find file Blame History Permalink

Merge branch 'fix-conflicts-exception-for-submodules' into 'master' · e1530aa9
Rémy Coutable authored Jul 10, 2018
```
Make sure ConflictsService does not raise for conflicting submodules

See merge request gitlab-org/gitlab-ce!20528
```
e1530aa9

test_env.rb 12 KB