Merged some migrations.

This commit is contained in:
Martin Edenhofer 2015-07-01 13:53:21 +02:00
parent 58644ae84d
commit e174d7e01a
3 changed files with 2 additions and 6 deletions

View file

@ -149,6 +149,7 @@ class CreateTicket < ActiveRecord::Migration
t.column :references, :string, limit: 3200, null: true t.column :references, :string, limit: 3200, null: true
t.column :body, :text, limit: 4.megabytes + 1 t.column :body, :text, limit: 4.megabytes + 1
t.column :internal, :boolean, null: false, default: false t.column :internal, :boolean, null: false, default: false
t.column :preferences, :text, limit: 500.kilobytes + 1, null: true
t.column :updated_by_id, :integer, null: false t.column :updated_by_id, :integer, null: false
t.column :created_by_id, :integer, null: false t.column :created_by_id, :integer, null: false
t.timestamps t.timestamps

View file

@ -1,5 +0,0 @@
class AddPreferencesToTicketArticles < ActiveRecord::Migration
def change
add_column :ticket_articles, :preferences, :text, limit: 500.kilobytes + 1, null: true
end
end

View file

@ -1780,7 +1780,7 @@ Network::Item::Comment.create(
) )
# install locales and translations # install locales and translations
Locale.create( Locale.create_if_not_exists(
locale: 'en-us', locale: 'en-us',
alias: 'en', alias: 'en',
name: 'English (United States)', name: 'English (United States)',