Merge remote-tracking branch 'origin/release/0.18'0.18

2 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20140325120619_create_spam_addresses.rb b/db/migrate/20140325120619_create_spam_addresses.rb
new file mode 100644
index 000000000..7c730a5c7
--- /dev/null
+++ b/db/migrate/20140325120619_create_spam_addresses.rb
@@ -0,0 +1,9 @@
+class CreateSpamAddresses < ActiveRecord::Migration
+  def change
+    create_table :spam_addresses do |t|
+      t.string :email, :null => false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/migrate/20140408145616_add_default_short_name_to_public_bodies.rb b/db/migrate/20140408145616_add_default_short_name_to_public_bodies.rb
new file mode 100644
index 000000000..5fb239ebd
--- /dev/null
+++ b/db/migrate/20140408145616_add_default_short_name_to_public_bodies.rb
@@ -0,0 +1,11 @@
+class AddDefaultShortNameToPublicBodies < ActiveRecord::Migration
+
+  def up
+    change_column_default(:public_bodies, :short_name, '')
+  end
+
+  def down
+    change_column_default(:public_bodies, :short_name, nil)
+  end
+
+end