From: Go MAEDA <maeda@farend.jp>
Date: Sat, 26 Jun 2021 01:16:41 +0000 (+0000)
Subject: Require redmine/sort_criteria globally (#35455).
X-Git-Tag: 5.0.0~361
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=51755e4349fb46316aebbb192a03210ff09683f7;p=redmine.git

Require redmine/sort_criteria globally (#35455).

Patch by Felix Schäfer.


git-svn-id: http://svn.redmine.org/redmine/trunk@21050 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/query.rb b/app/models/query.rb
index 50c53c821..1810764a5 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -17,8 +17,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'redmine/sort_criteria'
-
 class QueryColumn
   attr_accessor :name, :totalable, :default_order
   attr_writer   :sortable, :groupable
diff --git a/lib/redmine.rb b/lib/redmine.rb
index f6d83acd9..caf23abbc 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -47,6 +47,7 @@ require 'redmine/platform'
 require 'redmine/project_jump_box'
 require 'redmine/mime_type'
 require 'redmine/search'
+require 'redmine/sort_criteria'
 require 'redmine/syntax_highlighting'
 require 'redmine/thumbnail'
 require 'redmine/unified_diff'