diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-15 12:46:18 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-15 12:46:18 +0000 |
| commit | d02ca097312245e13ba9e1301964342a4327859a (patch) | |
| tree | aacccd1975ce1caa0233f5ad8a35eae8942b62dc /app/models/clusters | |
| parent | a017fe6e3f2e3f3b6e99c5d609cc1d98d60786b8 (diff) | |
| parent | 3016a2a3606fb10e5bba48111e7e6cd1bb279ec6 (diff) | |
| download | gitlab-ce-d02ca097312245e13ba9e1301964342a4327859a.tar.gz | |
Merge branch '57650-remove-tld-validation-from-cluster' into 'master'
Remove TLD validation from cluster domain
Closes #57650
See merge request gitlab-org/gitlab-ce!25262
Diffstat (limited to 'app/models/clusters')
| -rw-r--r-- | app/models/clusters/cluster.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index 8df293664ce..be3e6a05e1e 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -50,7 +50,7 @@ module Clusters validates :name, cluster_name: true validates :cluster_type, presence: true - validates :domain, allow_blank: true, hostname: { allow_numeric_hostname: true, require_valid_tld: true } + validates :domain, allow_blank: true, hostname: { allow_numeric_hostname: true } validate :restrict_modification, on: :update validate :no_groups, unless: :group_type? |