From 3bb03e066f5cb0e50a5ec9b4666670364c16cda2 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Sep 2019 11:05:39 +0200
Subject: [PATCH] bump dalli

---
 Gemfile      |  5 +----
 Gemfile.lock | 10 ++--------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6cf4595aac..02566f8fdf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -146,10 +146,7 @@ gem 'meta-tags', '~> 2.11.0'
 group :production do
   # we use dalli as standard memcache client
   # requires memcached 1.4+
-  # see https://github.clientom/mperham/dalli
-  gem 'dalli',
-      git: 'https://github.com/petergoldstein/dalli',
-      ref: '0ff39199b5e91c6dbdaabc7c085b81938d0f08d2'
+  gem 'dalli', '~> 2.7.10'
 
   # Unicorn worker killer to restart unicorn child workers
   gem 'unicorn-worker-killer', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index a37d329415..13b0713c89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,13 +66,6 @@ GIT
       mixlib-shellout (~> 2.1.0)
       rubyzip
 
-GIT
-  remote: https://github.com/petergoldstein/dalli
-  revision: 0ff39199b5e91c6dbdaabc7c085b81938d0f08d2
-  ref: 0ff39199b5e91c6dbdaabc7c085b81938d0f08d2
-  specs:
-    dalli (2.7.9)
-
 GIT
   remote: https://github.com/rspec/rspec-activemodel-mocks
   revision: 6136a778f8b21f4f45f6b4ad5c2e2533e6d4ddc6
@@ -412,6 +405,7 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     daemons (1.3.1)
+    dalli (2.7.10)
     database_cleaner (1.7.0)
     date_validator (0.9.0)
       activemodel
@@ -920,7 +914,7 @@ DEPENDENCIES
   cucumber (~> 3.1.0)
   cucumber-rails (~> 1.6.0)
   daemons
-  dalli!
+  dalli (~> 2.7.10)
   dashboards!
   database_cleaner (~> 1.6)
   date_validator (~> 0.9.0)