summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-05-05 14:40:52 +0100
committerSean McGivern <sean@gitlab.com>2017-05-05 14:40:52 +0100
commitfaf2ce89cd4eafdccb78823cf1a32c338a8d9a79 (patch)
tree1931a7f2929a252778400e2b97d44992f5d5725e /spec/models
parent7e0e45dbf174bb82cc0ea8191a869612ad60b4f7 (diff)
parent0f1273fa44a9122bffbd5cecbaea99b1db781d7e (diff)
downloadgitlab-ce-faf2ce89cd4eafdccb78823cf1a32c338a8d9a79.tar.gz
Merge branch 'mrchrisw-import-shell-timeout'
Diffstat (limited to 'spec/models')
0 files changed, 0 insertions, 0 deletions