about summary refs log tree commit diff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-04-10 22:33:41 +0200
committerGitHub <noreply@github.com>2019-04-10 22:33:41 +0200
commit31e4fcb006c6ef2d8e1a4c765e897afa1cba1b5c (patch)
tree15a022b1b44f72fee2d83cfe6f8355b7334f9d9b /Gemfile.lock
parentcb410f80a40d03b509cec244b0cdd4ed3957c6a0 (diff)
parent2f422b708f75bea87a49eb879ec3e0c3f35c2f9b (diff)
Merge pull request #985 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 7d98a2fdc..c6169b260 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,7 +99,7 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.4.2)
+    bootsnap (1.4.3)
       msgpack (~> 1.0)
     brakeman (4.5.0)
     browser (2.5.3)
@@ -240,11 +240,11 @@ GEM
       http (~> 3.0)
       nokogiri (~> 1.8)
       oj (~> 3.0)
-    hamlit (2.9.2)
+    hamlit (2.9.3)
       temple (>= 0.8.0)
       thor
       tilt
-    hamlit-rails (0.2.2)
+    hamlit-rails (0.2.3)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
       hamlit (>= 1.2.0)
@@ -426,7 +426,7 @@ GEM
     pundit (2.0.1)
       activesupport (>= 3.0.0)
     raabro (1.1.6)
-    rack (2.0.6)
+    rack (2.0.7)
     rack-attack (5.4.2)
       rack (>= 1.0, < 3)
     rack-cors (1.0.3)
@@ -597,7 +597,7 @@ GEM
       multi_json (~> 1.8)
     strong_migrations (0.3.1)
       activerecord (>= 3.2.0)
-    temple (0.8.0)
+    temple (0.8.1)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     terrapin (0.6.0)