From 8af9d2603c1a72d8f042c91d9be7ecfcb93726b7 Mon Sep 17 00:00:00 2001 From: Alex Coles Date: Thu, 27 Aug 2015 10:22:10 +0200 Subject: [PATCH 1/2] Bump Rails dependency to latest 4.2.x Signed-off-by: Alex Coles --- openproject-reporting.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openproject-reporting.gemspec b/openproject-reporting.gemspec index 24647ba118..8950e78cc2 100644 --- a/openproject-reporting.gemspec +++ b/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.1.11' + s.add_dependency 'rails', '~> 4.2.4' s.add_dependency "reporting_engine", ">= 1.1.0" s.add_dependency "openproject-costs", ">= 4.0.0" From aa22eaf5b55334cc3af8c4836183e7edf6c53aab Mon Sep 17 00:00:00 2001 From: Alex Coles Date: Sun, 13 Sep 2015 21:55:17 +0200 Subject: [PATCH 2/2] Fix invalid URLs in CustomField caching spec --- spec/requests/custom_field_cache_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/requests/custom_field_cache_spec.rb b/spec/requests/custom_field_cache_spec.rb index 4b822fc24d..2540f6c1f8 100644 --- a/spec/requests/custom_field_cache_spec.rb +++ b/spec/requests/custom_field_cache_spec.rb @@ -59,7 +59,7 @@ describe 'Custom field filter and group by caching', type: :request do end def visit_cost_reports_index - get "projects/#{project.id}/cost_reports" + get "/projects/#{project.id}/cost_reports" end it 'removes the filter/group_by if the custom field is removed' do