Ben Bodenmiller d915a239f7 Increase import timeout from 2 to 4 minutes ...

This file was missed in https://github.com/gitlabhq/gitlabhq/commit/4535db04b28996baf118bafeb77acd16065e5c5a.

2014-09-10 18:38:47 -07:00

..

assets

Wrap text that overflows the description field.

2014-09-10 17:30:29 +02:00

controllers

Merge branch 'parallel_diff_refactor' into 'master'

2014-09-09 13:57:50 +00:00

finders

Refactor finders. Prevent circular dependency error

2014-09-02 15:28:27 +03:00

helpers

Merge branch 'parallel_diff_refactor' into 'master'

2014-09-09 13:57:50 +00:00

mailers

Include "Merge-request reopened" emails in the proper email thread

2014-07-25 10:50:58 +02:00

models

Merge pull request #7705 from dblessing/serialize_service_properties

2014-09-10 20:47:47 +03:00

services

Merge pull request #7646 from bushong1/snippet-search3

2014-09-09 10:31:21 +03:00

uploaders

Make existing tests test something, return correct errors.

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

views

Increase import timeout from 2 to 4 minutes

2014-09-10 18:38:47 -07:00

workers

Update post-receive worker for new format

2014-09-02 10:58:54 +03:00