diff options
author | Robert Speicher <robert@gitlab.com> | 2018-02-27 17:53:51 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-02-27 17:53:51 +0000 |
commit | 732a301df1cb43fbc1440dd9558e708913cc4fdf (patch) | |
tree | adc0b48c567df0e231265861e455f794e82568f8 | |
parent | 319b625ab293e9ff6e3d67f19f877c5040d51b7c (diff) | |
parent | ea32e1c41f2a1e2d5b68e2732d50caaec5bbb954 (diff) | |
download | gitlab-ce-732a301df1cb43fbc1440dd9558e708913cc4fdf.tar.gz |
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
-rw-r--r-- | lib/api/services.rb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/lib/api/services.rb b/lib/api/services.rb index c5fb5db724f..6c97659166d 100644 --- a/lib/api/services.rb +++ b/lib/api/services.rb @@ -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| |