Merge branch 'release/3.0' into dev (again)

11 years ago · 947b6f851a
parent a86eea26e6 e84400a214
commit 947b6f851a
1 changed files with 5 additions and 0 deletions
--- a/lib/open_project/meeting/engine.rb
+++ b/lib/open_project/meeting/engine.rb
@ -17,6 +17,11 @@
 #
 # See doc/COPYRIGHT.md for more details.
 #++
+
+# Prevent load-order problems in case openproject-plugins is listed after a plugin in the Gemfile
+# or not at all
+require 'open_project/plugins'
+
 module OpenProject::Meeting
  class Engine < ::Rails::Engine
    engine_name :openproject_meeting