Douwe Maan · @DouweM · Robert Speicher · Robert Speicher · Robert Speicher · Robert Speicher
--- a/app/models/sent_notification.rb 0 → 100644
+++ b/app/models/sent_notification.rb 0 → 100644
+class SentNotification < ActiveRecord::Base
+  belongs_to :project
+  belongs_to :noteable, polymorphic: true
+  belongs_to :recipient, class_name: "User"
+
+  validate :project, :recipient, :reply_key, presence: true
+  validate :reply_key, uniqueness: true
+
+  validates :noteable_id, presence: true, if: ->(n) { n.noteable_type.present? && n.noteable_type != 'Commit' }
+  validates :commit_id, presence: true, if: ->(n) { n.noteable_type == 'Commit' }
--- a/app/models/sent_notification.rb 0 → 100644
+++ b/app/models/sent_notification.rb 0 → 100644
+  def self.for(reply_key)
+    find_by(reply_key: reply_key)
+  end
+
+  def for_commit?
+    noteable_type == "Commit"
+  end
+
+  def noteable
+    if for_commit?
+      project.commit(commit_id)
+    else
+      super
+    end
+  rescue
+    nil
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
+  def mail_new_thread(model, headers = {})
+    if @project
+      headers['X-GitLab-Project'] = @project.name 
+      headers['X-GitLab-Project-Id'] = @project.id
+      headers['X-GitLab-Project-Path'] = @project.path_with_namespace
+    end
+
+    headers["X-GitLab-#{model.class.name}-ID"] = model.id
+
    headers['Message-ID'] = message_id(model)
-    headers['X-GitLab-Project'] = "#{@project.name} | " if @project
-    mail(headers, &block)
+
+    if reply_key
+      headers['X-GitLab-Reply-Key'] = reply_key
+      headers['Reply-To'] = Gitlab.config.reply_by_email.address.gsub('%{reply_key}', reply_key)
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
 Settings.gitlab['restricted_signup_domains'] ||= []
  
 #
+# Reply by email
+#
+Settings['reply_by_email'] ||= Settingslogic.new({})
+Settings.reply_by_email['enabled'] = false if Settings.gravatar['enabled'].nil?
--- 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/config/mail_room.yml.example 0 → 100644
+++ b/config/mail_room.yml.example 0 → 100644
+:mailboxes:
+  # -
+  #   :host: "imap.gmail.com"
--- a/Procfile
+++ b/Procfile
 web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"}
-worker: bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q common -q default
+worker: bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q common -q default
+mail_room: bundle exec mail_room -q -c config/mail_room.yml
--- a/app/mailers/email_rejection_mailer.rb 0 → 100644
+++ b/app/mailers/email_rejection_mailer.rb 0 → 100644
+class EmailRejectionMailer < ActionMailer::Base
+  add_template_helper ApplicationHelper
+  add_template_helper GitlabMarkdownHelper
+
+  helper_method :current_user, :can?
+
+  default from:     "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_from}>"
+  default reply_to: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_reply_to}>"
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
    allowed_domains
  end
  
+  def sent_notification!(noteable, recipient_id)
--- a/app/views/email_rejection_mailer/rejection.html.haml 0 → 100644
+++ b/app/views/email_rejection_mailer/rejection.html.haml 0 → 100644
+%p
+  Unfortunately, your email message to GitLab could not be processed.
+
+%p
+  = gfm @reason
--- a/spec/lib/gitlab/email/attachment_uploader_spec.rb 0 → 100644
+++ b/spec/lib/gitlab/email/attachment_uploader_spec.rb 0 → 100644
+require "spec_helper"
+
+describe Gitlab::Email::AttachmentUploader do
+  def fixture_file(filename)
--- a/doc/reply_by_email/README.md 0 → 100644
+++ b/doc/reply_by_email/README.md 0 → 100644
+    
+    ```sh
+    sudo cp lib/support/init.d/gitlab.default.example /etc/default/gitlab
+    ```
+
+5. Edit `/etc/default/gitlab` to enable `mail_room`:
+
+    ```sh
+    sudo editor /etc/default/gitlab
+    ```
+    
+    ```sh
+    mail_room_enabled=true
+    ```
+
+6. Restart GitLab
--- a/doc/reply_by_email/README.md 0 → 100644
+++ b/doc/reply_by_email/README.md 0 → 100644
+
+6. Restart GitLab
+    
+    ```sh
+    sudo service gitlab restart
+    ```
+
+7. Check if everything is configured correctly
+
+    ```sh
+    sudo bundle exec rake gitlab:reply_by_email:check RAILS_ENV=production
+    ```
+
+8. Reply by email should now be working.
+
+Note: If you're running GitLab in development mode and using `foreman`, make sure to also uncomment the `mail_room` line in your `Procfile`.
--- 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)