diff options
author | Nick Thomas <nick@gitlab.com> | 2017-06-01 10:17:56 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-06-02 16:02:08 +0100 |
commit | 23db8409aafc6cdbae165056ec037e31096a8a66 (patch) | |
tree | ec7f4d21b7bfb8a1be6e116e9b5329df31c31bf3 /spec/serializers | |
parent | dab266219441144a74b86fa27f4e0528810482d1 (diff) | |
download | gitlab-ce-23db8409aafc6cdbae165056ec037e31096a8a66.tar.gz |
Skip loading application settings from the database when migrations are pending
Various Rails initializers (metrics, sentry, etc) are run before migrations,
which can lead to a mismatch between app/models/application_settings.rb and
schema.
Diffstat (limited to 'spec/serializers')
-rw-r--r-- | spec/serializers/pipeline_serializer_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb index f2426db6d81..088f24eb180 100644 --- a/spec/serializers/pipeline_serializer_spec.rb +++ b/spec/serializers/pipeline_serializer_spec.rb @@ -113,7 +113,7 @@ describe PipelineSerializer do it "verifies number of queries" do recorded = ActiveRecord::QueryRecorder.new { subject } - expect(recorded.count).to be_within(1).of(58) + expect(recorded.count).to be_within(1).of(60) expect(recorded.cached_count).to eq(0) end |