From e174d7e01a6b35a356d8166838a4a6ff66c47372 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 1 Jul 2015 13:53:21 +0200 Subject: [PATCH] Merged some migrations. --- db/migrate/20120101000010_create_ticket.rb | 1 + .../20150604215204_add_preferences_to_ticket_articles.rb | 5 ----- db/seeds.rb | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 db/migrate/20150604215204_add_preferences_to_ticket_articles.rb diff --git a/db/migrate/20120101000010_create_ticket.rb b/db/migrate/20120101000010_create_ticket.rb index 8c7105cf9..26a6fd770 100644 --- a/db/migrate/20120101000010_create_ticket.rb +++ b/db/migrate/20120101000010_create_ticket.rb @@ -149,6 +149,7 @@ class CreateTicket < ActiveRecord::Migration t.column :references, :string, limit: 3200, null: true t.column :body, :text, limit: 4.megabytes + 1 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 :created_by_id, :integer, null: false t.timestamps diff --git a/db/migrate/20150604215204_add_preferences_to_ticket_articles.rb b/db/migrate/20150604215204_add_preferences_to_ticket_articles.rb deleted file mode 100644 index 49e5b3146..000000000 --- a/db/migrate/20150604215204_add_preferences_to_ticket_articles.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddPreferencesToTicketArticles < ActiveRecord::Migration - def change - add_column :ticket_articles, :preferences, :text, limit: 500.kilobytes + 1, null: true - end -end diff --git a/db/seeds.rb b/db/seeds.rb index 90289f293..8ef16fa2e 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1780,7 +1780,7 @@ Network::Item::Comment.create( ) # install locales and translations -Locale.create( +Locale.create_if_not_exists( locale: 'en-us', alias: 'en', name: 'English (United States)',