Skip to content
This repository has been archived by the owner on Apr 26, 2022. It is now read-only.

Commit

Permalink
Merge pull request #174 from mezis/update-rails
Browse files Browse the repository at this point in the history
Update rails
  • Loading branch information
mezis committed Nov 21, 2013
2 parents f8bde77 + f19ee1c commit cbd47ce
Showing 1 changed file with 32 additions and 32 deletions.
64 changes: 32 additions & 32 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
GEM
remote: https://rubygems.org/
remote: http://yarp.dev/
specs:
actionmailer (3.2.14)
actionpack (= 3.2.14)
actionmailer (3.2.15)
actionpack (= 3.2.15)
mail (~> 2.5.4)
actionpack (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
actionpack (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
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.14)
activesupport (= 3.2.14)
activemodel (3.2.15)
activesupport (= 3.2.15)
builder (~> 3.0.0)
activerecord (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
activerecord (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.14)
activemodel (= 3.2.14)
activesupport (= 3.2.14)
activesupport (3.2.14)
activeresource (3.2.15)
activemodel (= 3.2.15)
activesupport (= 3.2.15)
activesupport (3.2.15)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
andand (1.3.3)
animation (0.1.alpha.3)
compass (>= 0.12.0)
sass (>= 3.2.0.alpha.95)
arel (3.0.2)
arel (3.0.3)
atomic (1.1.14)
aws-sdk (1.11.1)
aws-sdk (1.27.0)
json (~> 1.4)
nokogiri (>= 1.4.4)
uuidtools (~> 2.1)
Expand All @@ -49,7 +49,7 @@ GEM
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
builder (3.0.4)
bundle_cache (0.0.5)
bundle_cache (0.2.1)
aws-sdk (>= 1.0.0)
bundler
cancan (1.6.10)
Expand Down Expand Up @@ -223,12 +223,12 @@ GEM
memcachier (0.0.2)
method_source (0.8.2)
mime-types (1.25)
mini_portile (0.5.1)
multi_json (1.8.0)
mini_portile (0.5.2)
multi_json (1.8.2)
multi_test (0.0.2)
multi_xml (0.5.5)
multipart-post (1.2.0)
newrelic_rpm (3.6.7.152)
newrelic_rpm (3.6.9.171)
nifty-generators (0.4.6)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
Expand Down Expand Up @@ -287,22 +287,22 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.14)
actionmailer (= 3.2.14)
actionpack (= 3.2.14)
activerecord (= 3.2.14)
activeresource (= 3.2.14)
activesupport (= 3.2.14)
rails (3.2.15)
actionmailer (= 3.2.15)
actionpack (= 3.2.15)
activerecord (= 3.2.15)
activeresource (= 3.2.15)
activesupport (= 3.2.15)
bundler (~> 1.0)
railties (= 3.2.14)
railties (= 3.2.15)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.1)
rails_stdout_logging (0.0.3)
railties (3.2.14)
actionpack (= 3.2.14)
activesupport (= 3.2.14)
railties (3.2.15)
actionpack (= 3.2.15)
activesupport (= 3.2.15)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand Down Expand Up @@ -406,7 +406,7 @@ GEM
polyglot (>= 0.3.1)
turbolinks (1.3.0)
coffee-rails
tzinfo (0.3.37)
tzinfo (0.3.38)
uglifier (2.2.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down

0 comments on commit cbd47ce

Please sign in to comment.