Browse files

Rails 3.1.0.rc6

  • Loading branch information...
1 parent 12134b7 commit 9729d79907450dfbc6b89ddd351156d15241d44f @andrew committed Aug 18, 2011
Showing with 41 additions and 44 deletions.
  1. +1 −1 Gemfile
  2. +40 −43 Gemfile.lock
View
2 Gemfile
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.0.rc5'
+gem 'rails', '3.1.0.rc6'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
View
83 Gemfile.lock
@@ -8,44 +8,42 @@ GIT
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
+ actionmailer (3.1.0.rc6)
+ actionpack (= 3.1.0.rc6)
mail (~> 2.3.0)
- actionpack (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ actionpack (3.1.0.rc6)
+ activemodel (= 3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.1)
+ rack (~> 1.3.2)
rack-cache (~> 1.0.2)
rack-mount (~> 0.8.1)
rack-test (~> 0.6.0)
sprockets (~> 2.0.0.beta.12)
- activemodel (3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ activemodel (3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
bcrypt-ruby (~> 2.1.4)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- arel (~> 2.1.4)
+ activerecord (3.1.0.rc6)
+ activemodel (= 3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
+ arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0.rc5)
- activemodel (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
- activesupport (3.1.0.rc5)
+ activeresource (3.1.0.rc6)
+ activemodel (= 3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
+ activesupport (3.1.0.rc6)
multi_json (~> 1.0)
ansi (1.3.0)
- arel (2.1.4)
+ arel (2.2.1)
bcrypt-ruby (2.1.4)
builder (3.0.0)
- coffee-rails (3.1.0.rc.5)
- actionpack (~> 3.1.0.rc1)
+ coffee-rails (3.1.0.rc.6)
coffee-script (>= 2.2.0)
railties (~> 3.1.0.rc1)
- sprockets (>= 2.0.0.beta.9)
coffee-script (2.2.0)
coffee-script-source
execjs
@@ -56,9 +54,9 @@ GEM
execjs (1.2.4)
multi_json (~> 1.0)
haml (3.1.2)
- hike (1.2.0)
+ hike (1.2.1)
i18n (0.6.0)
- jquery-rails (1.0.12)
+ jquery-rails (1.0.13)
railties (~> 3.0)
thor (~> 0.14)
mail (2.3.0)
@@ -73,45 +71,44 @@ GEM
mime-types (1.16)
multi_json (1.0.3)
net-http-digest_auth (1.1.1)
- net-http-persistent (1.8)
+ net-http-persistent (1.8.1)
nokogiri (1.5.0)
polyglot (0.3.2)
rack (1.3.2)
rack-cache (1.0.2)
rack (>= 0.4)
- rack-mount (0.8.1)
+ rack-mount (0.8.2)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0.rc5)
- actionmailer (= 3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
- activerecord (= 3.1.0.rc5)
- activeresource (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ rails (3.1.0.rc6)
+ actionmailer (= 3.1.0.rc6)
+ actionpack (= 3.1.0.rc6)
+ activerecord (= 3.1.0.rc6)
+ activeresource (= 3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
bundler (~> 1.0)
- railties (= 3.1.0.rc5)
- railties (3.1.0.rc5)
- actionpack (= 3.1.0.rc5)
- activesupport (= 3.1.0.rc5)
+ railties (= 3.1.0.rc6)
+ railties (3.1.0.rc6)
+ actionpack (= 3.1.0.rc6)
+ activesupport (= 3.1.0.rc6)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2)
- rdoc (3.9.1)
+ rdoc (3.9.2)
sass (3.1.7)
- sass-rails (3.1.0.rc.5)
- actionpack (~> 3.1.0.rc1)
- railties (~> 3.1.0.rc1)
+ sass-rails (3.1.0.rc.6)
+ actionpack (~> 3.1.0.rc6)
+ railties (~> 3.1.0.rc6)
sass (>= 3.1.4)
- sprockets (>= 2.0.0.beta.9)
sprockets (2.0.0.beta.13)
hike (~> 1.2)
rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
+ tilt (!= 1.3.0, ~> 1.1)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -124,10 +121,10 @@ GEM
turn (0.8.2)
ansi (>= 1.2.2)
tzinfo (0.3.29)
- uglifier (1.0.0)
+ uglifier (1.0.1)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- webrobots (0.0.10)
+ webrobots (0.0.11)
nokogiri (>= 1.4.4)
PLATFORMS
@@ -138,7 +135,7 @@ DEPENDENCIES
haml
instascraper!
jquery-rails
- rails (= 3.1.0.rc5)
+ rails (= 3.1.0.rc6)
sass-rails (~> 3.1.0.rc)
thin
turn

0 comments on commit 9729d79

Please sign in to comment.