diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-28 19:16:30 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-02-28 19:16:30 +0300 |
commit | 790a51a42778b3aa3fb5c8c5afe687ef06dd4433 (patch) | |
tree | df21d214bbc24e4f74af90427e5b8b1116057855 /db | |
parent | 4df6460b4e3a5b1d2f383a37c9121bfbd59ea807 (diff) | |
parent | 77985826d94454514c40b8da926e13b3b3791841 (diff) |
Merge branch '56863-system-messages-in-email' into 'master'
Show header and footer system messages in email
Closes #56863
See merge request gitlab-org/gitlab-ce!25474
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20190220142344_add_email_header_and_footer_enabled_flag_to_appearances_table.rb | 17 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/db/migrate/20190220142344_add_email_header_and_footer_enabled_flag_to_appearances_table.rb b/db/migrate/20190220142344_add_email_header_and_footer_enabled_flag_to_appearances_table.rb new file mode 100644 index 00000000000..85b9e0580f4 --- /dev/null +++ b/db/migrate/20190220142344_add_email_header_and_footer_enabled_flag_to_appearances_table.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +class AddEmailHeaderAndFooterEnabledFlagToAppearancesTable < ActiveRecord::Migration[5.0] + include Gitlab::Database::MigrationHelpers + + disable_ddl_transaction! + + DOWNTIME = false + + def up + add_column_with_default(:appearances, :email_header_and_footer_enabled, :boolean, default: false) + end + + def down + remove_column(:appearances, :email_header_and_footer_enabled) + end +end diff --git a/db/schema.rb b/db/schema.rb index 7dfa9222278..e569200d12e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -44,6 +44,7 @@ ActiveRecord::Schema.define(version: 20190220150130) do t.text "message_background_color" t.text "message_font_color" t.string "favicon" + t.boolean "email_header_and_footer_enabled", default: false, null: false end create_table "application_setting_terms", force: :cascade do |t| |