5 commits

Author	SHA1	Message	Date
Alejandro Rodríguez	240945f87e	Simplify conflict resolver interface ... This does two things: - Pass commit oids instead of `Gitlab::Git::Commit`s. We only need the former. - Depend on only the target repository for conflict listing. For conflict resolution, treat one repository as a remote one so that we can implement it as such in Gitaly.	2017-12-14 16:02:50 -03:00
Alejandro Rodríguez	359b65beac	Use String#end_with? instead of String#ends_with? ... The former is in Ruby's core lib, so is more flexible.	2017-12-04 16:11:54 -03:00
Alejandro Rodríguez	2286681e1c	Add missing attr_accessor to Gitlab::Git::Conflict::File	2017-12-04 16:11:54 -03:00
Alejandro Rodríguez	9fdde3693b	Move line code generation into Gitlab::Git ... Having a distinct class just for that was a bit overkill	2017-10-12 22:13:05 -03:00
Alejandro Rodríguez	faa9bd402d	Create a Gitlab::Git submodule for conlict-related files ... Rename classes to (hopefully) clearer names while we're doing that.	2017-10-12 22:03:15 -03:00