Permalink
Browse files

Merge pull request #768 from jrgifford/updating-rails

Updated rails, set ratom to point to a patched git branch until it is merged.
  • Loading branch information...
2 parents ab63631 + 3d79d22 commit bc908b622bb7ebeead3f7ca3af843624c66bb5f5 @wilkie wilkie committed Aug 4, 2013
Showing with 40 additions and 35 deletions.
  1. +2 −2 Gemfile
  2. +38 −33 Gemfile.lock
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
-gem 'rails', '3.2.12'
+gem 'rails', '3.2.14'
# Gems used only for assets and not required
# in production environments by default.
@@ -34,7 +34,7 @@ gem "tire", "~> 0.4.1"
gem "twitter", "~> 4.8.0"
gem "pony", "~> 1.3"
gem "rdiscount", "~> 1.6.8"
-gem "ratom", "~> 0.7.2"
+gem "ratom", :git => "git://github.com/jrgifford/ratom.git", :branch => 'make-it-work-on-ubuntu-systems'
gem "ostatus", "~> 0.0.12"
gem "osub", "~> 0.0.6"
gem "opub", "~> 0.0.1"
View
@@ -25,6 +25,14 @@ GIT
nokogiri (>= 1.4.0)
rest-client (>= 1.5.0)
+GIT
+ remote: git://github.com/jrgifford/ratom.git
+ revision: 9f9495573d40458a655840993cbcd1b6608761a0
+ branch: make-it-work-on-ubuntu-systems
+ specs:
+ ratom (0.7.2)
+ libxml-ruby (~> 2.3)
+
GIT
remote: git://github.com/rtomayko/rocco.git
revision: 7d3ba197ccf010973942de23596a7e60423b862a
@@ -37,32 +45,32 @@ GEM
remote: http://rubygems.org/
specs:
aaronh-chronic (0.3.9)
- actionmailer (3.2.12)
- actionpack (= 3.2.12)
- mail (~> 2.4.4)
- actionpack (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ actionmailer (3.2.14)
+ actionpack (= 3.2.14)
+ mail (~> 2.5.4)
+ actionpack (3.2.14)
+ activemodel (= 3.2.14)
+ activesupport (= 3.2.14)
builder (~> 3.0.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
- activemodel (3.2.12)
- activesupport (= 3.2.12)
+ activemodel (3.2.14)
+ activesupport (= 3.2.14)
builder (~> 3.0.0)
- activerecord (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
+ activerecord (3.2.14)
+ activemodel (= 3.2.14)
+ activesupport (= 3.2.14)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.12)
- activemodel (= 3.2.12)
- activesupport (= 3.2.12)
- activesupport (3.2.12)
- i18n (~> 0.6)
+ activeresource (3.2.14)
+ activemodel (= 3.2.14)
+ activesupport (= 3.2.14)
+ activesupport (3.2.14)
+ i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.2.8)
airbrake (3.0.9)
@@ -134,9 +142,8 @@ GEM
launchy (2.0.5)
addressable (~> 2.2.6)
libv8 (3.11.8.17)
- libxml-ruby (2.3.3)
- mail (2.4.4)
- i18n (>= 0.4.0)
+ libxml-ruby (2.6.0)
+ mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
@@ -188,24 +195,22 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.12)
- actionmailer (= 3.2.12)
- actionpack (= 3.2.12)
- activerecord (= 3.2.12)
- activeresource (= 3.2.12)
- activesupport (= 3.2.12)
+ rails (3.2.14)
+ actionmailer (= 3.2.14)
+ actionpack (= 3.2.14)
+ activerecord (= 3.2.14)
+ activeresource (= 3.2.14)
+ activesupport (= 3.2.14)
bundler (~> 1.0)
- railties (= 3.2.12)
- railties (3.2.12)
- actionpack (= 3.2.12)
- activesupport (= 3.2.12)
+ railties (= 3.2.14)
+ railties (3.2.14)
+ actionpack (= 3.2.14)
+ activesupport (= 3.2.14)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (10.1.0)
- ratom (0.7.2)
- libxml-ruby (~> 2.3.2)
rdiscount (1.6.8)
rdoc (3.12.2)
json (~> 1.4)
@@ -309,8 +314,8 @@ DEPENDENCIES
puma (~> 1.6.3)
pygmentize (~> 0.0.3)
quiet_assets (~> 1.0.0)
- rails (= 3.2.12)
- ratom (~> 0.7.2)
+ rails (= 3.2.14)
+ ratom!
rdiscount (~> 1.6.8)
redfinger!
rocco!

0 comments on commit bc908b6

Please sign in to comment.