Marin Jankovski 93bef4f04a Merge remote-tracking branch 'ce/master' ...

Conflicts:
	VERSION

2014-06-20 13:27:27 +02:00

..

assets

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

2014-06-17 10:53:44 +03:00

controllers

Merge remote-tracking branch 'ce/master'

2014-06-20 13:27:27 +02:00

finders

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

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

helpers

Fix tab highlight for git_hooks page

2014-06-18 19:05:45 +03:00

mailers

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

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

models

Merge remote-tracking branch 'ce/master'

2014-06-20 13:27:27 +02:00

observers

Wipe wall notes feature

2014-06-13 14:24:54 +03:00

services

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

2014-06-17 10:53:44 +03:00

uploaders

Make existing tests test something, return correct errors.

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

views

Merge remote-tracking branch 'ce/master'

2014-06-19 09:22:51 +02:00

workers

Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout

2014-03-14 12:00:21 +02:00