Dmitriy Zaporozhets e64343d6e1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes ...

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

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb

2014-06-26 13:02:08 +03:00

..

assets

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

2014-06-26 13:02:08 +03:00

controllers

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

2014-06-26 13:02:08 +03:00

finders

Refactor some search scopes to prevent wierd behaviour and PG::Error issues

2014-06-05 20:37:35 +03:00

helpers

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

2014-06-26 13:02:08 +03:00

mailers

Revert "Merge branch 'fix-email-threading' into 'master'"

2014-06-18 13:41:12 +02:00

models

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

2014-06-26 13:02:08 +03:00

services

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

2014-06-26 13:02:08 +03:00

uploaders

Make existing tests test something, return correct errors.

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

views

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

2014-06-26 13:02:08 +03:00

workers

Added update repository size to repository import

2014-06-11 19:32:00 +00:00