Dmitriy Zaporozhets 638331d05a Merge branch 'parallel_diff_refactor' into 'master' ...

Parallel diff refactor

Refactor side-by-side diff to remove code duplication.

Base the side-by-side diff on inline diff code.

In first iteration:

1. commenting on the side-by-side diff is not possible
1. no expanding of the surrounding code

See merge request !1066

2014-09-09 13:57:50 +00:00

..

assets

Merge branch 'close_button_after_added_comment' into 'master'

2014-09-09 11:02:10 +00:00

controllers

Merge branch 'parallel_diff_refactor' into 'master'

2014-09-09 13:57:50 +00:00

finders

Refactor finders. Prevent circular dependency error

2014-09-02 15:28:27 +03:00

helpers

Merge branch 'parallel_diff_refactor' into 'master'

2014-09-09 13:57:50 +00:00

mailers

Include "Merge-request reopened" emails in the proper email thread

2014-07-25 10:50:58 +02:00

models

Merge branch 'parallel_diff_refactor' into 'master'

2014-09-09 13:57:50 +00:00

services

Merge pull request #7646 from bushong1/snippet-search3

2014-09-09 10:31:21 +03:00

uploaders

Make existing tests test something, return correct errors.

2014-05-26 14:17:46 +02:00

views

Merge branch 'parallel_diff_refactor' into 'master'

2014-09-09 13:57:50 +00:00

workers

Update post-receive worker for new format

2014-09-02 10:58:54 +03:00