Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Rails 6 #1182

Merged
merged 1 commit into from
Jan 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ appraise "ar-5.2" do
end

appraise "ar-6.0" do
# TODO: Use actual version number once 6.0 beta is released
gem "activerecord", github: "rails/rails"
# TODO: Use actual version number once 6.0 final is released
gem "activerecord", "~> 6.0.0.beta1"
gem "rails-controller-testing", "~> 1.0.3"
end
2 changes: 1 addition & 1 deletion paper_trail.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ has been destroyed.
s.required_ruby_version = ">= 2.3.0"

# Rails does not follow semver, makes breaking changes in minor versions.
s.add_dependency "activerecord", [">= 4.2", "< 6.0"]
s.add_dependency "activerecord", [">= 4.2", "< 6.1"]
s.add_dependency "request_store", "~> 1.1"

s.add_development_dependency "appraisal", "~> 2.2"
Expand Down