gitlab-org--gitlab-foss/app
Dmitriy Zaporozhets ac35ee3707
Merge branch 'username-keys-content-type' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-username-keys-content-type
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-03-21 09:37:03 +02:00
..
assets Replace turbolink spinner with nprogress 2014-03-19 12:59:23 +02:00
controllers Fix /:username.keys response content type 2014-03-20 19:09:14 +04:00
finders Update tests and fix Finders readme 2014-02-25 19:21:53 +02:00
helpers Merge pull request #6469 from mojavelinux/master 2014-03-19 16:07:38 +01:00
mailers Remove custom link to target in notification emails 2014-03-03 16:58:44 +01:00
models New bindings to vote on notes. 2014-03-20 13:33:16 +01:00
observers Move project creation to service 2014-03-12 17:14:48 +02:00
services Remove confusing code 2014-03-14 14:43:50 +02:00
uploaders Expire event cache on avatar creation/removal 2013-12-11 09:30:22 -06:00
views Use new gems methods. 2014-03-20 13:33:16 +01: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