summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-08-12 16:09:29 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-08-12 16:09:29 +0800
commitd5264e8804bca70e613c418a9d346f5787c6fc7a (patch)
tree85097c38c14d79172af6f85628086d0c35b00cd9 /app/models
parent0a20897bbee538761352595e8f632c747b6d1b35 (diff)
downloadgitlab-ce-d5264e8804bca70e613c418a9d346f5787c6fc7a.tar.gz
Simplify the name for data builder, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13671791
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ci/build.rb2
-rw-r--r--app/models/ci/pipeline.rb2
-rw-r--r--app/models/project_services/builds_email_service.rb3
-rw-r--r--app/models/service.rb2
4 files changed, 4 insertions, 5 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 05b11f3b115..e2b0b996b6f 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -343,7 +343,7 @@ module Ci
def execute_hooks
return unless project
- build_data = Gitlab::DataBuilder::BuildDataBuilder.build(self)
+ build_data = Gitlab::DataBuilder::Build.build(self)
project.execute_hooks(build_data.dup, :build_hooks)
project.execute_services(build_data.dup, :build_hooks)
project.running_or_pending_build_count(force: true)
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index f8c0e27a5c3..2bfe8aa5ddd 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -222,7 +222,7 @@ module Ci
end
def pipeline_data
- Gitlab::DataBuilder::PipelineDataBuilder.build(self)
+ Gitlab::DataBuilder::Pipeline.build(self)
end
def keep_around_commits
diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb
index bf8c68244a1..fa66e5864b8 100644
--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -51,8 +51,7 @@ class BuildsEmailService < Service
end
def test_data(project = nil, user = nil)
- build = project.builds.last
- Gitlab::DataBuilder::BuildDataBuilder.build(build)
+ Gitlab::DataBuilder::Build.build(project.builds.last)
end
def fields
diff --git a/app/models/service.rb b/app/models/service.rb
index 76f588f234d..09b4717a523 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -80,7 +80,7 @@ class Service < ActiveRecord::Base
end
def test_data(project, user)
- Gitlab::DataBuilder::PushDataBuilder.build_sample(project, user)
+ Gitlab::DataBuilder::Push.build_sample(project, user)
end
def event_channel_names