From 2bfa477128ef36e5664709684b51c20bebf1ee70 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 17 Dec 2009 12:02:19 -0800 Subject: Fix deprecated :vendored_at option --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 87bf43b786..d979add5b3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" -gem "rails", "3.0.pre", :vendored_at => "railties" +gem "rails", "3.0.pre", :path => "railties" %w(activesupport activemodel actionpack actionmailer activerecord activeresource).each do |lib| - gem lib, '3.0.pre', :vendored_at => lib + gem lib, '3.0.pre', :path => lib end # AR -- cgit v1.2.3 From 17b6053083767e5747c0f522b83a69e268d9d69e Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 22 Dec 2009 15:45:10 -0600 Subject: Float on rack/master in preparation for rack 1.1 gem release --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d979add5b3..7ef6c2e6f2 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem "pg", ">= 0.8.0" gem "mysql", ">= 2.8.1" # AP -gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" +gem "rack", "1.1.0", :git => "git://github.com/rack/rack.git" gem "RedCloth", ">= 4.2.2" if ENV['CI'] -- cgit v1.2.3 From ec095456d859da4a09c7401585c211dc0f01fccd Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 22 Dec 2009 17:29:25 -0800 Subject: Dont auto require rubygems, move dep on rack-test to Gemfile --- Gemfile | 1 + 1 file changed, 1 insertion(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index d979add5b3..8a5119de8d 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ gem "mysql", ">= 2.8.1" # AP gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" +gem "rack-test", "0.5.3" gem "RedCloth", ">= 4.2.2" if ENV['CI'] -- cgit v1.2.3 From 38aeb1528c376f7a058beea6db0a328720b85f01 Mon Sep 17 00:00:00 2001 From: Carlhuda Date: Wed, 23 Dec 2009 14:55:12 -0800 Subject: Moving out some framework specific initializers into the framework libraries. --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index aaacbce8c6..361074dce6 100644 --- a/Gemfile +++ b/Gemfile @@ -31,3 +31,5 @@ if ENV['CI'] gem "test-unit", ">= 2.0.5" end end + +disable_system_gems \ No newline at end of file -- cgit v1.2.3 From 135d32c8bd91608c12a394ca5dbd65f358bbce42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Fri, 25 Dec 2009 15:15:13 +0100 Subject: Move i18n to Gemfile. --- Gemfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 361074dce6..4ffa9e00e8 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,9 @@ gem "rails", "3.0.pre", :path => "railties" gem lib, '3.0.pre', :path => lib end +# AS +gem "i18n", ">= 0.3.0" + # AR gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git" gem "sqlite3-ruby", ">= 1.2.5" @@ -32,4 +35,4 @@ if ENV['CI'] end end -disable_system_gems \ No newline at end of file +disable_system_gems -- cgit v1.2.3 From c039bcdb1c94d8b28fc9398d4b88b4453cdd9fb1 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Mon, 28 Dec 2009 12:25:14 +1100 Subject: Moved sort_parts into Mail, updated mail requirement to 1.4.2 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') diff --git a/Gemfile b/Gemfile index 0df5a36c61..8e420b1c64 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ end gem "i18n", ">= 0.3.0" # AM -gem "mail", ">= 1.4.1" +gem "mail", ">= 1.4.2" # AR gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git" -- cgit v1.2.3