Dmitriy Zaporozhets 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md

2014-02-11 10:15:13 +02:00

..

controllers

Make changes to tests

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

factories

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce

2014-01-21 18:15:49 +02:00

features

Fix dashboard atom feed

2014-02-10 17:32:36 +02:00

fixtures

Ability to edit comments

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

helpers

Fix submodule_helper specs

2014-02-10 13:02:26 +02:00

javascripts

Update jasmine gem to work with rails4

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

lib

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-02-11 10:15:13 +02:00

mailers

Make changes to tests

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

models

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-02-11 10:15:13 +02:00

observers

Make changes to tests

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

requests/api

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-02-11 10:15:13 +02:00

routing

Add files to path blacklist.

2014-01-24 20:06:44 -06:00

services

Add more tests for FilteringService

2014-02-10 15:23:19 +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

Use the correct paths.

2014-01-23 16:00:39 +01:00

spec_helper.rb

Merge Request on forked projects

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