Skip to content
代码片段 群组 项目
提交 ad521bde 编辑于 作者: Stan Hu's avatar Stan Hu
浏览文件

Merge branch 'rs-revert-11842' into 'master'

Partially revert 1e8dbd46

See merge request !12236
No related branches found
No related tags found
无相关合并请求
...@@ -62,8 +62,7 @@ def connect_to_db? ...@@ -62,8 +62,7 @@ def connect_to_db?
active_db_connection = ActiveRecord::Base.connection.active? rescue false active_db_connection = ActiveRecord::Base.connection.active? rescue false
active_db_connection && active_db_connection &&
ActiveRecord::Base.connection.table_exists?('application_settings') && ActiveRecord::Base.connection.table_exists?('application_settings')
!ActiveRecord::Migrator.needs_migration?
rescue ActiveRecord::NoDatabaseError rescue ActiveRecord::NoDatabaseError
false false
end end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册