diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-25 14:40:49 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-25 14:40:49 +0000 |
| commit | c5f6c811eec6bca7952f84af9e30f3fafb848352 (patch) | |
| tree | 3c43eb99a7494e25d6ba6952edb888f70288ebfa | |
| parent | 6587d3680e2c1f47c080636bdbbda59bdc8ba4d8 (diff) | |
| parent | 46b21e91ceb1b52f9210f002945f033e3684d655 (diff) | |
| download | gitlab-ce-c5f6c811eec6bca7952f84af9e30f3fafb848352.tar.gz | |
Merge branch 'fix/gb/fix-end-to-end-tests-timeouts' into 'master'
Fix timeouts of end-to-end tests with GitLab QA
Closes gitlab-qa#224
See merge request gitlab-org/gitlab-ce!18583
| -rw-r--r-- | .gitlab-ci.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87c3944dcce..5bc2f1f3a0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -289,7 +289,6 @@ stages: # Trigger a package build in omnibus-gitlab repository # package-and-qa: - <<: *dedicated-runner image: ruby:2.4-alpine before_script: [] stage: build |