summaryrefslogtreecommitdiff
path: root/spec/features/projects/blobs/edit_spec.rb
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-08-01 17:16:16 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-08-01 17:16:16 +0000
commit426b079730daf46fa69773f03b46c6bfbc231340 (patch)
tree81ff3faff65a1d348bb323df7ba28fd986b2b9e8 /spec/features/projects/blobs/edit_spec.rb
parent91040069322b3b8da566118b5852a70d5169d7db (diff)
parent0abae9eeb5c0166f3364dade2c45f66c2152f94c (diff)
downloadgitlab-ce-426b079730daf46fa69773f03b46c6bfbc231340.tar.gz
Merge branch 'winh-raise-karma-timeout' into 'master'
Raise timeout for Karma tests to 2 seconds See merge request gitlab-org/gitlab-ce!20963
Diffstat (limited to 'spec/features/projects/blobs/edit_spec.rb')
0 files changed, 0 insertions, 0 deletions