Merge pull request #7 from civisanalytics/civp-18147-merge-in-3.0.3

[CIVP-18147] Merge 3.0.3 to civis branch

.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

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

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+## 3.0.3
+- Add Rails 5.2 support
+
 ## 3.0.2
 - Add Rails 5.1 support
 

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)
 
@@ -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.
 

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',           '~> 3.0'

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: "../"

lib/devise_two_factor/version.rb

@@ -1,3 +1,3 @@
 module DeviseTwoFactor
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end