Make sure that is no pending migrations in Gitlab::CurrentSettings

ff98c631 · Douglas Barbosa Alexandre · 333d3d9e · ff98c631
Commit ff98c631 authored Dec 30, 2015 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

lib/gitlab/current_settings.rb lib/gitlab/current_settings.rb +3 -1

No files found.
--- 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