Sean McGivern b2553840e8 Merge branch 'conflict-resolution-refactor' into 'master' ... Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747		2017-10-16 10:36:06 +00:00
..
file_collection	Move diffable? method from Repository to Diff::File	2017-06-08 09:32:57 -05:00
formatters	Commenting on image diffs	2017-10-07 04:25:17 +00:00
diff_refs_spec.rb	Add specs	2017-09-25 16:56:14 +02:00
file_spec.rb	Show un-highlighted diffs when blobs are the same	2017-08-24 11:11:18 +01:00
highlight_spec.rb	Use described_class when possible	2017-07-27 14:31:53 +02:00
inline_diff_markdown_marker_spec.rb	Don't escape html entities when rich == raw line	2017-08-17 19:55:07 +02:00
inline_diff_marker_spec.rb	Don't escape html entities when rich == raw line	2017-08-17 19:55:07 +02:00
inline_diff_spec.rb	Remove superfluous lib: true, type: redis, service: true, models: true, services: true, no_db: true, api: true	2017-07-27 14:31:53 +02:00
line_mapper_spec.rb	Remove superfluous lib: true, type: redis, service: true, models: true, services: true, no_db: true, api: true	2017-07-27 14:31:53 +02:00
parallel_diff_spec.rb	Remove superfluous lib: true, type: redis, service: true, models: true, services: true, no_db: true, api: true	2017-07-27 14:31:53 +02:00
parser_spec.rb	Fix diff parser so it tolerates to diff special markers in the content	2017-10-15 17:00:36 +03:00
position_spec.rb	Move line code generation into Gitlab::Git	2017-10-12 22:13:05 -03:00
position_tracer_spec.rb	Commenting on image diffs	2017-10-07 04:25:17 +00:00