Douwe Maan · 8906caba · f76eac56 · 76dbafba
--- a/lib/gitlab/email_html_cleaner.rb 0 → 100644
+++ b/lib/gitlab/email_html_cleaner.rb 0 → 100644
+# Taken mostly from Discourse's Email::HtmlCleaner
+module Gitlab
+ # HtmlCleaner cleans up the extremely dirty HTML that many email clients
+ # generate by stripping out any excess divs or spans, removing styling in
+ # the process (which also makes the html more suitable to be parsed as
+ # Markdown).
+ class EmailHtmlCleaner
--- a/doc/reply_by_email/README.md 0 → 100644
+++ b/doc/reply_by_email/README.md 0 → 100644
+       :delivery_options:
+         # The URL to the Redis server used by Sidekiq. Should match the URL in config/resque.yml.
+         :redis_url: redis://localhost:6379
+         # Always "resque:gitlab".
+         :namespace: resque:gitlab
+         # Always "incoming_email".
+         :queue: incoming_email
+         # Always "EmailReceiverWorker"
+         :worker: EmailReceiverWorker
+   ```
+
+
+4.  Find `lib/support/init.d/gitlab.default.example` and copy it to `/etc/default/gitlab`:
+   
+   ```sh
+   sudo cp lib/support/init.d/gitlab.default.example /etc/default/gitlab
--- a/app/workers/email_receiver_worker.rb 0 → 100644
+++ b/app/workers/email_receiver_worker.rb 0 → 100644
+
+ def perform(raw)
+   return unless Gitlab.config.reply_by_email.enabled
+
+   # begin
+     Gitlab::EmailReceiver.new(raw).process
+   # rescue => e
+   #   handle_failure(raw, e)
+   # end
+ end
+
+ private
+
+ def handle_failure(raw, e)
+   # TODO: Handle better.
+   Rails.logger.warn("Email can not be processed: #{e}\n\n#{raw}")
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
+   when Gitlab::EmailReceiver::AutoGeneratedEmailError
+     reason = "The email was marked as 'auto generated', which we can't accept. Please create your comment through the web interface."
+   when Gitlab::EmailReceiver::UserNotFoundError
+     reason = "We couldn't figure out what user corresponds to the email. Please create your comment through the web interface."
+   when Gitlab::EmailReceiver::UserNotAuthorizedError
+     reason = "You are not allowed to respond to the thread you are replying to. If you believe this is in error, contact a staff member."
+   when Gitlab::EmailReceiver::NoteableNotFoundError
+     reason = "The thread you are replying to no longer exists, perhaps it was deleted? If you believe this is in error, contact a staff member."
+   when Gitlab::EmailReceiver::InvalidNote
+     can_retry = true
+     reason = e.message
+   else
+     return
+   end
+
+   EmailRejectionMailer.delay.rejection(reason, raw, can_retry)