app/controllers/projects/merge_requests/conflicts_controller.rb · 26adef2b591df8b97bbe17be0d2c97a2a4bf753b · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Create a Gitlab::Git submodule for conlict-related files · faa9bd40
Alejandro Rodríguez authored Oct 09, 2017
```
Rename classes to (hopefully) clearer names while we're doing that.
```
faa9bd40

conflicts_controller.rb 2.04 KB