Permalink
Browse files

Upgrade Rails to 3.1.10

  • Loading branch information...
1 parent 7224ebd commit 4b4934efc3b7d01ca3b82893ae06e7b0fdabc630 @FooBarWidget FooBarWidget committed Jan 8, 2013
Showing with 37 additions and 36 deletions.
  1. +3 −2 Gemfile
  2. +34 −34 Gemfile.lock
View
@@ -1,6 +1,7 @@
-source 'http://rubygems.org'
+source :rubygems
+ruby '1.9.3'
-gem 'rails', '3.1.6'
+gem 'rails', '3.1.10'
# Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git'
View
@@ -1,12 +1,12 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.6)
- actionpack (= 3.1.6)
+ actionmailer (3.1.10)
+ actionpack (= 3.1.10)
mail (~> 2.3.3)
- actionpack (3.1.6)
- activemodel (= 3.1.6)
- activesupport (= 3.1.6)
+ actionpack (3.1.10)
+ activemodel (= 3.1.10)
+ activesupport (= 3.1.10)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
@@ -15,25 +15,25 @@ GEM
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.4)
- activemodel (3.1.6)
- activesupport (= 3.1.6)
+ activemodel (3.1.10)
+ activesupport (= 3.1.10)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.6)
- activemodel (= 3.1.6)
- activesupport (= 3.1.6)
+ activerecord (3.1.10)
+ activemodel (= 3.1.10)
+ activesupport (= 3.1.10)
arel (~> 2.2.3)
tzinfo (~> 0.3.29)
- activeresource (3.1.6)
- activemodel (= 3.1.6)
- activesupport (= 3.1.6)
- activesupport (3.1.6)
+ activeresource (3.1.10)
+ activemodel (= 3.1.10)
+ activesupport (= 3.1.10)
+ activesupport (3.1.10)
multi_json (>= 1.0, < 1.3)
addressable (2.2.6)
arel (2.2.3)
bcrypt-ruby (3.0.1)
bluecloth (2.2.0)
- builder (3.0.0)
+ builder (3.0.4)
cancan (1.6.7)
capybara (1.1.2)
mime-types (>= 1.16)
@@ -85,14 +85,14 @@ GEM
multi_json (~> 1.0.3)
has_scope (0.5.1)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
inherited_resources (1.3.0)
has_scope (~> 0.5.0)
responders (~> 0.6.0)
jquery-rails (1.0.19)
railties (~> 3.0)
thor (~> 0.14)
- json (1.7.3)
+ json (1.7.6)
launchy (2.0.5)
addressable (~> 2.2.6)
libwebsocket (0.1.3)
@@ -101,37 +101,37 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.18)
+ mime-types (1.19)
multi_json (1.0.4)
mysql2 (0.3.10)
nokogiri (1.5.2)
orm_adapter (0.0.6)
polyglot (0.3.3)
- rack (1.3.6)
+ rack (1.3.8)
rack-cache (1.2)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.1.6)
- actionmailer (= 3.1.6)
- actionpack (= 3.1.6)
- activerecord (= 3.1.6)
- activeresource (= 3.1.6)
- activesupport (= 3.1.6)
+ rails (3.1.10)
+ actionmailer (= 3.1.10)
+ actionpack (= 3.1.10)
+ activerecord (= 3.1.10)
+ activeresource (= 3.1.10)
+ activesupport (= 3.1.10)
bundler (~> 1.0)
- railties (= 3.1.6)
- railties (3.1.6)
- actionpack (= 3.1.6)
- activesupport (= 3.1.6)
+ railties (= 3.1.10)
+ railties (3.1.10)
+ actionpack (= 3.1.10)
+ activesupport (= 3.1.10)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (0.9.2.2)
+ rake (10.0.3)
rdoc (3.12)
json (~> 1.4)
responders (0.6.4)
@@ -171,10 +171,10 @@ GEM
tilt (~> 1.1, != 1.3.0)
thor (0.14.6)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.35)
uglifier (1.1.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
@@ -205,7 +205,7 @@ DEPENDENCIES
jquery-rails (>= 1.0.12)
launchy
mysql2
- rails (= 3.1.6)
+ rails (= 3.1.10)
rspec-rails (~> 2.4)
sass-rails (~> 3.1.5)
schema_plus

0 comments on commit 4b4934e

Please sign in to comment.