diff options
author | Xavier Noria <fxn@hashref.com> | 2016-08-07 11:48:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-07 11:48:29 +0200 |
commit | fb98d2e57162876c0e1823a5357bc44a932d08b9 (patch) | |
tree | 2c3225f7698ef3f7b2556510136c64a58ecf7355 /activerecord/lib/active_record | |
parent | 0d12708f3967fe93c172b30bd3e98e4433761c36 (diff) | |
parent | 762e3f05f3d372cb32570db0deeef27232c4dd00 (diff) | |
download | rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.gz rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.tar.bz2 rails-fb98d2e57162876c0e1823a5357bc44a932d08b9.zip |
Merge pull request #26077 from kamipo/add_stype_empty_lines
Add `Style/EmptyLines` in `.rubocop.yml` and remove extra empty lines
Diffstat (limited to 'activerecord/lib/active_record')
6 files changed, 0 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/through_association.rb b/activerecord/lib/active_record/associations/preloader/through_association.rb index f53c30f80e..be9dfe7686 100644 --- a/activerecord/lib/active_record/associations/preloader/through_association.rb +++ b/activerecord/lib/active_record/associations/preloader/through_association.rb @@ -79,7 +79,6 @@ module ActiveRecord end end - def through_scope scope = through_reflection.klass.unscoped diff --git a/activerecord/lib/active_record/connection_adapters/schema_cache.rb b/activerecord/lib/active_record/connection_adapters/schema_cache.rb index d1708a6af8..8219f132c3 100644 --- a/activerecord/lib/active_record/connection_adapters/schema_cache.rb +++ b/activerecord/lib/active_record/connection_adapters/schema_cache.rb @@ -35,7 +35,6 @@ module ActiveRecord alias table_exists? data_source_exists? deprecate table_exists?: "use #data_source_exists? instead" - # Add internal cache for table with +table_name+. def add(table_name) if data_source_exists?(table_name) diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 21a6a2c55f..1b6cda3861 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -184,7 +184,6 @@ module ActiveRecord end end - # In de/serialize we change `nil` to 0, so that we can allow passing # `nil` values to `lock_version`, and not result in `ActiveRecord::StaleObjectError` # during update record. diff --git a/activerecord/lib/active_record/railtie.rb b/activerecord/lib/active_record/railtie.rb index 35c19b27bb..989d23bc37 100644 --- a/activerecord/lib/active_record/railtie.rb +++ b/activerecord/lib/active_record/railtie.rb @@ -23,7 +23,6 @@ module ActiveRecord "ActiveRecord::RecordNotSaved" => :unprocessable_entity ) - config.active_record.use_schema_cache_dump = true config.active_record.maintain_test_schema = true diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index 7caac60960..3553ff4da3 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -317,7 +317,6 @@ module ActiveRecord end end - # Holds all the meta-data about an aggregation as it was specified in the # Active Record class. class AggregateReflection < MacroReflection #:nodoc: diff --git a/activerecord/lib/active_record/relation/predicate_builder.rb b/activerecord/lib/active_record/relation/predicate_builder.rb index df663a84ed..ad3a0ba7c7 100644 --- a/activerecord/lib/active_record/relation/predicate_builder.rb +++ b/activerecord/lib/active_record/relation/predicate_builder.rb @@ -92,7 +92,6 @@ module ActiveRecord end end - def create_binds_for_hash(attributes) result = attributes.dup binds = [] |