diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-03 11:07:58 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-03 11:07:58 +0000 |
commit | 6d3ab5d8f676962fea5edd7a88b9cfb4ef45d2b5 (patch) | |
tree | 1f58bb17ce8dd0b9e0402bf1257e559597f87a1c /lib | |
parent | 1248cd71f93eeb0bc7a017644a9518d93ba1c130 (diff) | |
parent | 7eafe90b90b41e1111bb64d4cc8d8004287da3d3 (diff) | |
download | gitlab-ce-6d3ab5d8f676962fea5edd7a88b9cfb4ef45d2b5.tar.gz |
Merge branch 'ce-fj-11886-fix-port-validation' into 'master'
Fix port validations in .gitlab-webide.yml
See merge request gitlab-org/gitlab-ce!29016
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/config/entry/image.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/ci/config/entry/service.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/entry/image.rb b/lib/gitlab/ci/config/entry/image.rb index 0beeb44c272..21c42857895 100644 --- a/lib/gitlab/ci/config/entry/image.rb +++ b/lib/gitlab/ci/config/entry/image.rb @@ -24,7 +24,7 @@ module Gitlab end entry :ports, Entry::Ports, - description: 'Ports used expose the image' + description: 'Ports used to expose the image' attributes :ports diff --git a/lib/gitlab/ci/config/entry/service.rb b/lib/gitlab/ci/config/entry/service.rb index 084fa4047a4..8d16371e857 100644 --- a/lib/gitlab/ci/config/entry/service.rb +++ b/lib/gitlab/ci/config/entry/service.rb @@ -24,6 +24,9 @@ module Gitlab validates :alias, type: String, presence: true, unless: ->(record) { record.ports.blank? } end + entry :ports, Entry::Ports, + description: 'Ports used to expose the service' + def alias value[:alias] end |