kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #35989 from koic/bump_rubocop_to_0_67_2

Browse source 
Bump RuboCop to 0.67.2
This commit is contained in:
Ryuta Kamizono 2019-04-16 18:14:49 +09:00 committed by GitHub
commit 96851dcee6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.codeclimate.yml
View file

@ -25,6 +25,6 @@ checks:
plugins:
rubocop:
enabled: true
channel: rubocop-0-66
channel: rubocop-0-67
exclude_patterns: []

2
.rubocop.yml
View file

@ -1,3 +1,5 @@
require: rubocop-performance
AllCops:
TargetRubyVersion: 2.5
# RuboCop has a bunch of cops enabled by default. This setting tells RuboCop

1
Gemfile
View file

@ -29,6 +29,7 @@ gem "uglifier", ">= 1.3.0", require: false
gem "json", ">= 2.0.0"
gem "rubocop", ">= 0.47", require: false
gem "rubocop-performance", require: false
group :doc do
gem "sdoc", "~> 1.0"

5
Gemfile.lock
View file

@ -411,7 +411,7 @@ GEM
resque (~> 1.26)
rufus-scheduler (~> 3.2)
retriable (3.1.2)
rubocop (0.66.0)
rubocop (0.67.2)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
@ -419,6 +419,8 @@ GEM
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.6)
rubocop-performance (1.1.0)
rubocop (>= 0.67.0)
ruby-progressbar (1.10.0)
ruby-vips (2.0.13)
ffi (~> 1.9)
@ -581,6 +583,7 @@ DEPENDENCIES
resque
resque-scheduler
rubocop (>= 0.47)
rubocop-performance
sass-rails
sdoc (~> 1.0)
selenium-webdriver (>= 3.5.0, < 3.13.0)

6
actionview/test/template/resolver_shared_tests.rb
View file

@ -1,3 +1,5 @@
# frozen_string_literal: true
module ResolverSharedTests
attr_reader :tmpdir
@ -7,7 +9,7 @@ module ResolverSharedTests
end
end
def with_file(filename, source="File at #{filename}")
def with_file(filename, source = "File at #{filename}")
path = File.join(tmpdir, filename)
FileUtils.mkdir_p(File.dirname(path))
File.write(path, source)
@ -103,7 +105,7 @@ module ResolverSharedTests
c = context.find("hello_world", "test", false, [], {})
# disable_cache should give us a new object
refute_same a, b
assert_not_same a, b
# but it should not clear the cache
assert_same a, c

4
activerecord/test/cases/connection_adapters/connection_handlers_multi_db_test.rb
View file

@ -209,7 +209,7 @@ module ActiveRecord
config = {
"default_env" => {
"animals" => { adapter: "sqlite3", database: "db/animals.sqlite3" },
"primary" => { adapter: "sqlite3", database: "db/primary.sqlite3" }
"primary" => { adapter: "sqlite3", database: "db/primary.sqlite3" }
}
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config
@ -236,7 +236,7 @@ module ActiveRecord
config = {
"default_env" => {
"animals" => { adapter: "sqlite3", database: "db/animals.sqlite3" },
"primary" => { adapter: "sqlite3", database: "db/primary.sqlite3" }
"primary" => { adapter: "sqlite3", database: "db/primary.sqlite3" }
}
}
@prev_configs, ActiveRecord::Base.configurations = ActiveRecord::Base.configurations, config