Merge branch 'master' into dependabot/bundler/omniauth-1.9.1

.rubocop.yml

@@ -1,7 +1,6 @@
 require:
   - rubocop-rails
 AllCops:
-  TargetRubyVersion: 2.4
   Exclude:
     - Gemfile*
     - bin/*

.ruby-version

@@ -1 +1,2 @@
-2.4.6
+2.5.8
+

.travis.yml

@@ -7,9 +7,9 @@ install: bundle _1.17.3_ install --jobs=2 --retry=2 --path=${BUNDLE_PATH:-vendor
 cache: bundler
 script: bundle exec rake
 rvm:
-  - 2.4
   - 2.5
   - 2.6
+  - 2.7
   - ruby-head
 env:
   matrix:
@@ -23,10 +23,10 @@ matrix:
     # and will always fail.
     - rvm: 2.6
       gemfile: gemfiles/rails_4.2.gemfile
+    - rvm: 2.7
+      gemfile: gemfiles/rails_4.2.gemfile
     - rvm: ruby-head
       gemfile: gemfiles/rails_4.2.gemfile
-    - rvm: 2.4
-      gemfile: gemfiles/rails_6.0.gemfile
   allow_failures:
     # edge, not expected to pass
     - rvm: ruby-head

Gemfile

@@ -4,7 +4,7 @@ gemspec
 gem 'rails', '~> 5.0.0'
 
 group :active_record do
-  gem 'sqlite3'
+  gem 'sqlite3', '~> 1.3.0'
 end
 
 group :mongoid do

Gemfile.lock

@@ -54,19 +54,19 @@ GEM
     backport (1.1.2)
     bcrypt (3.1.13)
     benchmark (0.1.0)
-    bson (4.7.0)
+    bson (4.8.2)
     builder (3.2.4)
-    byebug (11.0.1)
+    byebug (11.1.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     crass (1.0.6)
-    database_cleaner (1.8.3)
+    database_cleaner (1.8.4)
     devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -92,7 +92,7 @@ GEM
     interception (0.5)
     jaro_winkler (1.5.4)
     json (2.3.0)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     m (1.5.1)
@@ -101,31 +101,31 @@ GEM
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     maruku (0.7.3)
-    method_source (0.9.2)
+    method_source (1.0.0)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
-    mongo (2.11.2)
-      bson (>= 4.6.0, < 5.0.0)
+    mongo (2.11.4)
+      bson (>= 4.4.2, < 5.0.0)
     mongoid (6.1.1)
       activemodel (~> 5.0)
       mongo (>= 2.4.1, < 3.0.0)
     nio4r (2.5.2)
-    nokogiri (1.10.7)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     orm_adapter (0.5.0)
     parallel (1.19.1)
-    parser (2.7.0.2)
+    parser (2.7.1.0)
       ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    pry (0.13.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.9.0)
       byebug (~> 11.0)
-      pry (~> 0.10)
+      pry (~> 0.13.0)
     pry-rescue (1.5.0)
       interception (>= 0.5)
       pry (>= 0.12.0)
@@ -165,33 +165,34 @@ GEM
     reverse_markdown (1.4.0)
       nokogiri
     rexml (3.2.4)
-    rmagick (4.0.0)
+    rmagick (4.1.1)
     rspec-core (3.9.1)
       rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.0)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-rails (3.9.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-      rspec-support (~> 3.9.0)
+    rspec-rails (4.0.0)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
     rspec-support (3.9.2)
-    rubocop (0.80.0)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rails (2.4.2)
+    rubocop-rails (2.5.1)
+      activesupport
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     ruby-progressbar (1.10.1)
@@ -200,7 +201,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    solargraph (0.38.5)
+    solargraph (0.38.6)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
@@ -221,16 +222,16 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.4.2)
+    sqlite3 (1.3.13)
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    tins (1.24.0)
+    tins (1.24.1)
       sync
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.1)
     warden (1.2.8)
@@ -262,7 +263,7 @@ DEPENDENCIES
   rubocop (~> 0.80.0)
   rubocop-rails
   solargraph
-  sqlite3
+  sqlite3 (~> 1.3.0)
   wwtd
 
 BUNDLED WITH