Alejandro Rodríguez 3fcab51ebb Refactor conflict resolution to contain git ops within Gitlab::Git ... This prepares the codebase for a Gitaly migration. See https://gitlab.com/gitlab-org/gitaly/issues/553		2017-10-12 22:03:14 -03:00
..
assets	Add create merge checkbox.	2017-10-12 21:04:17 +00:00
controllers	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00
finders	…
helpers	…
mailers	…
models	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00
policies	…
presenters	…
serializers	…
services	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00
uploaders	…
validators	…
views	Add create merge checkbox.	2017-10-12 21:04:17 +00:00
workers	…