Skip to content

Commit

Permalink
Merge pull request #126 from ykzts/rails-5.2
Browse files Browse the repository at this point in the history
Add Rails v5.2 support
  • Loading branch information
bsedat committed Apr 12, 2018
2 parents 359a31b + f60492b commit f3e40dc
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Expand Up @@ -10,6 +10,7 @@ gemfile:
- gemfiles/rails_4_2.gemfile
- gemfiles/rails_5_0.gemfile
- gemfiles/rails_5_1.gemfile
- gemfiles/rails_5_2.gemfile
rvm:
- "2.1"
- "2.2"
Expand All @@ -26,3 +27,7 @@ matrix:
gemfile: gemfiles/rails_5_1.gemfile
- rvm: "2.2"
gemfile: gemfiles/rails_5_1.gemfile
- rvm: "2.1"
gemfile: gemfiles/rails_5_2.gemfile
- rvm: "2.2"
gemfile: gemfiles/rails_5_2.gemfile
5 changes: 5 additions & 0 deletions Appraisals
Expand Up @@ -17,3 +17,8 @@ appraise "rails-5-1" do
gem 'railties', '~> 5.1'
gem 'activesupport', '~> 5.1'
end

appraise "rails-5-2" do
gem 'railties', '~> 5.2'
gem 'activesupport', '~> 5.2'
end
4 changes: 2 additions & 2 deletions devise-two-factor.gemspec
Expand Up @@ -24,8 +24,8 @@ Gem::Specification.new do |s|
s.test_files = `git ls-files -- spec/*`.split("\n")
s.require_paths = ['lib']

s.add_runtime_dependency 'railties', '< 5.2'
s.add_runtime_dependency 'activesupport', '< 5.2'
s.add_runtime_dependency 'railties', '< 5.3'
s.add_runtime_dependency 'activesupport', '< 5.3'
s.add_runtime_dependency 'attr_encrypted', '>= 1.3', '< 4', '!= 2'
s.add_runtime_dependency 'devise', '~> 4.0'
s.add_runtime_dependency 'rotp', '~> 2.0'
Expand Down
8 changes: 8 additions & 0 deletions gemfiles/rails_5_2.gemfile
@@ -0,0 +1,8 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "railties", "~> 5.2"
gem "activesupport", "~> 5.2"

gemspec path: "../"

0 comments on commit f3e40dc

Please sign in to comment.