Merge pull request #74 from finnlabs/feature/20043-rails-4.1

[20043] Upgrade to Rails 4.1.x

app/models/cost_query/custom_field_mixin.rb

@@ -47,7 +47,7 @@ module CostQuery::CustomFieldMixin
   end
 
   def generate_subclasses
-    WorkPackageCustomField.where("field_format in ('#{SQL_TYPES.keys.join('\',\'')}')").map do |field|
+    WorkPackageCustomField.where(field_format: SQL_TYPES.keys).map do |field|
       class_name = "CustomField#{field.id}"
       parent.send(:remove_const, class_name) if parent.const_defined? class_name
       parent.const_set class_name, Class.new(self)

app/models/cost_query/filter/category_id.rb

@@ -27,7 +27,7 @@ class CostQuery::Filter::CategoryId < Report::Filter::Base
   end
 
   def self.available_values(*)
-    categories = Category.find :all, conditions: { project_id: Project.visible.map(&:id) }
+    categories = Category.where(project_id: Project.visible.map(&:id))
     categories.map { |c| ["#{c.project.name} - #{c.name} ", c.id] }.sort_by { |a| a.first.to_s + a.second.to_s }
   end
 end

app/models/cost_query/filter/fixed_version_id.rb

@@ -27,7 +27,7 @@ class CostQuery::Filter::FixedVersionId < Report::Filter::Base
   end
 
   def self.available_values(*)
-    versions = Version.find :all, conditions: { project_id: Project.visible.map(&:id) }
+    versions = Version.where(project_id: Project.visible.map(&:id))
     versions.map { |a| ["#{a.project.name} - #{a.name}", a.id] }.sort_by { |a| a.first.to_s + a.second.to_s }
   end
 end

app/models/entry.rb

@@ -53,11 +53,13 @@ module Entry
 
       private
       def all(*args)
-        find_many :find, :all, *args
+        ActiveSupport::Deprecation.warn('Passing arguments is deprecated') if args.any?
+        find_many :all # *args
       end
 
       def count(*args)
-        find_many :count, :all, *args
+        ActiveSupport::Deprecation.warn('Passing arguments is deprecated') if args.any?
+        find_many :count # *args
       end
 
       def find_initial(options)         find_one  :find_initial,  options end

lib/open_project/reporting/patches/costlog_controller_patch.rb

@@ -53,7 +53,7 @@ module OpenProject::Reporting::Patches
 
         if @work_package
           if @work_package.respond_to?("lft")
-            work_package_ids = WorkPackage.all(select: :id, conditions: ["root_id = ? AND lft >= ? AND rgt <= ?", @work_package.root_id, @work_package.lft, @work_package.rgt]).collect{|i| i.id}
+            work_package_ids = @work_package.self_and_descendants.pluck(:id)
           else
             work_package_ids = [@work_package.id]
           end

lib/open_project/reporting/patches/timelog_controller_patch.rb

@@ -53,7 +53,7 @@ module OpenProject::Reporting::Patches
 
         if @issue
           if @issue.respond_to?("lft")
-            work_package_ids = WorkPackage.all(select: :id, conditions: ["root_id = ? AND lft >= ? AND rgt <= ?", @issue.root_id, @issue.lft, @issue.rgt]).collect{|i| i.id.to_s}
+            work_package_ids = @issue.self_and_descendants.pluck(:id)
           else
             work_package_ids = [@issue.id.to_s]
           end

openproject-reporting.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib,doc}/**/*", "README.md"]
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency 'rails', '~> 4.0.13'
+  s.add_dependency 'rails', '~> 4.1.11'
   
   s.add_dependency "reporting_engine", ">= 1.1.0"
   s.add_dependency "openproject-costs", ">= 4.0.0"

spec/models/cost_query/operator_spec.rb

@@ -243,7 +243,7 @@ describe CostQuery, type: :model, reporting_query_helper: true do
 
     it "does =d" do
       #assuming that there aren't more than one project created at the same time
-      expect(query('projects', 'created_on', '=d', Project.first(order: "id ASC").created_on).size).to eq(1)
+      expect(query('projects', 'created_on', '=d', Project.order('id ASC').first.created_on).size).to eq(1)
     end
 
     it "does <d" do