blob: a5b8a9cba173dc344b4e0d7bfd2e623bb6774905 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
diff --git a/lib/active_record.rb b/lib/active_record.rb
index 2f8c5c7..424faeb 100644
--- a/lib/active_record.rb
+++ b/lib/active_record.rb
@@ -21,15 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++
-begin
- require 'active_support'
-rescue LoadError
- activesupport_path = "#{File.dirname(__FILE__)}/../../activesupport/lib"
- if File.directory?(activesupport_path)
- $:.unshift activesupport_path
- require 'active_support'
- end
-end
+require 'active_support'
module ActiveRecord
# TODO: Review explicit loads to see if they will automatically be handled by the initilizer.
|
