Merge branch 'master' into magic-login

.travis.yml

@@ -2,9 +2,10 @@ language: ruby
 rvm:
   - jruby
   - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.1.10
+  - 2.2.6
+  - 2.3.3
+  - 2.4.0
 
 env:
   global:
@@ -31,11 +32,26 @@ matrix:
     - rvm: 2.0.0
       gemfile: gemfiles/active_record-rails42.gemfile
 
-    - rvm: jruby
+    - rvm: 2.0.0
+      gemfile: Gemfile
+
+    - rvm: 2.1.10
       gemfile: Gemfile
 
-    - rvm: 2.2
+    - rvm: 2.2.6
+      gemfile: gemfiles/active_record-rails40.gemfile
+
+    - rvm: 2.3.3
       gemfile: gemfiles/active_record-rails40.gemfile
 
-    - rvm: 2.3.0
+    - rvm: 2.4.0
       gemfile: gemfiles/active_record-rails40.gemfile
+
+    - rvm: 2.4.0
+      gemfile: gemfiles/active_record-rails41.gemfile
+
+    - rvm: 2.4.0
+      gemfile: gemfiles/active_record-rails42.gemfile
+
+    - rvm: jruby
+      gemfile: Gemfile

CHANGELOG.md

@@ -9,6 +9,10 @@
 * Deprecated Rails 3
   * Deprecated using `callback_filter` in favor of `callback_action`
   * Added null: false to migrations
+* Added support for Rails 5 by @kyuden
+* Added WeChat provider to external submodule.
+* Added support for Ruby 2.4 by @kyuden
+* Namespace login lock/unlock methods to fix conflicts with Rails lock/unlock (thanks to @kyuden)
 
 ## 0.9.1
 

Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.0'
+gem 'rails', '~> 5.0.0'
+gem 'rails-controller-testing'
 gem 'sqlite3'
 gem 'pry'