From 9d4f8de011ab8df9c7b3d51bed61d64f8417b6d2 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sun, 24 Nov 2013 12:38:35 +0100 Subject: Upgrade to refinery 2.1.0 --- Gemfile.lock | 249 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 130 insertions(+), 119 deletions(-) (limited to 'Gemfile.lock') diff --git a/Gemfile.lock b/Gemfile.lock index b468e39..dbcf943 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/DriesS/refinerycms-pc_banners.git + revision: 05d5475264f0b666ef3e9ea0f29c0d3b42522d43 + branch: 2-1-stable + specs: + refinerycms-pc_banners (2.0.2) + refinerycms-pages (~> 2.1.0) + GIT remote: https://github.com/snake66/capistrano-postgresql.git revision: a51bd6bdcb8f14a844cacff6c18d6942adea8c23 @@ -10,12 +18,12 @@ GEM remote: https://rubygems.org/ specs: SyslogLogger (2.0) - actionmailer (3.2.20) - actionpack (= 3.2.20) + actionmailer (3.2.22) + actionpack (= 3.2.22) mail (~> 2.5.4) - actionpack (3.2.20) - activemodel (= 3.2.20) - activesupport (= 3.2.20) + actionpack (3.2.22) + activemodel (= 3.2.22) + activesupport (= 3.2.22) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -23,29 +31,29 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.20) - activesupport (= 3.2.20) + activemodel (3.2.22) + activesupport (= 3.2.22) builder (~> 3.0.0) - activerecord (3.2.20) - activemodel (= 3.2.20) - activesupport (= 3.2.20) + activerecord (3.2.22) + activemodel (= 3.2.22) + activesupport (= 3.2.22) arel (~> 3.0.2) tzinfo (~> 0.3.29) activerecord-postgresql-adapter (0.0.1) pg - activeresource (3.2.20) - activemodel (= 3.2.20) - activesupport (= 3.2.20) - activesupport (3.2.20) + activeresource (3.2.22) + activemodel (= 3.2.22) + activesupport (= 3.2.22) + activesupport (3.2.22) 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) + acts_as_indexed (0.8.3) arel (3.0.3) awesome_nested_set (2.1.6) activerecord (>= 3.0.0) - babosa (0.3.10) + babosa (1.0.2) bcrypt-ruby (3.0.1) builder (3.0.4) capistrano (3.3.5) @@ -73,69 +81,69 @@ GEM execjs coffee-script-source (1.6.2) colorize (0.7.7) - devise (2.0.5) + decorators (1.0.5) + railties (>= 3.0.19) + devise (2.2.8) bcrypt-ruby (~> 3.0) - orm_adapter (~> 0.0.3) + orm_adapter (~> 0.1) railties (~> 3.1) - warden (~> 1.1.1) - dragonfly (0.9.14) + warden (~> 1.2.1) + dragonfly (0.9.15) multi_json (~> 1.0) rack erubis (2.7.0) - execjs (1.4.0) - multi_json (~> 1.0) + execjs (2.0.2) filters_spam (0.3) - friendly_id (4.0.9) - globalize3 (0.3.0) - activemodel (>= 3.0.0) - activerecord (>= 3.0.0) - paper_trail (~> 2) + friendly_id (4.0.10.1) + activerecord (>= 3.0, < 4.0) + globalize (3.1.0) + activemodel (>= 3.1.0, < 4.0.0) + activerecord (>= 3.1.0, < 4.0.0) hike (1.2.3) i18n (0.7.0) journey (1.0.4) - jquery-rails (2.0.3) - railties (>= 3.1.0, < 5.0) - thor (~> 0.14) - json (1.8.1) + jquery-rails (2.3.0) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (1.8.3) lorem (0.1.2) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - multi_json (1.10.1) + multi_json (1.11.2) net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (3.0.1) - orm_adapter (0.0.7) - paper_trail (2.7.1) - activerecord (~> 3.0) - railties (~> 3.0) + orm_adapter (0.5.0) pg (0.15.1) piwik_analytics (1.0.2) actionpack activesupport rails (>= 3.0.0) polyglot (0.3.5) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.5.1) rack (>= 0.4) rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.20) - actionmailer (= 3.2.20) - actionpack (= 3.2.20) - activerecord (= 3.2.20) - activeresource (= 3.2.20) - activesupport (= 3.2.20) + rails (3.2.22) + actionmailer (= 3.2.22) + actionpack (= 3.2.22) + activerecord (= 3.2.22) + activeresource (= 3.2.22) + activesupport (= 3.2.22) bundler (~> 1.0) - railties (= 3.2.20) - rails_autolink (1.1.0) - rails (> 3.1) - railties (3.2.20) - actionpack (= 3.2.20) - activesupport (= 3.2.20) + railties (= 3.2.22) + rails-i18n (0.7.4) + i18n (~> 0.5) + rails_autolink (1.0.9) + rails (~> 3.1) + railties (3.2.22) + actionpack (= 3.2.22) + activesupport (= 3.2.22) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -143,79 +151,82 @@ GEM rake (10.4.2) rdoc (3.12.2) json (~> 1.4) - refinerycms (2.0.10) - bundler (~> 1.0) - refinerycms-authentication (= 2.0.10) - refinerycms-core (= 2.0.10) - refinerycms-dashboard (= 2.0.10) - refinerycms-images (= 2.0.10) - refinerycms-pages (= 2.0.10) - refinerycms-resources (= 2.0.10) - refinerycms-authentication (2.0.10) - devise (~> 2.0.5) - orm_adapter (~> 0.0.7) - refinerycms-core (= 2.0.10) - refinerycms-blog (2.0.4) + refinerycms (2.1.5) + bundler (>= 1.2.2, < 2.0) + refinerycms-authentication (= 2.1.5) + refinerycms-core (= 2.1.5) + refinerycms-dashboard (= 2.1.5) + refinerycms-images (= 2.1.5) + refinerycms-pages (= 2.1.5) + refinerycms-resources (= 2.1.5) + refinerycms-acts-as-indexed (1.0.0) + acts_as_indexed (~> 0.8.0) + refinerycms-core (~> 2.1.0) + refinerycms-authentication (2.1.5) + actionmailer (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0) + devise (~> 2.2.3) + refinerycms-core (= 2.1.5) + refinerycms-blog (2.1.0) acts-as-taggable-on filters_spam (~> 0.2) - rails_autolink - refinerycms-core (~> 2.0.3) - refinerycms-settings (~> 2.0.1) - seo_meta (~> 1.3.0) - refinerycms-core (2.0.10) - acts_as_indexed (~> 0.7.7) + friendly_id (~> 4.0.4) + rails_autolink (~> 1.0.7) + refinerycms-core (~> 2.1.0) + refinerycms-settings (~> 2.1.0) + seo_meta (~> 1.4.0) + refinerycms-core (2.1.5) + actionpack (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0) + activerecord (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0) awesome_nested_set (~> 2.1.3) - coffee-rails (~> 3.2.1) - friendly_id (~> 4.0.9) - globalize3 (~> 0.3.0) - jquery-rails (~> 2.0.0) - rails (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0) + decorators (~> 1.0.0) + jquery-rails (~> 2.3.0) + railties (>= 3.1.11, < 3.3, != 3.2.9, != 3.2.8, != 3.2.7, != 3.2.6, != 3.2.5, != 3.2.4, != 3.2.3, != 3.2.2, != 3.2.11, != 3.2.10, != 3.2.1, != 3.2.0) + refinerycms-i18n (~> 2.1.0) sass-rails (~> 3.2.3) - truncate_html (~> 0.5.5) - uglifier (>= 1.0.3) + truncate_html (~> 0.9) will_paginate (~> 3.0.2) - refinerycms-dashboard (2.0.10) - refinerycms-core (= 2.0.10) - refinerycms-i18n (2.0.2) - refinerycms-core (~> 2.0.0) - routing-filter (>= 0.2.3) - refinerycms-images (2.0.10) - dragonfly (~> 0.9.8) - rack-cache (>= 0.5.3) - refinerycms-core (= 2.0.10) - refinerycms-inquiries (2.0.3) + refinerycms-dashboard (2.1.5) + refinerycms-core (= 2.1.5) + refinerycms-i18n (2.1.0) + rails-i18n (~> 0.7.3) + routing-filter (~> 0.3.0) + refinerycms-images (2.1.5) + dragonfly (~> 0.9.14) + refinerycms-core (= 2.1.5) + refinerycms-inquiries (2.1.0) filters_spam (~> 0.2) - refinerycms-core (~> 2.0.1) - refinerycms-settings (~> 2.0.1) - refinerycms-page-images (2.0.1) - refinerycms-pages (~> 2.0.0) - refinerycms-pages (2.0.10) + refinerycms-core (~> 2.1.0) + refinerycms-settings (~> 2.1.0) + refinerycms-page-images (2.1.0) + refinerycms-pages (~> 2.1.0) + refinerycms-pages (2.1.5) awesome_nested_set (~> 2.1.3) babosa (!= 0.3.6) - refinerycms-core (= 2.0.10) - seo_meta (~> 1.3.0) - refinerycms-pc_banners (2.0.2) - refinerycms-pages (~> 2.0.1) - refinerycms-resources (2.0.10) - dragonfly (~> 0.9.8) - rack-cache (>= 0.5.3) - refinerycms-core (= 2.0.10) - refinerycms-search (2.0.0) - refinerycms-core (~> 2.0.4) - refinerycms-settings (2.0.2) - refinerycms-core (~> 2.0.1) + friendly_id (~> 4.0.9) + globalize (~> 3.1.0) + refinerycms-core (= 2.1.5) + seo_meta (~> 1.4.0) + refinerycms-resources (2.1.5) + acts_as_indexed (~> 0.8.0) + dragonfly (~> 0.9.12) + refinerycms-core (= 2.1.5) + refinerycms-search (2.1.0) + refinerycms-acts-as-indexed (~> 1.0.0) + refinerycms-core (~> 2.1.0) + refinerycms-settings (2.1.1) + refinerycms-core (~> 2.1.1) refinerycms-videojs (0.5.5.1) dragonfly rack-cache refinerycms-core routing-filter (0.3.1) actionpack - sass (3.2.7) + sass (3.4.19) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - seo_meta (1.3.0) + seo_meta (1.4.0) railties (>= 3.0.0) spork (0.9.2) spork-testunit (0.0.8) @@ -235,14 +246,14 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - truncate_html (0.5.5) - tzinfo (0.3.42) + truncate_html (0.9.3) + tzinfo (0.3.45) uglifier (2.0.1) execjs (>= 0.3.0) - multi_json (~> 1.0, >= 1.0.2) - warden (1.1.1) + json (>= 1.8.0) + warden (1.2.3) rack (>= 1.0) - will_paginate (3.0.4) + will_paginate (3.0.7) PLATFORMS ruby @@ -258,18 +269,18 @@ DEPENDENCIES capistrano-rails capistrano-rvm coffee-rails (~> 3.2) - jquery-rails (~> 2.0.0) + jquery-rails (~> 2.3.0) lorem pg piwik_analytics (~> 1.0.2) rails (~> 3.2) - refinerycms (~> 2.0.0) - refinerycms-blog (~> 2.0.0) - refinerycms-i18n (~> 2.0.0) - refinerycms-inquiries (~> 2.0.0) - refinerycms-page-images (~> 2.0.0) - refinerycms-pc_banners (~> 2.0.2) - refinerycms-search (~> 2.0.0) + refinerycms (~> 2.1.0) + refinerycms-blog (~> 2.1.0) + refinerycms-i18n (~> 2.1.0) + refinerycms-inquiries (~> 2.1.0) + refinerycms-page-images (~> 2.1.0) + refinerycms-pc_banners! + refinerycms-search (~> 2.1.0) refinerycms-videojs sass-rails (~> 3.2) spork -- cgit v1.2.3