Add latest changes from gitlab-org/gitlab@master

3 files changed, 6 insertions, 8 deletions

diff --git a/app/models/clusters/applications/knative.rb b/app/models/clusters/applications/knative.rb
index 2602bb2cf97..eebcbcba2d3 100644
--- a/app/models/clusters/applications/knative.rb
+++ b/app/models/clusters/applications/knative.rb
@@ -74,7 +74,7 @@ module Clusters
       end
 
       def ingress_service
-        cluster.kubeclient.get_service('istio-ingressgateway', 'istio-system')
+        cluster.kubeclient.get_service('istio-ingressgateway', Clusters::Kubernetes::ISTIO_SYSTEM_NAMESPACE)
       end
 
       def uninstall_command
diff --git a/app/models/serverless/domain_cluster.rb b/app/models/serverless/domain_cluster.rb
index 9a1acf7e5c3..94d90d3e305 100644
--- a/app/models/serverless/domain_cluster.rb
+++ b/app/models/serverless/domain_cluster.rb
@@ -10,6 +10,11 @@ module Serverless
     belongs_to :knative, class_name: 'Clusters::Applications::Knative', foreign_key: 'clusters_applications_knative_id'
     belongs_to :creator, class_name: 'User', optional: true
 
+    attr_encrypted :key,
+      mode: :per_attribute_iv,
+      key: Settings.attr_encrypted_db_key_base_truncated,
+      algorithm: 'aes-256-gcm'
+
     validates :pages_domain, :knative, presence: true
     validates :uuid, presence: true, uniqueness: true, length: { is: Gitlab::Serverless::Domain::UUID_LENGTH },
               format: { with: HEX_REGEXP, message: 'only allows hex characters' }
diff --git a/app/models/user.rb b/app/models/user.rb
index d44e8162abe..a5ef03215d3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1638,13 +1638,6 @@ class User < ApplicationRecord
     super
   end
 
-  # override from Devise::Confirmable
-  def confirmation_period_valid?
-    return false if Feature.disabled?(:soft_email_confirmation)
-
-    super
-  end
-
   private
 
   def default_private_profile_to_false