Merge branch 'fix-build' into 'master'

Ensure that is no pending migrations when using database on
Gitlab::CurrentSettings

This fixes the undefined method `recaptcha_enabled' for
#<ApplicationSetting:0x007f28552f8238> when running the build.

See merge request !2254

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 46a4ef0e31f..7a86c09158e 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -38,7 +38,9 @@ module Gitlab
                  true
                end
 
-      use_db && ActiveRecord::Base.connection.active? && ActiveRecord::Base.connection.table_exists?('application_settings')
+      use_db && ActiveRecord::Base.connection.active? &&
+                !ActiveRecord::Migrator.needs_migration? &&
+                ActiveRecord::Base.connection.table_exists?('application_settings')
     end
   end
 end