Skip to content

Commit

Permalink
Remove a Rubocop exclusion fixed by Rails 5 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
tjgrathwell committed Mar 3, 2017
1 parent b29c0ac commit 71cd54a
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ Rails/Exit:
Rails/HasAndBelongsToMany:
Enabled: false

# TODO: remove in rails 5
Rails/HttpPositionalArguments:
Enabled: false

Rails/Output:
Enabled: false

Expand Down
2 changes: 1 addition & 1 deletion config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 71cd54a

Please sign in to comment.