Merge pull request #77 from finnlabs/feature/20044-rails-4.2

[20044] Upgrade to Rails 4.2.x
pull/6827/head
ulferts 9 years ago
commit 635478d4e9
  1. 2
      openproject-reporting.gemspec
  2. 2
      spec/requests/custom_field_cache_spec.rb

@ -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"

@ -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

Loading…
Cancel
Save