GitLab steht aufgrund wichtiger Wartungsarbeiten am Montag, den 8. März, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 3a8773fb authored by Marin Jankovski's avatar Marin Jankovski

Added USE_DB env var to allow loading fake settings without db running.

parent aa1c3214
......@@ -28,6 +28,7 @@ v 8.0.0 (unreleased)
- Fixed login failure when extern_uid changes (Joel Koglin)
- Don't notify users without access to the project when they are (accidentally) mentioned in a note.
- Retrieving oauth token with LDAP credentials
- Load Application settings from running database unless env var USE_DB=false
v 7.14.1
- Improve abuse reports management from admin area
......@@ -112,7 +113,7 @@ v 7.13.4
v 7.13.3
- Fix bug causing Bitbucket importer to crash when OAuth application had been removed.
- Allow users to send abuse reports
- Remove satellites
- Remove satellites
- Link username to profile on Group Members page (Tom Webster)
v 7.13.2
......
......@@ -4,7 +4,7 @@ def current_application_settings
key = :current_application_settings
RequestStore.store[key] ||= begin
if ActiveRecord::Base.connection.active? && ActiveRecord::Base.connection.table_exists?('application_settings')
if connect_to_db?
ApplicationSetting.current || ApplicationSetting.create_from_defaults
else
fake_application_settings
......@@ -26,5 +26,17 @@ def fake_application_settings
import_sources: Settings.gitlab['import_sources']
)
end
private
def connect_to_db?
use_db = if ENV['USE_DB'] == "false"
false
else
true
end
use_db && ActiveRecord::Base.connection.active? && ActiveRecord::Base.connection.table_exists?('application_settings')
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment