Permalink
Browse files

Updated to rails 3.2.12

  • Loading branch information...
1 parent 3f1cd88 commit 55a91f0bf77a1558852437be5684f7e2d18188bc @andrew andrew committed Feb 12, 2013
Showing with 34 additions and 34 deletions.
  1. +1 −1 Gemfile
  2. +33 −33 Gemfile.lock
View
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
ruby "1.9.3"
-gem 'rails', '3.2.11'
+gem 'rails', '3.2.12'
gem 'pg'
gem 'unicorn'
gem 'foreman'
View
@@ -1,31 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.11)
- actionpack (= 3.2.11)
+ actionmailer (3.2.12)
+ actionpack (= 3.2.12)
mail (~> 2.4.4)
- actionpack (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ actionpack (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
- rack (~> 1.4.0)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.11)
- activesupport (= 3.2.11)
+ activemodel (3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
- activerecord (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
+ activerecord (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.11)
- activemodel (= 3.2.11)
- activesupport (= 3.2.11)
- activesupport (3.2.11)
+ activeresource (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ activesupport (3.2.12)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
@@ -46,8 +46,8 @@ GEM
chai-jquery-rails (0.0.3)
railties (~> 3.1)
sprockets
- childprocess (0.3.7)
- ffi (~> 1.0, >= 1.0.6)
+ childprocess (0.3.8)
+ ffi (~> 1.0, >= 1.0.11)
coderay (1.0.8)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
@@ -115,7 +115,7 @@ GEM
jquery-rails (2.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- json (1.7.6)
+ json (1.7.7)
jwt (0.1.5)
multi_json (>= 1.0)
kaminari (0.14.1)
@@ -146,7 +146,7 @@ GEM
mime-types (1.21)
mocha (0.10.5)
metaclass (~> 0.0.1)
- multi_json (1.5.0)
+ multi_json (1.5.1)
multi_xml (0.5.3)
multipart-post (1.1.5)
netrc (0.7.7)
@@ -195,7 +195,7 @@ GEM
slop (~> 3.4)
quiet_assets (1.0.1)
railties (~> 3.1)
- rabl (0.7.9)
+ rabl (0.7.10)
activesupport (>= 2.3.14)
multi_json (~> 1.0)
rack (1.4.5)
@@ -206,17 +206,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.11)
- actionmailer (= 3.2.11)
- actionpack (= 3.2.11)
- activerecord (= 3.2.11)
- activeresource (= 3.2.11)
- activesupport (= 3.2.11)
+ rails (3.2.12)
+ actionmailer (= 3.2.12)
+ actionpack (= 3.2.12)
+ activerecord (= 3.2.12)
+ activeresource (= 3.2.12)
+ activesupport (= 3.2.12)
bundler (~> 1.0)
- railties (= 3.2.11)
- railties (3.2.11)
- actionpack (= 3.2.11)
- activesupport (= 3.2.11)
+ railties (= 3.2.12)
+ railties (3.2.12)
+ actionpack (= 3.2.12)
+ activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
@@ -284,15 +284,15 @@ GEM
rack (>= 1.0.0)
thor (0.17.0)
tilt (1.3.3)
- timecop (0.5.9.1)
+ timecop (0.5.9.2)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
twitter (4.5.0)
faraday (~> 0.8, < 0.10)
multi_json (~> 1.0)
simple_oauth (~> 0.2)
- twitter-bootstrap-rails (2.2.1)
+ twitter-bootstrap-rails (2.2.3)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
@@ -343,7 +343,7 @@ DEPENDENCIES
quiet_assets
rabl
rack-google-analytics
- rails (= 3.2.11)
+ rails (= 3.2.12)
rb-fsevent (~> 0.9.1)
rspec-rails
ruby_gntp

0 comments on commit 55a91f0

Please sign in to comment.