Sean McGivern 64a9e53bd1 Fix conflict highlighting ... Conflicts used to take a `Repository` and pass that to `Gitlab::Highlight.highlight`, which would call `#gitattribute` on the repository. Now they use a `Gitlab::Git::Repository`, which didn't have that method defined - but defining it on `Gitlab::Git::Repository` does make it available on `Repository` through `method_missing`, so we can do that and both cases will work.		2017-11-17 17:57:48 +00:00
..
file_collection_spec.rb	Refactor conflict resolution to contain git ops within Gitlab::Git	2017-10-12 22:03:14 -03:00
file_spec.rb	Fix conflict highlighting	2017-11-17 17:57:48 +00:00