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
This commit is contained in:
commit
1e8dbd4675
3 changed files with 5 additions and 4 deletions
|
@ -19,7 +19,7 @@ module Gitlab
|
||||||
settings = ::ApplicationSetting.last
|
settings = ::ApplicationSetting.last
|
||||||
end
|
end
|
||||||
|
|
||||||
settings ||= ::ApplicationSetting.create_from_defaults unless ActiveRecord::Migrator.needs_migration?
|
settings ||= ::ApplicationSetting.create_from_defaults
|
||||||
end
|
end
|
||||||
|
|
||||||
settings || in_memory_application_settings
|
settings || in_memory_application_settings
|
||||||
|
@ -46,7 +46,8 @@ module Gitlab
|
||||||
active_db_connection = ActiveRecord::Base.connection.active? rescue false
|
active_db_connection = ActiveRecord::Base.connection.active? rescue false
|
||||||
|
|
||||||
active_db_connection &&
|
active_db_connection &&
|
||||||
ActiveRecord::Base.connection.table_exists?('application_settings')
|
ActiveRecord::Base.connection.table_exists?('application_settings') &&
|
||||||
|
!ActiveRecord::Migrator.needs_migration?
|
||||||
rescue ActiveRecord::NoDatabaseError
|
rescue ActiveRecord::NoDatabaseError
|
||||||
false
|
false
|
||||||
end
|
end
|
||||||
|
|
|
@ -126,7 +126,7 @@ describe Projects::MergeRequestsController do
|
||||||
|
|
||||||
recorded = ActiveRecord::QueryRecorder.new { go(format: :json) }
|
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)
|
expect(recorded.cached_count).to eq(0)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -113,7 +113,7 @@ describe PipelineSerializer do
|
||||||
|
|
||||||
it "verifies number of queries" do
|
it "verifies number of queries" do
|
||||||
recorded = ActiveRecord::QueryRecorder.new { subject }
|
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)
|
expect(recorded.cached_count).to eq(0)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue