Dmitriy Zaporozhets 5b10796235 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

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

Conflicts:
	app/models/project.rb
	db/schema.rb

2015-04-20 19:19:27 +03:00

..

assets

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

2015-04-20 19:19:27 +03:00

controllers

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

2015-04-20 19:19:27 +03:00

finders

Merge branch 'temp-ce-ee' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-04-14 13:05:39 +03:00

helpers

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

2015-04-16 11:53:32 +03:00

mailers

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

2015-04-15 19:22:57 +03:00

models

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

2015-04-20 19:19:27 +03:00

services

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

2015-04-20 19:19:27 +03:00

uploaders

Fix URL to uploaded file.

2015-02-20 16:01:37 +01:00

views

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

2015-04-20 19:19:27 +03:00

workers

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

2015-04-15 19:22:57 +03:00