diff --git a/.rubocop.yml b/.rubocop.yml index 2815b6e48..6e91d3296 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -35,12 +35,7 @@ Style/IfUnlessModifier: StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier' Enabled: false -Style/TrailingCommaInArrayLiteral: - Description: 'Checks for trailing comma in array and hash literals.' - StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas' - Enabled: false - -Style/TrailingCommaInHashLiteral: +Style/TrailingCommaInLiteral: Description: 'Checks for trailing comma in array and hash literals.' StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas' Enabled: false @@ -204,7 +199,7 @@ Metrics/ModuleLength: Metrics/BlockLength: Enabled: false -Style/RescueStandardError: +Lint/RescueWithoutErrorClass: Enabled: false Rails/ApplicationRecord: diff --git a/Gemfile b/Gemfile index 3a0084fb5..c980c2377 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' # core - base -ruby '2.4.3' -gem 'rails', '5.1.5' +ruby '2.4.2' +gem 'rails', '5.1.4' # core - rails additions gem 'activerecord-session_store'