diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-07-27 09:05:41 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-27 09:05:41 +0900 |
| commit | b4d91bb41f9cc555d80d0cb6b0a41179d26fa252 (patch) | |
| tree | db235b3475096508d6400010b08ada428968ce2d /activerecord | |
| parent | e03add224899e0a10e7cfa28c09e68c8b9c920ed (diff) | |
| parent | 1933fbaecf5efa982c4214fed51d88d120ffe236 (diff) | |
| download | rails-b4d91bb41f9cc555d80d0cb6b0a41179d26fa252.tar.gz rails-b4d91bb41f9cc555d80d0cb6b0a41179d26fa252.tar.bz2 rails-b4d91bb41f9cc555d80d0cb6b0a41179d26fa252.zip | |
Merge pull request #33441 from bogdanvlviv/remove-rubocop-comments-from-codebase
Remove Rubocop's comments from Rails code base
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/relation_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/relation_test.rb b/activerecord/test/cases/relation_test.rb index 3ca15640fd..fbeb617b29 100644 --- a/activerecord/test/cases/relation_test.rb +++ b/activerecord/test/cases/relation_test.rb @@ -187,7 +187,7 @@ module ActiveRecord end relation = Relation.new(klass) - relation.merge!(where: ["foo = ?", "bar"]) # rubocop:disable Performance/RedundantMerge + relation.merge!(where: ["foo = ?", "bar"]) assert_equal Relation::WhereClause.new(["foo = bar"]), relation.where_clause end |