Dmitriy Zaporozhets 0d7986a8c7 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG db/schema.rb		2014-03-14 12:00:21 +02:00
..
emails_on_push_worker.rb	…
gitlab_shell_worker.rb	…
post_receive.rb	…
project_web_hook_worker.rb	…
repository_import_worker.rb	Add retry feature to project import	2014-03-12 19:26:09 +02:00
system_hook_worker.rb	…