From e6f3fe5d3b16809634dd655b3d265c683b538b12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Tue, 26 Jan 2016 15:11:15 +0100 Subject: Ensure rake tasks that don't need a DB connection can be run without one When using ActiveRecord::Base.connection.active? without a DB connection, we get a "PG::ConnectionBad: could not connect to server" error because ActiveRecord::Base.connection doesn't exist. By using ActiveRecord::Base.connected? we ensure we don't get this error if the connection is missing, which is the all point of the Gitlab::CurrentSettings#connect_to_db? method! --- CHANGELOG | 1 + lib/gitlab/current_settings.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index b3b4aa380d5..97606659f35 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.5.0 (unreleased) + - Ensure rake tasks that don't need a DB connection can be run without one - Add "visibility" flag to GET /projects api endpoint - Ignore binary files in code search to prevent Error 500 (Stan Hu) - Upgrade gitlab_git to 7.2.23 to fix commit message mentions in first branch push diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 429f1f9bb56..19b7427256c 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -38,7 +38,7 @@ module Gitlab true end - use_db && ActiveRecord::Base.connection.active? && + use_db && ActiveRecord::Base.connected? && # The following condition is important: if a migrations adds a # column to the application_settings table and a validation in # the ApplicationSetting uses this new column we might end-up in -- cgit v1.2.1