Skip to content

Commit

Permalink
Allows support for Rails 5.2 (#581)
Browse files Browse the repository at this point in the history
* Allows compatibility with Rails 5.2.

* Updates documentation to reflect compatibility with rails 5.2.
  • Loading branch information
Guilherme Carvalho authored and jaredbeck committed Feb 8, 2018
1 parent dc6a71b commit ad1f778
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ gemfile:
- test/gemfiles/Gemfile.rails-4.2.x
- test/gemfiles/Gemfile.rails-5.0.x
- test/gemfiles/Gemfile.rails-5.1.x
- test/gemfiles/Gemfile.rails-5.2.x

matrix:
fast_finish: true
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* Our mutable constants (e.g. arrays, hashes) are now frozen.

* Added
* Support for rails 5.2
* Support for ruby 2.4, specifically openssl gem 2.0
* [#98](https://github.com/binarylogic/authlogic/issues/98)
I18n for invalid session error message. (@eugenebolshakov)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ A clean, simple, and unobtrusive ruby authentication solution.

| Version | branches | tag | ruby | activerecord |
| ---------- | ---------------- | ------- | -------- | ------------- |
| Unreleased | master, 4-stable | | >= 2.2.0 | >= 4.2, < 5.2 |
| Unreleased | master, 4-stable | | >= 2.2.0 | >= 4.2, < 5.3 |
| 3 | 3-stable | v3.6.0 | >= 1.9.3 | >= 3.2, < 5.2 |
| 2 | rails2 | v2.1.11 | >= 1.9.3 | ~> 2.3.0 |
| 1 | ? | v1.4.3 | ? | ? |
Expand Down
4 changes: 2 additions & 2 deletions authlogic.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Gem::Specification.new do |s|
s.license = 'MIT'

s.required_ruby_version = '>= 2.2.0'
s.add_dependency 'activerecord', ['>= 4.2', '< 5.2']
s.add_dependency 'activesupport', ['>= 4.2', '< 5.2']
s.add_dependency 'activerecord', ['>= 4.2', '< 5.3']
s.add_dependency 'activesupport', ['>= 4.2', '< 5.3']
s.add_dependency 'request_store', '~> 1.0'
s.add_dependency 'scrypt', '>= 1.2', '< 4.0'
s.add_development_dependency 'bcrypt', '~> 3.1'
Expand Down
6 changes: 6 additions & 0 deletions test/gemfiles/Gemfile.rails-5.2.x
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source "https://rubygems.org"
gemspec :path => "./../.."

gem "activerecord", "~> 5.2.x"
gem "activesupport", "~> 5.2.x"
gem 'sqlite3', :platforms => :ruby

0 comments on commit ad1f778

Please sign in to comment.