rebase against email settings changes
This commit is contained in:
parent
444356fbc7
commit
feabbfbc99
5 changed files with 21 additions and 21 deletions
|
|
@ -1,10 +1,10 @@
|
|||
class RenameEmailSettingsWithCfpAndProgram < ActiveRecord::Migration
|
||||
def change
|
||||
rename_column :email_settings, :send_on_call_for_papers_schedule_public, :send_on_program_schedule_public
|
||||
rename_column :email_settings, :call_for_papers_schedule_public_body, :program_schedule_public_template
|
||||
rename_column :email_settings, :call_for_papers_schedule_public_body, :program_schedule_public_body
|
||||
rename_column :email_settings, :call_for_papers_schedule_public_subject, :program_schedule_public_subject
|
||||
rename_column :email_settings, :send_on_call_for_papers_dates_updated, :send_on_cfp_dates_updates
|
||||
rename_column :email_settings, :call_for_papers_dates_updated_subject, :cfp_dates_updates_subject
|
||||
rename_column :email_settings, :call_for_papers_dates_updated_body, :cfp_dates_updates_template
|
||||
rename_column :email_settings, :send_on_call_for_papers_dates_updated, :send_on_cfp_dates_updated
|
||||
rename_column :email_settings, :call_for_papers_dates_updated_subject, :cfp_dates_updated_subject
|
||||
rename_column :email_settings, :call_for_papers_dates_updated_body, :cfp_dates_updated_body
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -179,12 +179,12 @@ ActiveRecord::Schema.define(version: 20151021113015) do
|
|||
t.boolean "send_on_venue_updated", default: false
|
||||
t.string "venue_updated_subject"
|
||||
t.text "venue_updated_body"
|
||||
t.boolean "send_on_cfp_dates_updates", default: false
|
||||
t.boolean "send_on_cfp_dates_updated", default: false
|
||||
t.boolean "send_on_program_schedule_public", default: false
|
||||
t.string "program_schedule_public_subject"
|
||||
t.string "cfp_dates_updates_subject"
|
||||
t.text "program_schedule_public_template"
|
||||
t.text "cfp_dates_updates_template"
|
||||
t.string "cfp_dates_updated_subject"
|
||||
t.text "program_schedule_public_body"
|
||||
t.text "cfp_dates_updated_body"
|
||||
end
|
||||
|
||||
create_table "event_types", force: true do |t|
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue