Commit 732a301d authored by Robert Speicher's avatar Robert Speicher

Merge branch...

Merge branch '43662-can-t-modify-frozen-hash-error-in-development-when-running-a-rake-task' into 'master'

Resolve "`can't modify frozen Hash` error in development when running a rake task"

Closes #43662

See merge request gitlab-org/gitlab-ce!17396
parents 319b625a ea32e1c4
......@@ -139,7 +139,7 @@ module API
}
].freeze
SERVICES = {
services = {
'asana' => [
{
required: true,
......@@ -673,9 +673,9 @@ module API
desc: 'The password of the user'
}
]
}.freeze
}
SERVICE_CLASSES = [
service_classes = [
AsanaService,
AssemblaService,
BambooService,
......@@ -704,10 +704,10 @@ module API
MattermostService,
MicrosoftTeamsService,
TeamcityService
].freeze
]
if Rails.env.development?
SERVICES['mock-ci'] = [
services['mock-ci'] = [
{
required: true,
name: :mock_service_url,
......@@ -715,16 +715,19 @@ module API
desc: 'URL to the mock service'
}
]
SERVICES['mock-deployment'] = []
SERVICES['mock-monitoring'] = []
services['mock-deployment'] = []
services['mock-monitoring'] = []
SERVICE_CLASSES += [
service_classes += [
MockCiService,
MockDeploymentService,
MockMonitoringService
]
end
SERVICES = services.freeze
SERVICE_CLASSES = service_classes.freeze
SERVICE_CLASSES.each do |service|
event_names = service.try(:event_names) || next
event_names.each do |event_name|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment