From 4444e2fb988a52d89b4e746ddd244e55725a629e Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 18 Aug 2022 20:06:55 +0000
Subject: [PATCH] Revert "Merge branch 'revert-ddd3a035' into 'master'"
This reverts merge request !95651
---
Gemfile | 6 +++---
Gemfile.lock | 20 ++++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Gemfile b/Gemfile
index a83422e13e5db..5fcf56cf6a401 100644
--- a/Gemfile
+++ b/Gemfile
@@ -497,9 +497,9 @@ gem 'google-protobuf', '~> 3.21'
gem 'toml-rb', '~> 2.0'
# Feature toggles
-gem 'flipper', '~> 0.21.0'
-gem 'flipper-active_record', '~> 0.21.0'
-gem 'flipper-active_support_cache_store', '~> 0.21.0'
+gem 'flipper', '~> 0.25.0'
+gem 'flipper-active_record', '~> 0.25.0'
+gem 'flipper-active_support_cache_store', '~> 0.25.0'
gem 'unleash', '~> 3.2.2'
gem 'gitlab-experiment', '~> 0.7.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7fdc1223b54af..f4e7c22c72f97 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -438,13 +438,13 @@ GEM
libyajl2 (~> 1.2)
filelock (1.1.1)
find_a_port (1.0.1)
- flipper (0.21.0)
- flipper-active_record (0.21.0)
- activerecord (>= 5.0, < 7)
- flipper (~> 0.21.0)
- flipper-active_support_cache_store (0.21.0)
- activesupport (>= 5.0, < 7)
- flipper (~> 0.21.0)
+ flipper (0.25.0)
+ flipper-active_record (0.25.0)
+ activerecord (>= 4.2, < 8)
+ flipper (~> 0.25.0)
+ flipper-active_support_cache_store (0.25.0)
+ activesupport (>= 4.2, < 8)
+ flipper (~> 0.25.0)
flowdock (0.7.1)
httparty (~> 0.7)
multi_json
@@ -1558,9 +1558,9 @@ DEPENDENCIES
faraday_middleware-aws-sigv4 (~> 0.3.0)
fast_blank
ffaker (~> 2.10)
- flipper (~> 0.21.0)
- flipper-active_record (~> 0.21.0)
- flipper-active_support_cache_store (~> 0.21.0)
+ flipper (~> 0.25.0)
+ flipper-active_record (~> 0.25.0)
+ flipper-active_support_cache_store (~> 0.25.0)
flowdock (~> 0.7)
fog-aliyun (~> 0.3)
fog-aws (~> 3.14)
--
GitLab