From 1d44c3c0fd809e417c92387840fbb30dc1f37ee2 Mon Sep 17 00:00:00 2001 From: Andrew Volozhanin Date: Mon, 29 Jun 2015 00:15:56 +0500 Subject: [PATCH] Lock rails and globalize version in gemspec Due to https://github.com/globalize/globalize/issues/429 Dependencies will be locked until that issue is resolved. --- rails_admin_globalize_field.gemspec | 4 ++-- spec/dummy/Gemfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rails_admin_globalize_field.gemspec b/rails_admin_globalize_field.gemspec index fb2587b..2106f0b 100644 --- a/rails_admin_globalize_field.gemspec +++ b/rails_admin_globalize_field.gemspec @@ -18,11 +18,11 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency "rails", ">= 4.0" + spec.add_dependency "rails", ">= 4.0", '< 4.2' spec.add_dependency 'rails_admin', '>= 0.6.2' # TODO: uncomment later, when globalize3 rails4 branch would be commited to rubygems - spec.add_dependency 'globalize', '>= 4.0' + spec.add_dependency 'globalize', '>= 4.0', '< 5.0' spec.add_development_dependency "bundler", "~> 1.3" spec.add_development_dependency "rake" diff --git a/spec/dummy/Gemfile b/spec/dummy/Gemfile index 3ff3de7..bd90a2f 100644 --- a/spec/dummy/Gemfile +++ b/spec/dummy/Gemfile @@ -1,9 +1,9 @@ source 'https://rubygems.org' -gem 'rails', '~> 4.2' +gem 'rails', '~> 4.1', '< 4.2' gem 'sqlite3' -gem 'globalize', '~> 5.0' +gem 'globalize', '>= 4.0', '< 5.0' gem 'rails_admin', '~> 0.6' gem 'rails_admin_globalize_field', path: '../../' \ No newline at end of file