Add latest changes from gitlab-org/gitlab@master

2 files changed, 26 insertions, 0 deletions

diff --git a/lib/gitlab/search/found_blob.rb b/lib/gitlab/search/found_blob.rb
index 360239a84e4..f472c70446c 100644
--- a/lib/gitlab/search/found_blob.rb
+++ b/lib/gitlab/search/found_blob.rb
@@ -7,6 +7,7 @@ module Gitlab
       include Presentable
       include BlobLanguageFromGitAttributes
       include Gitlab::Utils::StrongMemoize
+      include BlobActiveModel
 
       attr_reader :project, :content_match, :blob_path
 
diff --git a/lib/gitlab/search/found_wiki_page.rb b/lib/gitlab/search/found_wiki_page.rb
new file mode 100644
index 00000000000..99ca6a79fe2
--- /dev/null
+++ b/lib/gitlab/search/found_wiki_page.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# - rendering by using data purely from Elasticsearch and does not trigger Gitaly calls.
+# - allows policy check
+module Gitlab
+  module Search
+    class FoundWikiPage < SimpleDelegator
+      attr_reader :wiki
+
+      def self.declarative_policy_class
+        'WikiPagePolicy'
+      end
+
+      # @param found_blob [Gitlab::Search::FoundBlob]
+      def initialize(found_blob)
+        super
+        @wiki = found_blob.project.wiki
+      end
+
+      def to_ability_name
+        'wiki_page'
+      end
+    end
+  end
+end