From 28e22d64b0c5f9060a4fae917f8e3c3eaecabb90 Mon Sep 17 00:00:00 2001 From: Ben Sedat Date: Tue, 28 Nov 2017 17:21:53 -0800 Subject: [PATCH 1/4] Tinfoil Security is hiring! --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 42cbce8..e5b576f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Devise-Two-Factor Authentication -By [Tinfoil Security](http://tinfoilsecurity.com/) +By [Tinfoil Security](https://www.tinfoilsecurity.com/). Interested in [working with us](https://www.tinfoilsecurity.com/jobs)? We're hiring! [![Build Status](https://travis-ci.org/tinfoil/devise-two-factor.svg?branch=master)](https://travis-ci.org/tinfoil/devise-two-factor) From 359a31bcf7c8ee30484f8c79acb3f8d5ecde73b3 Mon Sep 17 00:00:00 2001 From: Ben Sedat Date: Tue, 28 Nov 2017 17:22:06 -0800 Subject: [PATCH 2/4] We want help with Rails 5 --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index e5b576f..074e8a6 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,9 @@ Devise-Two-Factor is a minimalist extension to Devise which offers support for t * Integrates easily with two-factor applications like [Google Authenticator](https://support.google.com/accounts/answer/1066447?hl=en) and [Authy](https://authy.com/) * Is extensible, and includes two-factor backup codes as an example of how plugins can be structured +## Contributing +We welcome pull requests, bug reports, and other contributions. We're especially looking for help getting this gem fully compatible with Rails 5+ and squashing any deprecation messages. + ## Example App An example Rails 4 application is provided in the `demo` directory. It showcases a minimal example of Devise-Two-Factor in action, and can act as a reference for integrating the gem into your own application. From f60492b29c174d4c959ac02406392f8eb9c4d374 Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Thu, 12 Apr 2018 11:00:21 +0900 Subject: [PATCH 3/4] Add Rails v5.2 support --- .travis.yml | 5 +++++ Appraisals | 5 +++++ devise-two-factor.gemspec | 4 ++-- gemfiles/rails_5_2.gemfile | 8 ++++++++ 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 gemfiles/rails_5_2.gemfile diff --git a/.travis.yml b/.travis.yml index 652eaf8..5dc469e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" @@ -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 diff --git a/Appraisals b/Appraisals index 282cba2..bcb464a 100644 --- a/Appraisals +++ b/Appraisals @@ -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 diff --git a/devise-two-factor.gemspec b/devise-two-factor.gemspec index 34b4177..a60f560 100644 --- a/devise-two-factor.gemspec +++ b/devise-two-factor.gemspec @@ -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' diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile new file mode 100644 index 0000000..46fd105 --- /dev/null +++ b/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: "../" From f57200a3c63d776ce7fad0e16dc6ce0ea0af694f Mon Sep 17 00:00:00 2001 From: Ben Sedat Date: Thu, 12 Apr 2018 10:56:11 -0700 Subject: [PATCH 4/4] Bump to v3.0.3 --- CHANGELOG.md | 3 +++ lib/devise_two_factor/version.rb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53a9e3b..44ac8a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +## 3.0.3 +- Add Rails 5.2 support + ## 3.0.2 - Add Rails 5.1 support diff --git a/lib/devise_two_factor/version.rb b/lib/devise_two_factor/version.rb index 680d273..91588d7 100644 --- a/lib/devise_two_factor/version.rb +++ b/lib/devise_two_factor/version.rb @@ -1,3 +1,3 @@ module DeviseTwoFactor - VERSION = '3.0.2'.freeze + VERSION = '3.0.3'.freeze end