Permalink
Browse files

Update rails

  • Loading branch information...
1 parent 3292c5e commit 3f2b0e5433673ddee6b8322bb423415a196a0362 @ppworks committed Jan 11, 2013
Showing with 40 additions and 39 deletions.
  1. +1 −1 Gemfile
  2. +39 −38 Gemfile.lock
View
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.6'
+gem 'rails', '3.2.11'
ruby '1.9.3'
# Gems used only for assets and not required
View
@@ -1,38 +1,38 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.6)
- actionpack (= 3.2.6)
+ actionmailer (3.2.11)
+ actionpack (= 3.2.11)
mail (~> 2.4.4)
- actionpack (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ actionpack (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
+ journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.6)
- activesupport (= 3.2.6)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.11)
+ activesupport (= 3.2.11)
builder (~> 3.0.0)
- activerecord (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ activerecord (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
- activesupport (3.2.6)
+ activeresource (3.2.11)
+ activemodel (= 3.2.11)
+ activesupport (= 3.2.11)
+ activesupport (3.2.11)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.8)
arel (3.0.2)
attr_required (0.0.5)
bcrypt-ruby (3.0.1)
- builder (3.0.0)
+ builder (3.0.4)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -89,12 +89,12 @@ GEM
hike (1.2.1)
httpauth (0.1)
httpclient (2.2.5)
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.7.3)
+ json (1.7.6)
kaminari (0.13.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
@@ -116,7 +116,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- multi_json (1.3.6)
+ multi_json (1.5.0)
multipart-post (1.1.5)
netrc (0.7.4)
newrelic_rpm (3.4.0)
@@ -145,7 +145,7 @@ GEM
orm_adapter (0.3.0)
pg (0.13.2)
polyglot (0.3.3)
- rack (1.4.1)
+ rack (1.4.3)
rack-cache (1.2)
rack (>= 0.4)
rack-oauth2 (0.14.4)
@@ -157,26 +157,26 @@ GEM
rack (>= 1.1)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.6)
- actionmailer (= 3.2.6)
- actionpack (= 3.2.6)
- activerecord (= 3.2.6)
- activeresource (= 3.2.6)
- activesupport (= 3.2.6)
+ rails (3.2.11)
+ actionmailer (= 3.2.11)
+ actionpack (= 3.2.11)
+ activerecord (= 3.2.11)
+ activeresource (= 3.2.11)
+ activesupport (= 3.2.11)
bundler (~> 1.0)
- railties (= 3.2.6)
+ railties (= 3.2.11)
rails_autolink (1.0.9)
rails (~> 3.1)
- railties (3.2.6)
- actionpack (= 3.2.6)
- activesupport (= 3.2.6)
+ railties (3.2.11)
+ actionpack (= 3.2.11)
+ activesupport (= 3.2.11)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
+ rake (10.0.3)
rb-fchange (0.0.5)
ffi
rb-fsevent (0.9.1)
@@ -210,8 +210,9 @@ GEM
sinatra (1.0)
rack (>= 1.0)
spork (0.9.2)
- sprockets (2.1.3)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
@@ -226,9 +227,9 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.15.3)
+ thor (0.16.0)
tilt (1.3.3)
- treetop (1.4.10)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
twitter (2.5.0)
@@ -240,7 +241,7 @@ GEM
less-rails (~> 2.2.2)
railties (>= 3.1)
therubyracer (~> 0.10.1)
- tzinfo (0.3.33)
+ tzinfo (0.3.35)
uglifier (1.2.5)
execjs (>= 0.3.0)
multi_json (~> 1.3)
@@ -269,7 +270,7 @@ DEPENDENCIES
omniauth-github
omniauth-twitter
pg
- rails (= 3.2.6)
+ rails (= 3.2.11)
rails_autolink
rb-fsevent
rspec-rails

0 comments on commit 3f2b0e5

Please sign in to comment.