diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-01-25 14:01:44 -0700 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-01-25 14:01:44 -0700 |
| commit | d4b2f4dd8332701c2df0003a213b34abe0163599 (patch) | |
| tree | ec868cb769c6656bbcb4b42b65710ab72717598e /spec/spec_helper.rb | |
| parent | 5348985015cd0f3163ed7617eb86df63396db16b (diff) | |
| parent | 112f9710b65fe830a058366cde1734a2928764de (diff) | |
| download | gitlab-ce-pipeline_index_vue_error_state.tar.gz | |
Merge branch 'master' into pipeline_index_vue_error_statepipeline_index_vue_error_state
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 6ee3307512d..e160c11111b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -2,11 +2,11 @@ require './spec/simplecov_env' SimpleCovEnv.start! ENV["RAILS_ENV"] ||= 'test' +ENV["IN_MEMORY_APPLICATION_SETTINGS"] = 'true' require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'shoulda/matchers' -require 'sidekiq/testing/inline' require 'rspec/retry' if ENV['CI'] && !ENV['NO_KNAPSACK'] |