Fixed merge conflicts

2014-07-18 20:35:15 -06:00
parent 21ec7bb82a
commit 1efe20fe42
41 changed files with 1185 additions and 105 deletions
@@ -1,25 +1,31 @@
 class UserMailer < ActionMailer::Base
-  default from: "from@example.com"
+	default from: "noreply@bikebike.org"

-  # Subject can be set in your I18n file at config/locales/en.yml
-  # with the following lookup:
-  #
-  #   en.user_mailer.activation_needed_email.subject
-  #
-  def activation_needed_email(email_address)
-    @greeting = "Hi"
+	# Subject can be set in your I18n file at config/locales/en.yml
+	# with the following lookup:
+	#
+	#   en.user_mailer.activation_needed_email.subject
+	#
+	def activation_needed_email(email_address)
+		@greeting = "Hi"

-    mail to: 'goodgodwin@hotmail.com'
-  end
+		mail to: 'goodgodwin@hotmail.com'
+	end

-  # Subject can be set in your I18n file at config/locales/en.yml
-  # with the following lookup:
-  #
-  #   en.user_mailer.activation_success_email.subject
-  #
-  def activation_success_email
-    @greeting = "Hi"
+	# Subject can be set in your I18n file at config/locales/en.yml
+	# with the following lookup:
+	#
+	#   en.user_mailer.activation_success_email.subject
+	#
+	def activation_success_email
+		@greeting = "Hi"

-    mail to: "to@example.org"
-  end
+		mail to: "to@example.org"
+	end
+
+	def conference_registration_email(conference, data)
+		@data = data
+		@conference = conference
+		mail to: data[:email], subject: 'Please confirm your registration for ' + conference.title
+	end
 end