diff options
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 847577f68cb..d9a237eba50 100644 --- a/config/application.rb +++ b/config/application.rb @@ -315,7 +315,6 @@ module Gitlab config.assets.precompile << "page_bundles/jira_connect.css" config.assets.precompile << "page_bundles/learn_gitlab.css" config.assets.precompile << "page_bundles/login.css" - config.assets.precompile << "page_bundles/marketing_popover.css" config.assets.precompile << "page_bundles/members.css" config.assets.precompile << "page_bundles/merge_conflicts.css" config.assets.precompile << "page_bundles/merge_request_analytics.css" @@ -613,8 +612,8 @@ module Gitlab # https://github.com/rails/rails/blob/fdf840f69a2e33d78a9d40b91d9b7fddb76711e9/activerecord/lib/active_record/railtie.rb#L308 initializer :clear_active_connections_again, after: :set_routes_reloader_hook do # rubocop:disable Database/MultipleDatabases - ActiveRecord::Base.clear_active_connections! - ActiveRecord::Base.flush_idle_connections! + ActiveRecord::Base.connection_handler.clear_active_connections!(ActiveRecord::Base.current_role) + ActiveRecord::Base.connection_handler.flush_idle_connections!(ActiveRecord::Base.current_role) # rubocop:enable Database/MultipleDatabases end |