From cf0d6dda0133316b07c05075ee6aeb6dc5b84978 Mon Sep 17 00:00:00 2001 From: Kevin Smous Date: Tue, 10 Feb 2015 15:02:14 -0800 Subject: change friendly_id version from 5.0.0 to 5.1.0 --- refinerycms-blog.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refinerycms-blog.gemspec b/refinerycms-blog.gemspec index 2d99591..e55d2f7 100644 --- a/refinerycms-blog.gemspec +++ b/refinerycms-blog.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_dependency 'acts-as-taggable-on' s.add_dependency 'seo_meta', '~> 2.0.0.rc.1' s.add_dependency 'rails_autolink', '~> 1.1.3' - s.add_dependency 'friendly_id', '~> 5.0.0' + s.add_dependency 'friendly_id', '~> 5.1.0' s.add_dependency 'globalize', '~> 4.0.0' s.add_dependency 'jquery-ui-rails', '~> 5.0.0' end -- cgit v1.2.3 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 From 733b86dbd2e0a9dd8e5fe7452d1b5def9b7f54a0 Mon Sep 17 00:00:00 2001 From: Philip Arndt Date: Fri, 20 Feb 2015 20:11:35 +1300 Subject: Updated Gemfile definitions --- Gemfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index c049859..935dda4 100644 --- a/Gemfile +++ b/Gemfile @@ -2,17 +2,18 @@ source "https://rubygems.org" gemspec -gem 'refinerycms', github: 'refinery/refinerycms' -gem 'refinerycms-i18n', github: 'refinery/refinerycms-i18n' -gem 'refinerycms-acts-as-indexed', github: 'refinery/refinerycms-acts-as-indexed' -gem 'filters_spam', github: 'resolve/filters_spam' +git "https://github.com/refinery/refinerycms", branch: "master" do + gem 'refinerycms' -gem 'mime-types', '1.25.1' + group :development, :test do + gem 'refinerycms-testing' + end +end group :test do - gem 'refinerycms-testing', github: 'refinery/refinerycms' gem 'pry' gem 'launchy' + gem 'selenium-webdriver' end # Database Configuration -- cgit v1.2.3