Test against Rails master

1 files changed, 68 insertions, 64 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 12d7f94fb7..41f94a65c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,74 +1,96 @@
-PATH
-  remote: .
-  specs:
-    actiontext (0.1.0)
-      nokogiri
-      rails (>= 5.2.0)
-
-GEM
-  remote: https://rubygems.org/
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: a1ee4a9ff9d4a3cb255365310ead0dc7b739c6be
   specs:
-    actioncable (5.2.0)
-      actionpack (= 5.2.0)
+    actioncable (6.0.0.alpha)
+      actionpack (= 6.0.0.alpha)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
+    actionmailer (6.0.0.alpha)
+      actionpack (= 6.0.0.alpha)
+      actionview (= 6.0.0.alpha)
+      activejob (= 6.0.0.alpha)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0)
-      actionview (= 5.2.0)
-      activesupport (= 5.2.0)
+    actionpack (6.0.0.alpha)
+      actionview (= 6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+    actionview (6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0)
-      activesupport (= 5.2.0)
+    activejob (6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
       globalid (>= 0.3.6)
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
-      arel (>= 9.0)
-    activestorage (5.2.0)
-      actionpack (= 5.2.0)
-      activerecord (= 5.2.0)
+    activemodel (6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
+    activerecord (6.0.0.alpha)
+      activemodel (= 6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
+    activestorage (6.0.0.alpha)
+      actionpack (= 6.0.0.alpha)
+      activerecord (= 6.0.0.alpha)
       marcel (~> 0.3.1)
-    activesupport (5.2.0)
+    activesupport (6.0.0.alpha)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+    rails (6.0.0.alpha)
+      actioncable (= 6.0.0.alpha)
+      actionmailer (= 6.0.0.alpha)
+      actionpack (= 6.0.0.alpha)
+      actionview (= 6.0.0.alpha)
+      activejob (= 6.0.0.alpha)
+      activemodel (= 6.0.0.alpha)
+      activerecord (= 6.0.0.alpha)
+      activestorage (= 6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0.alpha)
+      sprockets-rails (>= 2.0.0)
+    railties (6.0.0.alpha)
+      actionpack (= 6.0.0.alpha)
+      activesupport (= 6.0.0.alpha)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+
+PATH
+  remote: .
+  specs:
+    actiontext (0.1.0)
+      nokogiri
+      rails (>= 5.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
     builder (3.2.3)
     concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    erubi (1.7.0)
+    crass (1.0.4)
+    erubi (1.7.1)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (0.9.3)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
-    marcel (0.3.2)
+    marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.0)
     mimemagic (0.3.2)
     mini_magick (4.8.0)
-    mini_mime (1.0.0)
+    mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     nio4r (2.3.1)
@@ -77,34 +99,15 @@ GEM
     rack (2.0.4)
     rack-proxy (0.6.3)
       rack
-    rack-test (0.8.2)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.0)
-      actioncable (= 5.2.0)
-      actionmailer (= 5.2.0)
-      actionpack (= 5.2.0)
-      actionview (= 5.2.0)
-      activejob (= 5.2.0)
-      activemodel (= 5.2.0)
-      activerecord (= 5.2.0)
-      activestorage (= 5.2.0)
-      activesupport (= 5.2.0)
-      bundler (>= 1.3.0)
-      railties (= 5.2.0)
-      sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.2.0)
-      actionpack (= 5.2.0)
-      activesupport (= 5.2.0)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    sprockets (3.7.1)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    rake (12.3.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -131,6 +134,7 @@ DEPENDENCIES
   actiontext!
   bundler (~> 1.15)
   mini_magick
+  rails!
   sqlite3
   webpacker (~> 3.2.2)