diff options
| author | Brice Sanchez <brice@bisscomm.com> | 2015-02-19 23:08:23 -0500 |
|---|---|---|
| committer | Philip Arndt <git@p.arndt.io> | 2015-02-20 17:43:27 +1300 |
| commit | 498fd95b82bfd9546f1078a8e9704f3cf41e327d (patch) | |
| tree | d4136377293d1dddd470fdbee5ebbcb943c12647 | |
| parent | d297b37d3758ca2415ec62644c83d806d93377a8 (diff) | |
| download | refinerycms-blog-498fd95b82bfd9546f1078a8e9704f3cf41e327d.tar.gz refinerycms-blog-498fd95b82bfd9546f1078a8e9704f3cf41e327d.tar.bz2 refinerycms-blog-498fd95b82bfd9546f1078a8e9704f3cf41e327d.zip | |
Update gem globalize (< 5.2) and fix factory_girl
| -rw-r--r-- | refinerycms-blog.gemspec | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
2 files changed, 1 insertions, 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! |