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

11 years ago · 1379cc857b
parent 6795332554 1273bed45a
commit 1379cc857b
1 changed files with 4 additions and 0 deletions
--- a/lib/open_project/my_project_page/engine.rb
+++ b/lib/open_project/my_project_page/engine.rb
@ -18,6 +18,10 @@
 # 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'
+
 require 'rails/engine'
 require 'open_project/my_project_page/plugin_blocks'