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

..

controllers

Make changes to tests

2014-01-22 21:03:52 +02:00

factories

Fix broadcast message factory

2013-12-19 21:06:59 +02:00

features

fix tests notes_on_merge_requests

2014-01-23 13:17:31 +02:00

fixtures

Ability to edit comments

2013-07-01 10:48:02 +01:00

helpers

Make changes to tests

2014-01-22 21:03:52 +02:00

javascripts

Update jasmine gem to work with rails4

2013-12-10 16:03:24 +02:00

lib

Merge branch 'improve/mr_diff'

2014-01-23 14:38:23 +02:00

mailers

Make changes to tests

2014-01-22 21:03:52 +02:00

models

Fix project model spec

2014-01-23 14:23:21 +02:00

observers

Make changes to tests

2014-01-22 21:03:52 +02:00

requests/api

Merge branch 'improve/mr_diff'

2014-01-23 14:38:23 +02:00

routing

Add support for various archive formats.

2014-01-02 10:18:56 -06:00

services

Make changes to tests

2014-01-22 21:03:52 +02:00

support

Fix MR spinach tests

2014-01-23 12:55:43 +02:00

tasks/gitlab

Fix deprecation in specs

2014-01-15 14:00:11 +03:00

workers

Merge branch 'improve/mr_diff'

2014-01-23 14:38:23 +02:00

factories_spec.rb

Style changes from review with @randx

2013-07-17 22:48:03 -04:00

factories.rb

Fix MR spinach tests

2014-01-23 12:55:43 +02:00

seed_project.tar.gz

Test if markdown is rendered properly.

2013-10-11 13:44:00 +02:00

spec_helper.rb

Merge Request on forked projects

2013-07-17 22:41:30 -04:00