Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change

Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb

3 files changed, 20 insertions, 0 deletions

diff --git a/db/migrate/20110601083310_add_unconfirmed_email_to_users.rb b/db/migrate/20110601083310_add_unconfirmed_email_to_users.rb
new file mode 100644
index 000000000..9c295e557
--- /dev/null
+++ b/db/migrate/20110601083310_add_unconfirmed_email_to_users.rb
@@ -0,0 +1,9 @@
+class AddUnconfirmedEmailToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :unconfirmed_email, :string, :default => nil, :null => true
+  end
+
+  def self.down
+    remove_column :users, :unconfirmed_email
+  end
+end
diff --git a/db/migrate/20110601091059_add_confirm_email_token_to_users.rb b/db/migrate/20110601091059_add_confirm_email_token_to_users.rb
new file mode 100644
index 000000000..4c71e97b2
--- /dev/null
+++ b/db/migrate/20110601091059_add_confirm_email_token_to_users.rb
@@ -0,0 +1,9 @@
+class AddConfirmEmailTokenToUsers < ActiveRecord::Migration
+  def self.up
+    add_column :users, :confirm_email_token, :string, :limit => 30
+  end
+
+  def self.down
+    remove_column :users, :confirm_email_token
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index da2eb61fc..a8ddf606d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -391,6 +391,8 @@ ActiveRecord::Schema.define(:version => 20110707234802) do
     t.integer  "invited_by_id"
     t.string   "invited_by_type"
     t.string   "authentication_token",   :limit => 30
+    t.string   "unconfirmed_email"
+    t.string   "confirm_email_token",    :limit => 30
     t.datetime "locked_at"
   end