aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-02-11 07:53:12 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2010-02-11 09:07:19 -0800
commit2a2d1872e4e6863bb5ad088c0c5b34fd90f3789d (patch)
tree8afd5c0749b3b2a8a7ff6fe798a14cc7e64dd766 /Gemfile
parent8afcd33246868af0b3f1888b38ae72a1f489f77e (diff)
downloadrails-2a2d1872e4e6863bb5ad088c0c5b34fd90f3789d.tar.gz
rails-2a2d1872e4e6863bb5ad088c0c5b34fd90f3789d.tar.bz2
rails-2a2d1872e4e6863bb5ad088c0c5b34fd90f3789d.zip
CI: use minitest on 1.9 again.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile10
1 files changed, 2 insertions, 8 deletions
diff --git a/Gemfile b/Gemfile
index 0775e8eb98..7fbf57ba0b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-path File.expand_path('..', __FILE__)
+path File.dirname(__FILE__)
source 'http://gemcutter.org'
gem "rails", "3.0.0.beta1"
@@ -24,13 +24,7 @@ gem "RedCloth", ">= 4.2.2"
if ENV['CI']
gem "nokogiri", ">= 1.4.0"
- gem "memcache-client", ">= 1.7.6", :require => 'memcache'
# fcgi gem doesn't compile on 1.9
- # avoid minitest strangeness on 1.9
- if RUBY_VERSION < '1.9.0'
- gem "fcgi", ">= 0.8.7"
- else
- gem "test-unit", ">= 2.0.5", :require => 'test/unit'
- end
+ gem "fcgi", ">= 0.8.7" if RUBY_VERSION < '1.9.0'
end