Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 1 insertions, 16 deletions

diff --git a/app/models/integrations/shimo.rb b/app/models/integrations/shimo.rb
index 0e1023bb7a7..dd25a0bc558 100644
--- a/app/models/integrations/shimo.rb
+++ b/app/models/integrations/shimo.rb
@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 module Integrations
-  class Shimo < Integration
+  class Shimo < BaseThirdPartyWiki
     prop_accessor :external_wiki_url
     validates :external_wiki_url, presence: true, public_url: true, if: :activated?
 
-    after_commit :cache_project_has_shimo
-
     def render?
       return false unless Feature.enabled?(:shimo_integration, project)
 
@@ -33,10 +31,6 @@ module Integrations
       nil
     end
 
-    def self.supported_events
-      %w()
-    end
-
     def fields
       [
         {
@@ -47,14 +41,5 @@ module Integrations
         }
       ]
     end
-
-    private
-
-    def cache_project_has_shimo
-      return unless project && !project.destroyed?
-
-      project.project_setting.save! unless project.project_setting.persisted?
-      project.project_setting.update_column(:has_shimo, activated?)
-    end
   end
 end