Commit cd22da3e authored by Rémy Coutable's avatar Rémy Coutable

Fix preventing migration from crashing in very specific cases

See https://gitlab.com/gitlab-org/gitlab-ce/issues/12606 for details
parent 8b3285bf
...@@ -39,6 +39,13 @@ module Gitlab ...@@ -39,6 +39,13 @@ module Gitlab
end end
use_db && ActiveRecord::Base.connection.active? && use_db && ActiveRecord::Base.connection.active? &&
# 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
# a vicious circle where migration crash before being done.
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/12606 for
# a thorough explanation.
!ActiveRecord::Migrator.needs_migration? &&
ActiveRecord::Base.connection.table_exists?('application_settings') ActiveRecord::Base.connection.table_exists?('application_settings')
rescue ActiveRecord::NoDatabaseError rescue ActiveRecord::NoDatabaseError
......
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