From 498fd95b82bfd9546f1078a8e9704f3cf41e327d Mon Sep 17 00:00:00 2001 From: Brice Sanchez Date: Thu, 19 Feb 2015 23:08:23 -0500 Subject: Update gem globalize (< 5.2) and fix factory_girl --- refinerycms-blog.gemspec | 2 +- spec/spec_helper.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index e55d2f7..75acccb 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -23,6 +23,6 @@ Gem::Specification.new do |s| s.add_dependency 'seo_meta', '~> 2.0.0.rc.1' s.add_dependency 'rails_autolink', '~> 1.1.3' s.add_dependency 'friendly_id', '~> 5.1.0' - s.add_dependency 'globalize', '~> 4.0.0' + s.add_dependency 'globalize', ['>= 4.0.0', '< 5.2'] s.add_dependency 'jquery-ui-rails', '~> 5.0.0' end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 3875b33..a9557c4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,7 +7,6 @@ require File.expand_path("../dummy/config/environment", __FILE__) require 'rspec/rails' require 'capybara/rspec' -require 'factory_girl_rails' Rails.backtrace_cleaner.remove_silencers! -- cgit v1.2.3