From 0d09054d162458364ce3fc431506c182e2a5fa4f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 5 May 2020 15:09:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/models/group.rb      |  1 -
 app/models/group_wiki.rb | 27 ---------------------------
 2 files changed, 28 deletions(-)
 delete mode 100644 app/models/group_wiki.rb

(limited to 'app/models')

diff --git a/app/models/group.rb b/app/models/group.rb
index d61705ca605..fd0f9cc223c 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -15,7 +15,6 @@ class Group < Namespace
   include WithUploads
   include Gitlab::Utils::StrongMemoize
   include GroupAPICompatibility
-  include HasWiki
 
   ACCESS_REQUEST_APPROVERS_TO_BE_NOTIFIED_LIMIT = 10
 
diff --git a/app/models/group_wiki.rb b/app/models/group_wiki.rb
deleted file mode 100644
index 703ef80c121..00000000000
--- a/app/models/group_wiki.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-class GroupWiki < Wiki
-  alias_method :group, :container
-
-  override :storage
-  def storage
-    @storage ||= Storage::Hashed.new(container, prefix: Storage::Hashed::GROUP_REPOSITORY_PATH_PREFIX)
-  end
-
-  override :repository_storage
-  def repository_storage
-    # TODO: Add table to track storage
-    # https://gitlab.com/gitlab-org/gitlab/-/issues/207865
-    'default'
-  end
-
-  override :hashed_storage?
-  def hashed_storage?
-    true
-  end
-
-  override :disk_path
-  def disk_path(*args, &block)
-    storage.disk_path + '.wiki'
-  end
-end
-- 
cgit v1.2.1