diff --git a/.rubocop.yml b/.rubocop.yml index 568f53a0f..9a00f24c4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -74,10 +74,6 @@ Rails/Exit: Rails/HasAndBelongsToMany: Enabled: false -# TODO: remove in rails 5 -Rails/HttpPositionalArguments: - Enabled: false - Rails/Output: Enabled: false diff --git a/config/environments/development.rb b/config/environments/development.rb index 3697ce110..4999baa8d 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -15,7 +15,7 @@ config.consider_all_requests_local = true # Enable/disable caching. By default caching is disabled. - if Rails.root.join('tmp/caching-dev.txt').exist? + if Rails.root.join('tmp', 'caching-dev.txt').exist? config.action_controller.perform_caching = true config.cache_store = :memory_store