Merge branch 'release/0.4'0.4

2 files changed, 26 insertions, 0 deletions

diff --git a/db/migrate/102_add_locale_to_users.rb b/db/migrate/102_add_locale_to_users.rb
new file mode 100644
index 000000000..a299a8561
--- /dev/null
+++ b/db/migrate/102_add_locale_to_users.rb
@@ -0,0 +1,11 @@
+class AddLocaleToUsers < ActiveRecord::Migration
+    def self.up
+        add_column :users, :locale, :string
+    end
+    def self.down
+        remove_column :users, :locale
+    end
+end
+
+
+
diff --git a/db/migrate/103_add_user_bounce_columns.rb b/db/migrate/103_add_user_bounce_columns.rb
new file mode 100644
index 000000000..a16ecde75
--- /dev/null
+++ b/db/migrate/103_add_user_bounce_columns.rb
@@ -0,0 +1,15 @@
+require 'digest/sha1'
+
+class AddUserBounceColumns < ActiveRecord::Migration
+    def self.up
+        add_column :users, :email_bounced_at, :datetime
+        add_column :users, :email_bounce_message, :text, :default => "", :null => false
+    end
+    def self.down
+        remove_column :users, :email_bounced_at
+        remove_column :users, :email_bounce_message
+    end
+end
+
+
+