summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-08-04 23:44:27 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-08-04 23:44:27 +0800
commit984367f957c8f8d02fa82b08817e2f2f318c6bff (patch)
tree6f18804966e10c58473094c94cb8c2a0626d8065 /app/models
parent80671bf75cdac3f50615253b058fa04da6235a4f (diff)
downloadgitlab-ce-984367f957c8f8d02fa82b08817e2f2f318c6bff.tar.gz
Move those builders to their own namespace, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13540099
Diffstat (limited to 'app/models')
-rw-r--r--app/models/ci/build.rb4
-rw-r--r--app/models/project_services/builds_email_service.rb2
-rw-r--r--app/models/service.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 08f396210c9..b919846af22 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -349,7 +349,7 @@ module Ci
def execute_hooks
return unless project
- build_data = Gitlab::BuildDataBuilder.build(self)
+ build_data = Gitlab::DataBuilder::BuildDataBuilder.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)
@@ -461,7 +461,7 @@ module Ci
def build_attributes_from_config
return {} unless pipeline.config_processor
-
+
pipeline.config_processor.build_attributes(name)
end
end
diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb
index 5e166471077..bf8c68244a1 100644
--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -52,7 +52,7 @@ class BuildsEmailService < Service
def test_data(project = nil, user = nil)
build = project.builds.last
- Gitlab::BuildDataBuilder.build(build)
+ Gitlab::DataBuilder::BuildDataBuilder.build(build)
end
def fields
diff --git a/app/models/service.rb b/app/models/service.rb
index e4cd44f542a..76f588f234d 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::PushDataBuilder.build_sample(project, user)
+ Gitlab::DataBuilder::PushDataBuilder.build_sample(project, user)
end
def event_channel_names