From a8c79cac4d1d2ef98a9fe28a728abce1493411e4 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Thu, 24 Dec 2015 17:32:30 +0100 Subject: Update refinerycms-blog and -acts-as-indexed to stable branch heads. This fixes problem with searching in the backend. --- Gemfile | 6 +++++- Gemfile.lock | 33 ++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 9a0ac3e..5397e63 100644 --- a/Gemfile +++ b/Gemfile @@ -61,7 +61,7 @@ gem 'refinerycms', '~> 2.1.0' # Specify additional Refinery CMS Extensions here (all optional): gem 'refinerycms-i18n', '~> 2.1.0' -gem 'refinerycms-blog', '~> 2.1.0', :git => 'https://github.com/snake66/refinerycms-blog.git', :branch => '2-1-stable' +gem 'refinerycms-blog', '~> 2.1.0', :git => 'https://github.com/refinery/refinerycms-blog.git', :branch => '2-1-stable' gem 'refinerycms-inquiries', '~> 2.1.0' gem 'refinerycms-search', '~> 2.1.0' gem 'refinerycms-page-images', '~> 2.1.0' @@ -70,4 +70,8 @@ gem 'refinerycms-pc_banners', :git => "https://github.com/DriesS/refinerycms-pc_banners.git", :branch => "2-1-stable" +gem 'refinerycms-acts-as-indexed', + :git => "https://github.com/refinery/refinerycms-acts-as-indexed.git", + :branch => '1-0-stable' + gem 'piwik_analytics', '~> 1.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index 8f69ac5..8cb0eab 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,16 +7,17 @@ GIT refinerycms-pages (~> 2.1.0) GIT - remote: https://github.com/snake66/capistrano-postgresql.git - revision: a51bd6bdcb8f14a844cacff6c18d6942adea8c23 - branch: make-sudo-optional + remote: https://github.com/refinery/refinerycms-acts-as-indexed.git + revision: 47cd0b6427a1ee7c513124c7a56c7cb5f93716f6 + branch: 1-0-stable specs: - capistrano-postgresql (4.2.1) - capistrano (>= 3.0) + refinerycms-acts-as-indexed (1.0.0) + acts_as_indexed (~> 0.8.0) + refinerycms-core (~> 2.1.0) GIT - remote: https://github.com/snake66/refinerycms-blog.git - revision: f3648e953339fc95cf33a6680c5f9ba831c5ca19 + remote: https://github.com/refinery/refinerycms-blog.git + revision: f167ddee3d18d24d8c5d28cc4bbb6f46b19f9785 branch: 2-1-stable specs: refinerycms-blog (2.1.0) @@ -28,6 +29,14 @@ GIT refinerycms-settings (~> 2.1.0) seo_meta (~> 1.4.0) +GIT + remote: https://github.com/snake66/capistrano-postgresql.git + revision: a51bd6bdcb8f14a844cacff6c18d6942adea8c23 + branch: make-sudo-optional + specs: + capistrano-postgresql (4.2.1) + capistrano (>= 3.0) + GEM remote: https://rubygems.org/ specs: @@ -172,9 +181,6 @@ GEM 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) @@ -226,7 +232,7 @@ GEM refinerycms-core routing-filter (0.3.1) actionpack - sass (3.4.19) + sass (3.4.20) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -251,7 +257,7 @@ GEM polyglot polyglot (>= 0.3.1) truncate_html (0.9.3) - tzinfo (0.3.45) + tzinfo (0.3.46) uglifier (2.0.1) execjs (>= 0.3.0) json (>= 1.8.0) @@ -279,6 +285,7 @@ DEPENDENCIES piwik_analytics (~> 1.0.2) rails (~> 3.2) refinerycms (~> 2.1.0) + refinerycms-acts-as-indexed! refinerycms-blog (~> 2.1.0)! refinerycms-i18n (~> 2.1.0) refinerycms-inquiries (~> 2.1.0) @@ -293,4 +300,4 @@ DEPENDENCIES uglifier (>= 1.0.3) BUNDLED WITH - 1.10.6 + 1.11.2 -- cgit v1.2.3