diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-02 16:59:54 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-02 16:59:54 +0000 |
| commit | 1e8dbd46758d5c9772baf233ebcff889dc742d3d (patch) | |
| tree | b5d61cdffae882d10625ce92fda445397adca1ed /spec/controllers | |
| parent | 51c196160adfbdb723fa6295cddf74a5ce033d6b (diff) | |
| parent | 23db8409aafc6cdbae165056ec037e31096a8a66 (diff) | |
| download | gitlab-ce-1e8dbd46758d5c9772baf233ebcff889dc742d3d.tar.gz | |
Merge branch '2361-pending-migrations-break-current-settings' into 'master'
Skip loading application settings from the database when migrations are pending
Closes gitlab-ee#2361
See merge request !11842
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 08024a2148b..a25db7a65fb 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -126,7 +126,7 @@ describe Projects::MergeRequestsController do recorded = ActiveRecord::QueryRecorder.new { go(format: :json) } - expect(recorded.count).to be_within(5).of(50) + expect(recorded.count).to be_within(5).of(59) expect(recorded.cached_count).to eq(0) end end |