summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-02-11 10:44:39 +0000
committerRémy Coutable <remy@rymai.me>2019-02-11 10:44:39 +0000
commite927833b941122f25252712bc68b37041b38ba2c (patch)
tree292183ca0f749e59520512dbf55a6bc620b6a632 /lib
parent15af0a45083a8fb6a545616f1c48ace00b70b66a (diff)
parent3a83668703076d87a03dcd60166796406ed7ea6e (diff)
downloadgitlab-ce-e927833b941122f25252712bc68b37041b38ba2c.tar.gz
Merge branch 'patch-22' into 'master'
use timeout as it appears in logs See merge request gitlab-org/gitlab-ce!21264
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions