Merge branch 'master' into develop

Conflicts:
	users/test/unit/user_test.rb

1 files changed, 11 insertions, 0 deletions

diff --git a/users/app/helpers/email_aliases_helper.rb b/users/app/helpers/email_aliases_helper.rb
new file mode 100644
index 0000000..b56b068
--- /dev/null
+++ b/users/app/helpers/email_aliases_helper.rb
@@ -0,0 +1,11 @@
+module EmailAliasesHelper
+
+  def email_alias_form(options = {})
+    simple_form_for [@user, EmailAlias.new()],
+      :html => {:class => "form-horizontal email-alias form"},
+      :validate => true do |f|
+      yield f
+    end
+  end
+
+end