summaryrefslogtreecommitdiffstats
path: root/app/models/query.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-11-23 19:02:50 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-11-23 19:02:50 +0000
commit3adc1c319243062c471d112c060c092acc321d92 (patch)
treef75bc4e1b7a9046a2ed6fe5662bcbcd838b15555 /app/models/query.rb
parent3d23c42fc010e069bdbf447270c62ffb70dae8b4 (diff)
downloadredmine-3adc1c319243062c471d112c060c092acc321d92.tar.gz
redmine-3adc1c319243062c471d112c060c092acc321d92.zip
Prevent clash with Rails 3 Query module.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7899 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/query.rb')
-rw-r--r--app/models/query.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/query.rb b/app/models/query.rb
index a02cc810f..55ac3d6a4 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -352,7 +352,7 @@ class Query < ActiveRecord::Base
def available_columns
return @available_columns if @available_columns
- @available_columns = Query.available_columns
+ @available_columns = ::Query.available_columns
@available_columns += (project ?
project.all_issue_custom_fields :
IssueCustomField.find(:all)