diff --git a/CHANGELOG.md b/CHANGELOG.md index 001c66e5..eb453a0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ Now Logidze can check for a pending upgrade. Use `Logidze.pending_upgrade = :war - [Fixes [#175](https://github.com/palkan/logidze/issues/175)] Set dynamic ActiveRecord version for migrations. ([@skryukov][]) +- [Fixes [#184](https://github.com/palkan/logidze/issues/184)] Remove Rails meta-gem dependency ([@bf4][]) + ## 1.0.0 (2020-11-09) - Add `--name` option to model generator to specify the migration name. ([@palkan][]) diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index c870d24c..d38b0c08 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -1,6 +1,8 @@ source 'https://rubygems.org' -gem 'rails', '~> 5.2.1' +rails_version = '~> 5.2.1' +gem 'railties', rails_version +gem 'activerecord', rails_version gem 'rspec-rails', '~> 3.5' eval_gemfile './shared.gemfile' diff --git a/gemfiles/rails6.gemfile b/gemfiles/rails6.gemfile index 7a5bb4ac..2b8935d8 100644 --- a/gemfiles/rails6.gemfile +++ b/gemfiles/rails6.gemfile @@ -1,6 +1,8 @@ source 'https://rubygems.org' -gem 'rails', '~> 6.0' +rails_version = '~> 6.0' +gem 'railties', rails_version +gem 'activerecord', rails_version gem 'rspec-rails', '>= 4.0' eval_gemfile './shared.gemfile' diff --git a/gemfiles/railsmaster.gemfile b/gemfiles/railsmaster.gemfile index 12c498dc..535e03c9 100644 --- a/gemfiles/railsmaster.gemfile +++ b/gemfiles/railsmaster.gemfile @@ -1,6 +1,9 @@ source 'https://rubygems.org' -gem 'rails', github: 'rails/rails' +git 'https://github.com/rails/rails.git' do + gem 'railties' + gem 'activerecord' +end gem 'rspec-rails', '>= 4.0' eval_gemfile './shared.gemfile' diff --git a/logidze.gemspec b/logidze.gemspec index ece9cd16..86d01dde 100644 --- a/logidze.gemspec +++ b/logidze.gemspec @@ -26,7 +26,9 @@ Gem::Specification.new do |spec| "source_code_uri" => "http://github.com/palkan/logidze" } - spec.add_dependency "rails", ">= 5.0" + rails_version = ">= 5.0" + spec.add_dependency "railties", rails_version + spec.add_dependency "activerecord", rails_version spec.add_dependency "ruby-next-core", "~> 0.9" spec.add_development_dependency "ammeter", "~> 1.1.3"