-
https://dev.gitlab.org/dzaporozhets/gitlabhq由 Dmitriy Zaporozhets 提交于
Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG db/schema.rb
0d7986a8