summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-12-28 06:12:10 +0000
committerRobert Speicher <robert@gitlab.com>2015-12-28 06:12:10 +0000
commit854f57e732c03eb821ec93142c970f1579a0e949 (patch)
treeea66baf6228f70e483e408453da852fbf215da83
parenta97a2d27205637ea2ff6da112dabc1499c37ccfe (diff)
parente4ec34468fe84633ac6a66f85d71405746af9be1 (diff)
downloadgitlab-ce-854f57e732c03eb821ec93142c970f1579a0e949.tar.gz
Merge branch 'issue_4662' into 'master'
Fix intermittent timeout problems with feature specs. This MR updates the gitlab-ci config to compile assets before running feature specs. Closes #4662 See merge request !2220
-rw-r--r--.gitlab-ci.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a8da3de83f8..c23a7a3bf0e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,6 +12,7 @@ before_script:
spec:feature:
script:
+ - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
- RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
tags:
- ruby