Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 0 deletions

diff --git a/app/models/concerns/services/data_fields.rb b/app/models/concerns/services/data_fields.rb
new file mode 100644
index 00000000000..10963e4e7d8
--- /dev/null
+++ b/app/models/concerns/services/data_fields.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Services
+  module DataFields
+    extend ActiveSupport::Concern
+
+    included do
+      belongs_to :service
+
+      delegate :activated?, to: :service, allow_nil: true
+
+      validates :service, presence: true
+    end
+
+    class_methods do
+      def encryption_options
+        {
+          key: Settings.attr_encrypted_db_key_base_32,
+          encode: true,
+          mode: :per_attribute_iv,
+          algorithm: 'aes-256-gcm'
+        }
+      end
+    end
+  end
+end