diff options
author | Rémy Coutable <remy@rymai.me> | 2019-02-11 13:44:39 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-02-11 13:44:39 +0300 |
commit | e927833b941122f25252712bc68b37041b38ba2c (patch) | |
tree | 292183ca0f749e59520512dbf55a6bc620b6a632 /spec/config | |
parent | 15af0a45083a8fb6a545616f1c48ace00b70b66a (diff) | |
parent | 3a83668703076d87a03dcd60166796406ed7ea6e (diff) |
Merge branch 'patch-22' into 'master'
use timeout as it appears in logs
See merge request gitlab-org/gitlab-ce!21264
Diffstat (limited to 'spec/config')
0 files changed, 0 insertions, 0 deletions