Merge pull request 'Add email service and settings' (#154) from feature/email_service into master

Reviewed-on: #154
Reviewed-by: galfert <garret.alfert@gmail.com>

app/models/user.rb

@@ -5,6 +5,7 @@ class User < ApplicationRecord
 
   attr_accessor :display_name
   attr_accessor :avatar_new
+  attr_accessor :current_password
 
   serialize :preferences, UserPreferences
 
@@ -93,11 +94,12 @@ class User < ApplicationRecord
       # E-Mail update confirmed
       LdapManager::UpdateEmail.call(self.dn, self.email)
     else
-      # TODO Make configurable
       # E-Mail from signup confirmed (i.e. account activation)
-      enable_service %w[ discourse gitea mediawiki xmpp ]
 
-      #TODO enable in development when we have easy setup of ejabberd etc.
+      # TODO Make configurable, only activate globally enabled services
+      enable_service %w[ discourse email gitea mediawiki xmpp ]
+
+      # TODO enable in development when we have easy setup of ejabberd etc.
       return if Rails.env.development? || !Setting.ejabberd_enabled?
 
       XmppExchangeContactsJob.perform_later(inviter, self) if inviter.present?