diff --git a/.rubocop.yml b/.rubocop.yml index 3aeb308a..dc9c9b45 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1 +1,2 @@ -inherit_gem: { rubocop-37signals: rubocop.yml } +inherit_gem: + rubocop-rails-omakase: rubocop.yml diff --git a/Gemfile b/Gemfile index 8b9f3384..73c38830 100644 --- a/Gemfile +++ b/Gemfile @@ -4,5 +4,5 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } gemspec group :rubocop do - gem "rubocop-37signals", github: "basecamp/house-style", require: false + gem "rubocop-rails-omakase", require: false end diff --git a/Gemfile.lock b/Gemfile.lock index cfbab9cf..3aed5e98 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,13 +1,3 @@ -GIT - remote: https://github.com/basecamp/house-style.git - revision: a9ca7e4ab80b72c1a10053c50efefe8cd275e3b8 - specs: - rubocop-37signals (1.0.0) - rubocop - rubocop-minitest - rubocop-performance - rubocop-rails - PATH remote: . specs: @@ -130,7 +120,7 @@ GEM reline (0.4.2) io-console (~> 0.5) rexml (3.2.6) - rubocop (1.61.0) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -138,14 +128,14 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.1) + rubocop-ast (1.31.2) parser (>= 3.3.0.4) - rubocop-minitest (0.34.5) - rubocop (>= 1.39, < 2.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-minitest (0.35.0) + rubocop (>= 1.61, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) @@ -154,6 +144,11 @@ GEM rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) + rubocop-rails-omakase (1.0.0) + rubocop + rubocop-minitest + rubocop-performance + rubocop-rails ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) sshkit (1.21.7) @@ -178,7 +173,7 @@ DEPENDENCIES kamal! mocha railties - rubocop-37signals! + rubocop-rails-omakase BUNDLED WITH 2.4.3