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	Detect n+1 issues involving Gitaly	2017-09-19 10:55:37 +00:00
formatters	Commenting on image diffs	2017-10-07 04:25:17 +00:00
diff_refs.rb	Remove unnecessary comments	2017-09-25 10:23:43 +02:00
file.rb	Move line code generation into Gitlab::Git	2017-10-12 22:13:05 -03:00
highlight.rb
image_point.rb	Commenting on image diffs	2017-10-07 04:25:17 +00:00
inline_diff.rb
inline_diff_markdown_marker.rb
inline_diff_marker.rb	changed InlineDiffMarker to make it html_safe its output	2017-09-12 13:42:40 -04:00
line.rb	Re-enable SqlInjection and CommandInjection	2017-08-08 10:50:54 -04:00
line_mapper.rb	Whitelist or fix additional Gitlab/PublicSend cop violations	2017-08-14 12:14:11 -04:00
parallel_diff.rb
parser.rb	Fix diff parser so it tolerates to diff special markers in the content	2017-10-15 17:00:36 +03:00
position.rb	Commenting on image diffs	2017-10-07 04:25:17 +00:00
position_tracer.rb