diff options
| author | John Jarvis <jarv@gitlab.com> | 2019-04-04 11:06:58 +0200 |
|---|---|---|
| committer | John Jarvis <jarv@gitlab.com> | 2019-04-04 11:06:58 +0200 |
| commit | 83ab2898ed37abfd4bf7f92000a9899957811f33 (patch) | |
| tree | 91a2a3ed4f59456d8a732a63ce6787f5bdba81b9 /lib/gitlab/ci/config/entry/services.rb | |
| parent | bfec819ff91f839f6352aac3347e2cbfd7ebf2f0 (diff) | |
| parent | a6e9175fdd7790cc433ba49a85eaadbf75a3c8e9 (diff) | |
| download | gitlab-ce-83ab2898ed37abfd4bf7f92000a9899957811f33.tar.gz | |
Merge branch 'master' into 11-10-stable11-10-stable-prepare-rc2
Diffstat (limited to 'lib/gitlab/ci/config/entry/services.rb')
| -rw-r--r-- | lib/gitlab/ci/config/entry/services.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/ci/config/entry/services.rb b/lib/gitlab/ci/config/entry/services.rb index 71475f69218..83baa83711f 100644 --- a/lib/gitlab/ci/config/entry/services.rb +++ b/lib/gitlab/ci/config/entry/services.rb @@ -12,6 +12,7 @@ module Gitlab validations do validates :config, type: Array + validates :config, services_with_ports_alias_unique: true, if: ->(record) { record.opt(:with_image_ports) } end def compose!(deps = nil) @@ -20,6 +21,7 @@ module Gitlab @config.each do |config| @entries << ::Gitlab::Config::Entry::Factory.new(Entry::Service) .value(config || {}) + .with(key: "service", parent: self, description: "service definition.") # rubocop:disable CodeReuse/ActiveRecord .create! end |