From 02f00e0bae1c4dc3bd7b9d4b601fdee47b2a6a85 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 10 Mar 2021 15:38:54 +0000
Subject: [PATCH] Bump ohm from 1.3.2 to 3.1.1

Bumps [ohm](https://github.com/soveran/ohm) from 1.3.2 to 3.1.1.
- [Release notes](https://github.com/soveran/ohm/releases)
- [Changelog](https://github.com/soveran/ohm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/soveran/ohm/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2a297d4e1..fd73ea30b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'friendly_id'
 
 gem 'rack-throttle', '~> 0.3.0'
 gem 'rest-client'
-gem 'ohm', '~> 1.3.2' # Ohm 2 breaks the compatibility with previous versions.
+gem 'ohm', '~> 3.1.1' # Ohm 2 breaks the compatibility with previous versions.
 gem 'ohm-expire', '~> 0.1.3'
 
 gem 'pygments.rb'
diff --git a/Gemfile.lock b/Gemfile.lock
index 344e858c4..76c4f08f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -178,6 +178,7 @@ GEM
     hashdiff (0.3.4)
     hashie (4.1.0)
     hirb (0.7.3)
+    hiredis (0.6.3)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
@@ -258,8 +259,8 @@ GEM
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nest (1.1.2)
-      redis
+    nest (3.2.0)
+      redic
     netrc (0.11.0)
     ng-rails-csrf (0.1.0)
     ngannotate-rails (1.2.2)
@@ -277,10 +278,10 @@ GEM
     octokit (4.20.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    ohm (1.3.2)
-      nest (~> 1.0)
-      redis
-      scrivener (~> 0.0.3)
+    ohm (3.1.1)
+      nest (~> 3)
+      redic (~> 1.5.0)
+      stal
     ohm-expire (0.1.3.2)
       ohm (>= 0.1.5)
     omniauth (1.9.1)
@@ -363,6 +364,8 @@ GEM
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)
+    redic (1.5.3)
+      hiredis
     redis (3.3.5)
     redis-actionpack (5.0.2)
       actionpack (>= 4.0, < 6)
@@ -493,7 +496,6 @@ GEM
     schema_plus_views (0.3.1)
       activerecord (~> 4.2)
       schema_plus_core (~> 1.0)
-    scrivener (0.0.3)
     sentry-raven (2.7.2)
       faraday (>= 0.7.6, < 1.0)
     sexp_processor (4.9.0)
@@ -539,6 +541,8 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
+    stal (0.3.0)
+      redic (~> 1.5)
     state_machines (0.5.0)
     state_machines-activemodel (0.6.0)
       activemodel (>= 4.1, < 6.0)
@@ -611,7 +615,7 @@ DEPENDENCIES
   ng-rails-csrf
   ngannotate-rails
   octokit (~> 4.0)
-  ohm (~> 1.3.2)
+  ohm (~> 3.1.1)
   ohm-expire (~> 0.1.3)
   omniauth-github
   paperclip