aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-07-01 02:25:35 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-07-01 10:44:53 -0700
commitd7c1057652cfc971bb35ef09b0b1560fcd28ed70 (patch)
treee68399a19d2225543a7e02cef7171f7c601b1ee2
parent53b34e84762b7f2d6b641f99dadbb1eab42907ab (diff)
downloadrails-d7c1057652cfc971bb35ef09b0b1560fcd28ed70.tar.gz
rails-d7c1057652cfc971bb35ef09b0b1560fcd28ed70.tar.bz2
rails-d7c1057652cfc971bb35ef09b0b1560fcd28ed70.zip
Bump bundler dependency to 1.0.0.beta.2 or later
-rw-r--r--.gitignore1
-rw-r--r--rails.gemspec2
-rw-r--r--railties/guides/source/initialization.textile2
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 16bffc157b..2dfdf96e7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
*.gem
pkg
.bundle
+Gemfile.lock
debug.log
doc/rdoc
activemodel/doc
diff --git a/rails.gemspec b/rails.gemspec
index 236203c626..819513c4b5 100644
--- a/rails.gemspec
+++ b/rails.gemspec
@@ -25,5 +25,5 @@ Gem::Specification.new do |s|
s.add_dependency('activeresource', version)
s.add_dependency('actionmailer', version)
s.add_dependency('railties', version)
- s.add_dependency('bundler', '>= 0.9.26')
+ s.add_dependency('bundler', '>= 1.0.0.beta.2')
end
diff --git a/railties/guides/source/initialization.textile b/railties/guides/source/initialization.textile
index cedf823bdc..8498f79f4e 100644
--- a/railties/guides/source/initialization.textile
+++ b/railties/guides/source/initialization.textile
@@ -141,7 +141,7 @@ Here the only two gems we need are +rails+ and +sqlite3-ruby+, so it seems. This
* activesupport-3.0.0.beta4.gem
* arel-0.4.0.gem
* builder-2.1.2.gem
-* bundler-0.9.26.gem
+* bundler-1.0.0.beta.2.gem
* erubis-2.6.5.gem
* i18n-0.4.1.gem
* mail-2.2.4.gem