gitlab-org--gitlab-foss/app
Dmitriy Zaporozhets 28e13634dc
Merge branch 'improve/mr_diff'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb
2014-01-23 14:38:23 +02:00
..
assets Improve commit render performnace for MR show page 2014-01-22 15:54:53 +02:00
controllers Merge branch 'improve/mr_diff' 2014-01-23 14:38:23 +02:00
helpers Merge pull request #6075 from skv-headless/remove_deprecated_finders 2014-01-22 11:04:56 -08:00
mailers
models Merge branch 'improve/mr_diff' 2014-01-23 14:38:23 +02:00
observers Always create merge_request_diff if MR created 2014-01-22 20:22:20 +02:00
services
uploaders
views Merge branch 'improve/mr_diff' 2014-01-23 14:38:23 +02:00
workers