Merge pull request #10522 from mkllnk/flipper-upgrade

Bump flipper* from 0.20.4 to 0.26.0

Gemfile.lock

@@ -283,15 +283,17 @@ GEM
       websocket-driver (>= 0.6, < 0.8)
     ffaker (2.21.0)
     ffi (1.15.5)
-    flipper (0.20.4)
-    flipper-active_record (0.20.4)
-      activerecord (>= 5.0, < 7)
-      flipper (~> 0.20.4)
-    flipper-ui (0.20.4)
+    flipper (0.26.0)
+      concurrent-ruby (< 2)
+    flipper-active_record (0.26.0)
+      activerecord (>= 4.2, < 8)
+      flipper (~> 0.26.0)
+    flipper-ui (0.26.0)
       erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 0.20.4)
+      flipper (~> 0.26.0)
       rack (>= 1.4, < 3)
-      rack-protection (>= 1.5.3, < 2.2.0)
+      rack-protection (>= 1.5.3, <= 4.0.0)
+      sanitize (< 7)
     fog-aws (2.0.1)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
@@ -491,7 +493,7 @@ GEM
       httpclient
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rack-protection (2.1.0)
+    rack-protection (3.0.5)
       rack
     rack-proxy (0.7.6)
       rack
@@ -631,6 +633,9 @@ GEM
     rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
+    sanitize (6.0.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
     sass (3.4.25)
     sass-rails (5.0.8)
       railties (>= 5.2.0)

app/models/spree/user.rb

@@ -148,10 +148,6 @@ module Spree
       spree_orders.incomplete.where(created_by_id: id).order('created_at DESC').first
     end
 
-    def flipper_id
-      "#{self.class.name};#{id}"
-    end
-
     def disabled
       disabled_at.present?
     end

config/initializers/flipper.rb

@@ -1,14 +1,5 @@
 require "flipper"
 require "flipper/adapters/active_record"
-require "flipper/instrumentation/log_subscriber"
-
-Flipper.configure do |config|
-  config.default do
-    adapter = Flipper::Adapters::ActiveRecord.new
-    instrumented = Flipper::Adapters::Instrumented.new(adapter, instrumenter: ActiveSupport::Notifications)
-    Flipper.new(instrumented, instrumenter: ActiveSupport::Notifications)
-  end
-end
 
 if Rails.env.production?
   Flipper::UI.configure do |config|
@@ -17,6 +8,4 @@ if Rails.env.production?
   end
 end
 
-Rails.configuration.middleware.use Flipper::Middleware::Memoizer, preload_all: true
-
 Flipper.register(:admins) { |actor| actor.respond_to?(:admin?) && actor.admin? }