Use sample data for push event when no commits created

2 files changed, 11 insertions, 2 deletions

diff --git a/changelogs/unreleased/50564-chat-service-refactoring.yml b/changelogs/unreleased/50564-chat-service-refactoring.yml
new file mode 100644
index 00000000000..aec5e8fab0a
--- /dev/null
+++ b/changelogs/unreleased/50564-chat-service-refactoring.yml
@@ -0,0 +1,5 @@
+---
+title: Use sample data for push event when no commits created
+merge_request: 21440
+author: Takuya Noguchi
+type: fixed
diff --git a/lib/gitlab/data_builder/push.rb b/lib/gitlab/data_builder/push.rb
index c169c8fe135..b498f113859 100644
--- a/lib/gitlab/data_builder/push.rb
+++ b/lib/gitlab/data_builder/push.rb
@@ -97,11 +97,15 @@ module Gitlab
         }
       end
 
-      # This method provide a sample data generated with
+      # This method provides a sample data generated with
       # existing project and commits to test webhooks
       def build_sample(project, user)
+        # Use sample data if repo has no commit
+        # (expect the case of test service configuration settings)
+        return sample_data if project.empty_repo?
+
         ref = "#{Gitlab::Git::BRANCH_REF_PREFIX}#{project.default_branch}"
-        commits = project.repository.commits(project.default_branch.to_s, limit: 3) rescue []
+        commits = project.repository.commits(project.default_branch.to_s, limit: 3)
 
         build(project, user, commits.last&.id, commits.first&.id, ref, commits)
       end