diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-29 08:25:27 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-05-29 08:25:27 +0000 |
| commit | 4a9387242dbbfee9e9ddc7b46eb69ad6a2f4ba2c (patch) | |
| tree | 20af125f1d8e6c0159e20e00d260f0f768260b9e /Dockerfile.assets | |
| parent | cd4eb5acae7256fbdc5728ed9ee918c260dc4844 (diff) | |
| parent | ede97703ea306b0bcb2672703e635692da70b194 (diff) | |
| download | gitlab-ce-4a9387242dbbfee9e9ddc7b46eb69ad6a2f4ba2c.tar.gz | |
Merge branch 'revert-karma-timeout' into 'master'
Increase karma global timeout
See merge request gitlab-org/gitlab-ce!28850
Diffstat (limited to 'Dockerfile.assets')
0 files changed, 0 insertions, 0 deletions