diff --git a/railties/lib/rails/generators/rails/app/templates/rubocop.tt b/railties/lib/rails/generators/rails/app/templates/rubocop.tt index 369a05bedb568..96f5acb3b117c 100644 --- a/railties/lib/rails/generators/rails/app/templates/rubocop.tt +++ b/railties/lib/rails/generators/rails/app/templates/rubocop.tt @@ -1,27 +1,12 @@ #!/usr/bin/env ruby # frozen_string_literal: true -# -# This file was generated by Bundler. -# -# The application 'rubocop' is installed as part of a gem, and -# this file is here to facilitate running it. -# - ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__) -bundle_binstub = File.expand_path("bundle", __dir__) - -if File.file?(bundle_binstub) - if File.read(bundle_binstub, 300).include?("This file was generated by Bundler") - load(bundle_binstub) - else - abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run. -Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.") - end -end - require "rubygems" require "bundler/setup" +# explicit rubocop config increases performance slightly while avoiding config confusion. +ARGV.unshift("--config", File.expand_path("../.rubocop.yml", __dir__)) + load Gem.bin_path("rubocop", "rubocop")