aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2015-05-14 22:43:47 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2015-05-14 22:43:47 -0300
commita4dd94c61fd00d0f64189f6889a741b185edba8b (patch)
tree511797738feea796972485b44e847d6ca2a66ae7
parent1f06179db2a4bee54b319b237a158980c8f4f789 (diff)
parentbd6c03332ea4dea9be8444ae46cbe84df03f7bdc (diff)
downloadrails-a4dd94c61fd00d0f64189f6889a741b185edba8b.tar.gz
rails-a4dd94c61fd00d0f64189f6889a741b185edba8b.tar.bz2
rails-a4dd94c61fd00d0f64189f6889a741b185edba8b.zip
Merge pull request #20159 from vngrs/remove_unnecessary_set_requires
Remove redundant require 'set' lines
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb1
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb1
-rw-r--r--activerecord/lib/active_record/relation/merger.rb1
3 files changed, 0 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
index 77e64a22be..40c83b26af 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
@@ -1,7 +1,6 @@
require 'thread'
require 'thread_safe'
require 'monitor'
-require 'set'
module ActiveRecord
# Raised when a connection could not be obtained within the connection
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
index 0ccf0c498b..21321c9401 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
@@ -1,5 +1,4 @@
require 'date'
-require 'set'
require 'bigdecimal'
require 'bigdecimal/util'
diff --git a/activerecord/lib/active_record/relation/merger.rb b/activerecord/lib/active_record/relation/merger.rb
index 65b607ff1c..c3054f1fe9 100644
--- a/activerecord/lib/active_record/relation/merger.rb
+++ b/activerecord/lib/active_record/relation/merger.rb
@@ -1,5 +1,4 @@
require 'active_support/core_ext/hash/keys'
-require "set"
module ActiveRecord
class Relation