summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-11-07 13:52:08 +0000
committerDouwe Maan <douwe@gitlab.com>2018-11-07 13:52:08 +0000
commitad7d0cb2f4395d4abca83acd9b98b17fc73523c0 (patch)
tree06bc505c89da581d43b9a17d7e16f3dba4c64293 /db
parente60e591fca3dd720c9a8b3e767d7b1b9f4560967 (diff)
parentc239452b47f2819e3ed2fdaf4679737b3e1a456e (diff)
downloadgitlab-ce-ad7d0cb2f4395d4abca83acd9b98b17fc73523c0.tar.gz
Merge branch '43521-keep-personal-emails-private' into 'master'
Adds option to override commit email Closes #43521 See merge request gitlab-org/gitlab-ce!22560
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20181025115728_add_private_commit_email_hostname_to_application_settings.rb11
-rw-r--r--db/schema.rb1
2 files changed, 12 insertions, 0 deletions
diff --git a/db/migrate/20181025115728_add_private_commit_email_hostname_to_application_settings.rb b/db/migrate/20181025115728_add_private_commit_email_hostname_to_application_settings.rb
new file mode 100644
index 00000000000..89ddaf2ae2b
--- /dev/null
+++ b/db/migrate/20181025115728_add_private_commit_email_hostname_to_application_settings.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddPrivateCommitEmailHostnameToApplicationSettings < ActiveRecord::Migration
+ include Gitlab::Database::MigrationHelpers
+
+ DOWNTIME = false
+
+ def change
+ add_column(:application_settings, :commit_email_hostname, :string, null: true)
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 3ccf9056c93..765cbf0606a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -166,6 +166,7 @@ ActiveRecord::Schema.define(version: 20181107054254) do
t.integer "receive_max_input_size"
t.integer "diff_max_patch_bytes", default: 102400, null: false
t.integer "archive_builds_in_seconds"
+ t.string "commit_email_hostname"
end
create_table "audit_events", force: :cascade do |t|