Skip to content

Commit

Permalink
Lock rails and globalize version in gemspec
Browse files Browse the repository at this point in the history
Due to globalize/globalize#429

Dependencies will be locked until that issue is resolved.
  • Loading branch information
Andrew Volozhanin committed Jun 28, 2015
1 parent 0921489 commit 1d44c3c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions rails_admin_globalize_field.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions spec/dummy/Gemfile
Original file line number Diff line number Diff line change
@@ -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: '../../'

0 comments on commit 1d44c3c

Please sign in to comment.