Merge branch 'master' into hotfix-twitter-login

Author: ebihara99999

.gitignore

@@ -14,6 +14,9 @@ doc
 # jeweler generated
 pkg
 
+# byebug generated
+.byebug_history
+
 # for RVM
 .rvmrc
 

.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

@@ -1,14 +1,28 @@
 # Changelog
 
-## 1.0 (not released yet)
+## 0.10.2
+
+* Added support for Microsoft OAuth (thanks to @athix) [#37](https://github.com/Sorcery/sorcery/pull/37)
+
+## 0.10.1
+
+* Fixed LinkedIn bug [#36](https://github.com/Sorcery/sorcery/pull/36)
+
+## 0.10.0
 
 * Adapters (Mongoid, MongoMapper, DataMapper) are now separated from the core Sorcery repo and moved under `sorcery-rails` organization. Special thanks to @juike!
 * `current_users` method was removed
 * Added `logged_in?` `logged_out?` `online?` to activity_logging instance methods
-* PayPal provider added to external submodule
+* Added support for PayPal OAuth (thanks to @rubenmoya)
+* Added support for Slack OAuth (thanks to @youzik)
+* Added support for WeChat OAuth (thanks to @Darmody)
 * Deprecated Rails 3
   * Deprecated using `callback_filter` in favor of `callback_action`
   * Added null: false to migrations
+* Added support for Rails 5 (thanks to @kyuden)
+* Added support for Ruby 2.4 (thanks to @kyuden)
+* Added WeChat provider to external submodule.
+* Namespace login lock/unlock methods to fix conflicts with Rails lock/unlock (thanks to @kyuden)
 
 ## 0.9.1
 
@@ -69,46 +83,17 @@
 
 ## 0.8.4
 
-  * Few security fixes in `external` module
+* Few security fixes in `external` module
 
 ## 0.8.3 (yanked because of bad Jeweler release)
 
 ## 0.8.2
 
 * Activity logging feature has a new column called `last_login_from_ip_address` (string type). If you use ActiveRecord, you will have to add this column to DB ([#465](https://github.com/NoamB/sorcery/issues/465))
 
-## 0.8.1
-<!-- TO BE WRITTEN -->
-
-## 0.8.0
-<!-- TO BE WRITTEN -->
-
-## 0.7.13
-<!-- TO BE WRITTEN -->
-
-## 0.7.12
-<!-- TO BE WRITTEN -->
-
-## 0.7.11
-<!-- TO BE WRITTEN -->
-
-## 0.7.10
-<!-- TO BE WRITTEN -->
-
-## 0.7.9
-<!-- TO BE WRITTEN -->
-
-## 0.7.8
-<!-- TO BE WRITTEN -->
-
-## 0.7.7
-<!-- TO BE WRITTEN -->
-
-## 0.7.6
-<!-- TO BE WRITTEN -->
+## 0.7.5-0.8.1
 
-## 0.7.5
-<!-- TO BE WRITTEN -->
+<!-- HERE BE DRAGONS (Changelogs never written) -->
 
 ## 0.7.1-0.7.4
 

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'