summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-02-27 16:43:05 +0000
committerDouwe Maan <douwe@gitlab.com>2017-02-27 16:43:05 +0000
commit23659c52daf42a343a005924615cf428b8a2d7a2 (patch)
tree68d346a7e8b1f7f4cb12fc6262f1a8432c4eff68 /lib
parent0599ced165b45ef10051c1e74d093846b6298103 (diff)
parent1c85d86d19d6cb0cb0da82ea062be3ccd351ffef (diff)
downloadgitlab-ce-23659c52daf42a343a005924615cf428b8a2d7a2.tar.gz
Merge branch 'mock-ci-service' into 'master'
Add Mock CI service/integration See merge request !9250
Diffstat (limited to 'lib')
-rw-r--r--lib/api/services.rb15
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb
index 1456fe4688b..ad856115485 100644
--- a/lib/api/services.rb
+++ b/lib/api/services.rb
@@ -563,7 +563,20 @@ module API
SlackService,
MattermostService,
TeamcityService,
- ].freeze
+ ]
+
+ if Rails.env.development?
+ services['mock-ci'] = [
+ {
+ required: true,
+ name: :mock_service_url,
+ type: String,
+ desc: 'URL to the mock service'
+ }
+ ]
+
+ service_classes << MockCiService
+ end
trigger_services = {
'mattermost-slash-commands' => [