From 6d1c61e2902efdd13a7a7805f9b24cac51d6f29f Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 2 Nov 2014 23:55:12 +0100 Subject: Upgrade to Rails 3.2.20. --- Gemfile.lock | 201 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 160 insertions(+), 41 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index 9705f68..3bd176c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,12 +10,12 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + actionmailer (3.2.20) + actionpack (= 3.2.20) + mail (~> 2.5.4) + actionpack (3.2.20) + activemodel (= 3.2.20) + activesupport (= 3.2.20) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -23,26 +23,26 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) + activemodel (3.2.20) + activesupport (= 3.2.20) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.20) + activemodel (= 3.2.20) + activesupport (= 3.2.20) arel (~> 3.0.2) tzinfo (~> 0.3.29) activerecord-postgresql-adapter (0.0.1) pg - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + activeresource (3.2.20) + activemodel (= 3.2.20) + activesupport (= 3.2.20) + activesupport (3.2.20) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) acts-as-taggable-on (2.4.1) rails (>= 3, < 5) acts_as_indexed (0.7.8) - arel (3.0.2) + arel (3.0.3) awesome_nested_set (2.1.6) activerecord (>= 3.0.0) babosa (0.3.10) @@ -84,20 +84,19 @@ GEM activemodel (>= 3.0.0) activerecord (>= 3.0.0) paper_trail (~> 2) - hike (1.2.2) - i18n (0.6.1) + hike (1.2.3) + i18n (0.6.11) journey (1.0.4) jquery-rails (2.0.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) - json (1.7.7) + json (1.8.1) lorem (0.1.2) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.22) - multi_json (1.7.2) + mime-types (1.25.1) + multi_json (1.10.1) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.1) @@ -106,27 +105,27 @@ GEM activerecord (~> 3.0) railties (~> 3.0) pg (0.15.1) - polyglot (0.3.3) + polyglot (0.3.5) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) + rails (3.2.20) + actionmailer (= 3.2.20) + actionpack (= 3.2.20) + activerecord (= 3.2.20) + activeresource (= 3.2.20) + activesupport (= 3.2.20) bundler (~> 1.0) - railties (= 3.2.13) + railties (= 3.2.20) rails_autolink (1.1.0) rails (> 3.1) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (3.2.20) + actionpack (= 3.2.20) + activesupport (= 3.2.20) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -211,7 +210,7 @@ GEM spork (0.9.2) spork-testunit (0.0.8) spork (>= 0.6.0) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -221,13 +220,133 @@ GEM colorize net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - thor (0.18.1) - tilt (1.3.7) - treetop (1.4.12) + thor (0.19.1) + tilt (1.4.1) + treetop (1.4.15) polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) + polyglot (>= 0.3.1) polyglot (>= 0.3.1) truncate_html (0.5.5) - tzinfo (0.3.37) + tzinfo (0.3.42) uglifier (2.0.1) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) -- cgit v1.2.3