Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 9 deletions

diff --git a/app/services/git/wiki_push_service.rb b/app/services/git/wiki_push_service.rb
index f9de72f2d5f..fa3019ee9d6 100644
--- a/app/services/git/wiki_push_service.rb
+++ b/app/services/git/wiki_push_service.rb
@@ -5,7 +5,16 @@ module Git
     # Maximum number of change events we will process on any single push
     MAX_CHANGES = 100
 
+    attr_reader :wiki
+
+    def initialize(wiki, current_user, params)
+      @wiki, @current_user, @params = wiki, current_user, params.dup
+    end
+
     def execute
+      # Execute model-specific callbacks
+      wiki.after_post_receive
+
       process_changes
     end
 
@@ -23,7 +32,11 @@ module Git
     end
 
     def can_process_wiki_events?
-      Feature.enabled?(:wiki_events_on_git_push, project)
+      # TODO: Support activity events for group wikis
+      # https://gitlab.com/gitlab-org/gitlab/-/issues/209306
+      return false unless wiki.is_a?(ProjectWiki)
+
+      Feature.enabled?(:wiki_events_on_git_push, wiki.container)
     end
 
     def push_changes
@@ -36,10 +49,6 @@ module Git
       wiki.repository.raw.raw_changes_between(change[:oldrev], change[:newrev])
     end
 
-    def wiki
-      project.wiki
-    end
-
     def create_event_for(change)
       event_service.execute(
         change.last_known_slug,
@@ -54,7 +63,7 @@ module Git
     end
 
     def on_default_branch?(change)
-      project.wiki.default_branch == ::Gitlab::Git.branch_name(change[:ref])
+      wiki.default_branch == ::Gitlab::Git.branch_name(change[:ref])
     end
 
     # See: [Gitlab::GitPostReceive#changes]
diff --git a/app/services/git/wiki_push_service/change.rb b/app/services/git/wiki_push_service/change.rb
index 562c43487e9..3d1d0fe8c4e 100644
--- a/app/services/git/wiki_push_service/change.rb
+++ b/app/services/git/wiki_push_service/change.rb
@@ -5,11 +5,11 @@ module Git
     class Change
       include Gitlab::Utils::StrongMemoize
 
-      # @param [ProjectWiki] wiki
+      # @param [Wiki] wiki
       # @param [Hash] change - must have keys `:oldrev` and `:newrev`
       # @param [Gitlab::Git::RawDiffChange] raw_change
-      def initialize(project_wiki, change, raw_change)
-        @wiki, @raw_change, @change = project_wiki, raw_change, change
+      def initialize(wiki, change, raw_change)
+        @wiki, @raw_change, @change = wiki, raw_change, change
       end
 
       def page