aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-02-17 00:48:04 +0100
committerJosé Valim <jose.valim@gmail.com>2010-02-17 00:48:04 +0100
commit3f948a0e2951a8bb7f32e98a404fb5ff97cb2896 (patch)
tree8528d926c137a3a0f18c21642a8b6be1f334b6df /activerecord/lib
parentd4e008fd0f9ebac3383a0c3ac093de68db9e2e66 (diff)
parent762088a0ef1f69ab09833732cfe8190098303ee6 (diff)
downloadrails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.gz
rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.bz2
rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.zip
Merge master.
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb
index b79da4565d..99ff0a19a5 100644
--- a/activerecord/lib/active_record.rb
+++ b/activerecord/lib/active_record.rb
@@ -21,7 +21,6 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++
-
activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)