summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-10-19 12:06:13 +0000
committerRobert Speicher <robert@gitlab.com>2015-10-19 12:06:13 +0000
commitba41b2ba43188ed15acd93b84f43cb481abd55a9 (patch)
tree08d6757d3d866123eb12d4877063577df57fa353 /db
parente96559860456c84781ba47fb63e6b42a1fec1656 (diff)
parent47194545c77b2f701ab170d6644791a1536731d2 (diff)
downloadgitlab-ce-ba41b2ba43188ed15acd93b84f43cb481abd55a9.tar.gz
Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into 'master'
Send an email to admin email when a user is reported for spam Replaces !1547. Fixes #2839. See merge request !1634
Diffstat (limited to 'db')
-rw-r--r--db/migrate/20151008143519_add_admin_notification_email_setting.rb5
-rw-r--r--db/schema.rb1
2 files changed, 6 insertions, 0 deletions
diff --git a/db/migrate/20151008143519_add_admin_notification_email_setting.rb b/db/migrate/20151008143519_add_admin_notification_email_setting.rb
new file mode 100644
index 00000000000..0bb581efe2c
--- /dev/null
+++ b/db/migrate/20151008143519_add_admin_notification_email_setting.rb
@@ -0,0 +1,5 @@
+class AddAdminNotificationEmailSetting < ActiveRecord::Migration
+ def change
+ add_column :application_settings, :admin_notification_email, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 886b05f3e56..b05fa708775 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -46,6 +46,7 @@ ActiveRecord::Schema.define(version: 20151016195706) do
t.integer "session_expire_delay", default: 10080, null: false
t.text "import_sources"
t.text "help_page_text"
+ t.string "admin_notification_email"
end
create_table "audit_events", force: true do |t|