Merge branch 'master' into dependabot/bundler/puma-3.11.3

bustikiller · Mar 16, 2018 · f8ba430 · f8ba430
2 parents f91ced7 + 108d0ab
commit f8ba430
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -96,13 +96,14 @@ GEM
     concurrent-ruby (1.0.5)
     crass (1.0.3)
     dentaku (3.1.0)
-    devise (4.3.0)
+    devise (4.4.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
-    devise-i18n (1.1.2)
+    devise-i18n (1.6.1)
+      devise (>= 4.4)
     diff-lcs (1.3)
     dotenv (2.2.1)
     dotenv-rails (2.2.1)
@@ -158,7 +159,7 @@ GEM
     minitest (5.11.3)
     multi_json (1.12.1)
     mustermann (1.0.2)
-    mysql2 (0.4.6)
+    mysql2 (0.4.10)
     nio4r (2.2.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
@@ -190,9 +191,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails-i18n (5.0.4)
-      i18n (~> 0.7)
-      railties (~> 5.0)
+    rails-i18n (5.1.1)
+      i18n (>= 0.7, < 2)
+      railties (>= 5.0, < 6)
     rails_bootstrap_navbar (3.0.0)
       bootstrap-navbar (~> 3.0)
       rails (>= 3.0.0)
@@ -267,9 +268,9 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    turbolinks (5.0.1)
-      turbolinks-source (~> 5)
-    turbolinks-source (5.0.3)
+    turbolinks (5.1.0)
+      turbolinks-source (~> 5.1)
+    turbolinks-source (5.1.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (3.2.0)