Add latest changes from gitlab-org/gitlab@master

3 files changed, 0 insertions, 15 deletions

diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index 4723ce9ccdc..754ea70a155 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -215,11 +215,6 @@ class JiraService < IssueTrackerService
     { success: success, result: result }
   end
 
-  # Jira does not need test data.
-  def test_data(_, _)
-    nil
-  end
-
   override :support_close_issue?
   def support_close_issue?
     true
diff --git a/app/models/project_services/pipelines_email_service.rb b/app/models/project_services/pipelines_email_service.rb
index a58a264de5e..c11b2f7cc65 100644
--- a/app/models/project_services/pipelines_email_service.rb
+++ b/app/models/project_services/pipelines_email_service.rb
@@ -56,12 +56,6 @@ class PipelinesEmailService < Service
     project&.ci_pipelines&.any?
   end
 
-  def test_data(project, user)
-    data = Gitlab::DataBuilder::Pipeline.build(project.ci_pipelines.last)
-    data[:user] = user.hook_attrs
-    data
-  end
-
   def fields
     [
       { type: 'textarea',
diff --git a/app/models/service.rb b/app/models/service.rb
index e041db76727..2880526c9de 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -144,10 +144,6 @@ class Service < ApplicationRecord
     data_fields.as_json(only: data_fields.class.column_names).except('id', 'service_id')
   end
 
-  def test_data(project, user)
-    Gitlab::DataBuilder::Push.build_sample(project, user)
-  end
-
   def event_channel_names
     []
   end