blob: 866611857449b23a9a5cd7ef5908d69fa5420ff4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
Index: activesupport-2.3.5/lib/active_support/vendor.rb
===================================================================
--- activesupport-2.3.5.orig/lib/active_support/vendor.rb
+++ activesupport-2.3.5/lib/active_support/vendor.rb
@@ -1,11 +1,7 @@
# Prefer gems to the bundled libs.
require 'rubygems'
-begin
- gem 'builder', '~> 2.1.2'
-rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/vendor/builder-2.1.2"
-end
+gem 'builder', '~> 2.1.2'
require 'builder'
begin
@@ -14,15 +10,7 @@ rescue Gem::LoadError
$:.unshift "#{File.dirname(__FILE__)}/vendor/memcache-client-1.7.4"
end
-begin
- gem 'tzinfo', '~> 0.3.12'
-rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.12"
-end
+gem 'tzinfo', '~> 0.3.12'
-begin
- gem 'i18n', '>= 0.3.3'
-rescue Gem::LoadError
- $:.unshift "#{File.dirname(__FILE__)}/vendor/i18n-0.3.7"
-end
+gem 'i18n', '~> 0.3.3'
require 'i18n'
|
GitWeb
