Dmitriy Zaporozhets 53a34b9c3c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq ...

Conflicts:
	doc/integration/README.md

2015-02-19 12:01:56 -08:00

..

assets

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

2015-02-19 12:01:56 -08:00

controllers

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

2015-02-19 12:01:56 -08:00

finders

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

2015-02-19 12:01:56 -08:00

helpers

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

2015-02-18 17:44:29 -08:00

mailers

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

models

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

2015-02-19 12:01:56 -08:00

services

Merge remote-tracking branch 'ce/master' into merge_ce

2015-02-16 11:50:30 -08:00

uploaders

Revert "Fix broken access control and refactor avatar upload"

2015-02-19 08:57:35 -08:00

views

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

2015-02-18 17:44:29 -08:00

workers

Merge remote-tracking branch 'ee/master' into ce_non_conflict

2015-02-05 22:01:05 -08:00