Browse files

updated rails

  • Loading branch information...
1 parent ee27558 commit baea5283af0a356dc905d578756dcf84f11e4bf3 @markryall markryall committed Apr 3, 2013
Showing with 40 additions and 40 deletions.
  1. +1 −1 Gemfile
  2. +39 −39 Gemfile.lock
View
2 Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '3.2.9'
+gem 'rails', '3.2.13'
gem 'slim'
gem 'paperclip'
gem 'aws-sdk'
View
78 Gemfile.lock
@@ -1,32 +1,32 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (3.2.9)
- actionpack (= 3.2.9)
- mail (~> 2.4.4)
- actionpack (3.2.9)
- activemodel (= 3.2.9)
- activesupport (= 3.2.9)
+ actionmailer (3.2.13)
+ actionpack (= 3.2.13)
+ mail (~> 2.5.3)
+ actionpack (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
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.9)
- activesupport (= 3.2.9)
+ activemodel (3.2.13)
+ activesupport (= 3.2.13)
builder (~> 3.0.0)
- activerecord (3.2.9)
- activemodel (= 3.2.9)
- activesupport (= 3.2.9)
+ activerecord (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.9)
- activemodel (= 3.2.9)
- activesupport (= 3.2.9)
- activesupport (3.2.9)
- i18n (~> 0.6)
+ activeresource (3.2.13)
+ activemodel (= 3.2.13)
+ activesupport (= 3.2.13)
+ activesupport (3.2.13)
+ i18n (= 0.6.1)
multi_json (~> 1.0)
addressable (2.3.2)
arel (3.0.2)
@@ -111,7 +111,7 @@ GEM
jquery-rails (2.1.1)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
- json (1.7.6)
+ json (1.7.7)
jwt (0.1.5)
multi_json (>= 1.0)
launchy (2.1.2)
@@ -120,12 +120,12 @@ GEM
libwebsocket (0.1.5)
addressable
machinist (2.0)
- mail (2.4.4)
+ mail (2.5.3)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.19)
- multi_json (1.5.0)
+ mime-types (1.22)
+ multi_json (1.7.2)
multi_xml (0.5.1)
multipart-post (1.1.5)
nokogiri (1.5.5)
@@ -141,21 +141,21 @@ GEM
pusher (0.11.1)
multi_json (~> 1.0)
signature (~> 0.1.6)
- rack (1.4.3)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
- rack-ssl (1.3.2)
+ rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.9)
- actionmailer (= 3.2.9)
- actionpack (= 3.2.9)
- activerecord (= 3.2.9)
- activeresource (= 3.2.9)
- activesupport (= 3.2.9)
+ rails (3.2.13)
+ actionmailer (= 3.2.13)
+ actionpack (= 3.2.13)
+ activerecord (= 3.2.13)
+ activeresource (= 3.2.13)
+ activesupport (= 3.2.13)
bundler (~> 1.0)
- railties (= 3.2.9)
+ railties (= 3.2.13)
rails_best_practices (1.11.1)
activesupport
awesome_print
@@ -164,16 +164,16 @@ GEM
erubis
i18n
progressbar
- railties (3.2.9)
- actionpack (= 3.2.9)
- activesupport (= 3.2.9)
+ railties (3.2.13)
+ actionpack (= 3.2.13)
+ activesupport (= 3.2.13)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (10.0.3)
+ rake (10.0.4)
rdiscount (1.6.8)
- rdoc (3.12)
+ rdoc (3.12.2)
json (~> 1.4)
rspec (2.11.0)
rspec-core (~> 2.11.0)
@@ -236,12 +236,12 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.16.0)
- tilt (1.3.3)
+ thor (0.18.1)
+ tilt (1.3.6)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.35)
+ tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
@@ -270,7 +270,7 @@ DEPENDENCIES
paperclip
pg
pusher
- rails (= 3.2.9)
+ rails (= 3.2.13)
rails_best_practices (~> 1.11.1)
rdiscount
rspec-rails

0 comments on commit baea528

Please sign in to comment.