summaryrefslogtreecommitdiff
path: root/db/migrate
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-29 18:07:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-29 18:07:04 +0000
commitbc0c5df2f15523e8c4a57682b149526f0cf55b9c (patch)
tree5264741513c3d10e1589e9566243ea6202b69e63 /db/migrate
parentcbafce7e89a8761c0c8062392803346f42f489fc (diff)
downloadgitlab-ce-bc0c5df2f15523e8c4a57682b149526f0cf55b9c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db/migrate')
-rw-r--r--db/migrate/20210616185947_add_mailgun_settings_to_application_setting.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/db/migrate/20210616185947_add_mailgun_settings_to_application_setting.rb b/db/migrate/20210616185947_add_mailgun_settings_to_application_setting.rb
new file mode 100644
index 00000000000..8447ff79d12
--- /dev/null
+++ b/db/migrate/20210616185947_add_mailgun_settings_to_application_setting.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddMailgunSettingsToApplicationSetting < ActiveRecord::Migration[6.1]
+ def change
+ add_column :application_settings, :encrypted_mailgun_signing_key, :binary
+ add_column :application_settings, :encrypted_mailgun_signing_key_iv, :binary
+
+ add_column :application_settings, :mailgun_events_enabled, :boolean, default: false, null: false
+ end
+end