From 1989b66734bac2b9db38512a0a32b8af98d6f69f Mon Sep 17 00:00:00 2001
From: Phil Hughes <theephil@gmail.com>
Date: Thu, 26 Mar 2015 21:08:17 +0000
Subject: [PATCH 001/111] Fixed JS issue with diff image loading

---
 app/assets/javascripts/commit/image-file.js.coffee | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/commit/image-file.js.coffee b/app/assets/javascripts/commit/image-file.js.coffee
index 9e5f49b1f6..9c723f51e5 100644
--- a/app/assets/javascripts/commit/image-file.js.coffee
+++ b/app/assets/javascripts/commit/image-file.js.coffee
@@ -119,8 +119,9 @@ class @ImageFile
 
   requestImageInfo: (img, callback) ->
     domImg = img.get(0)
-    if domImg.complete
-      callback.call(this, domImg.naturalWidth, domImg.naturalHeight)
-    else
-      img.on 'load', =>
+    if domImg
+      if domImg.complete
         callback.call(this, domImg.naturalWidth, domImg.naturalHeight)
+      else
+        img.on 'load', =>
+          callback.call(this, domImg.naturalWidth, domImg.naturalHeight)

From 5ba2d53cfa1704b7ab76d3ac5dda2a880fa55c57 Mon Sep 17 00:00:00 2001
From: karen Carias <karen@gitlab.com>
Date: Mon, 10 Aug 2015 16:56:02 -0700
Subject: [PATCH 002/111] fixed text

---
 doc/workflow/importing/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/workflow/importing/README.md b/doc/workflow/importing/README.md
index cd98d1b985..c14709b6b6 100644
--- a/doc/workflow/importing/README.md
+++ b/doc/workflow/importing/README.md
@@ -8,5 +8,6 @@
 ### Note
 * If you'd like to migrate from a self-hosted GitLab instance to GitLab.com, you can copy your repos by changing the remote and pushing to the new server; but issues and merge requests can't be imported.
 
-* Repositories are imported to GitLab via HTTP. 
-If the repository is too large, it can timeout. We have a soft limit of 10GB.
+* You can import any Git repository via HTTP from the New Project page.
+If the repository is too large, it can timeout. We have a soft limit of
+10GB.

From ea9b8fe5f16b26b5793f7d27500b4ff2633b5656 Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Sun, 16 Aug 2015 16:57:15 -0700
Subject: [PATCH 003/111] check uploads dir

Detect issues with uploads dir, e.g. permission and ownership issues
with the users uploads dir. This helps troubleshoot and correct
gitlab-org/omnibus-gitlab#311. Fixes gitlabhq#7500, gitlabhq#7052.
Related to gitlabhq#6281.
---
 lib/tasks/gitlab/check.rake | 52 +++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 8acb6a7fd1..2c4c5bf253 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -22,6 +22,7 @@ namespace :gitlab do
       check_gitlab_config_not_outdated
       check_log_writable
       check_tmp_writable
+      check_uploads
       check_init_script_exists
       check_init_script_up_to_date
       check_projects_have_namespace
@@ -276,6 +277,57 @@ namespace :gitlab do
         fix_and_rerun
       end
     end
+    
+    def check_uploads
+      print "Uploads directory setup correctly? ... "
+
+      unless File.directory?(Rails.root.join('public/uploads'))
+        puts "no".red
+        try_fixing_it(
+          "sudo -u #{gitlab_user} mkdir -m 750 #{Rails.root}/public/uploads"
+        )
+        for_more_information(
+          see_installation_guide_section "GitLab"
+        )
+        fix_and_rerun
+        return
+      end
+
+      upload_path = File.realpath(Rails.root.join('public/uploads'))
+      upload_path_tmp = File.join(upload_path, 'tmp')
+
+      if File.stat(upload_path).mode == 040750
+        unless Dir.exists?(upload_path_tmp)
+          puts 'skipped (no tmp uploads folder yet)'.magenta
+          return
+        end
+
+        # if tmp upload dir has incorrect permissions, assume others do as well
+        if File.stat(upload_path_tmp).mode == 040755 && File.owned?(upload_path_tmp) # verify drwxr-xr-x permissions
+          puts "yes".green
+        else
+          puts "no".red
+          try_fixing_it(
+            "sudo chown -R #{gitlab_user} #{upload_path}",
+            "sudo find #{upload_path} -type f -exec chmod 0644 {} \\;",
+            "sudo find #{upload_path} -type d -not -path #{upload_path} -exec chmod 0755 {} \\;"
+          )
+          for_more_information(
+            see_installation_guide_section "GitLab"
+          )
+          fix_and_rerun
+        end
+      else
+        puts "no".red
+        try_fixing_it(
+          "sudo chmod 0750 #{upload_path}",
+        )
+        for_more_information(
+          see_installation_guide_section "GitLab"
+        )
+        fix_and_rerun
+      end
+    end
 
     def check_redis_version
       print "Redis version >= 2.0.0? ... "

From 10491b5438d1a41628bbb732f58329fb1b6270a3 Mon Sep 17 00:00:00 2001
From: karen Carias <karen@gitlab.com>
Date: Mon, 17 Aug 2015 14:42:34 -0700
Subject: [PATCH 004/111] deleted line

---
 doc/workflow/importing/README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/workflow/importing/README.md b/doc/workflow/importing/README.md
index c14709b6b6..5cde90993d 100644
--- a/doc/workflow/importing/README.md
+++ b/doc/workflow/importing/README.md
@@ -9,5 +9,4 @@
 * If you'd like to migrate from a self-hosted GitLab instance to GitLab.com, you can copy your repos by changing the remote and pushing to the new server; but issues and merge requests can't be imported.
 
 * You can import any Git repository via HTTP from the New Project page.
-If the repository is too large, it can timeout. We have a soft limit of
-10GB.
+If the repository is too large, it can timeout. 

From f76eac56b9d7d4ae61010cddcca68682824b2239 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 18 Aug 2015 15:46:36 -0700
Subject: [PATCH 005/111] Reply by email POC

---
 .gitignore                                    |  1 +
 Gemfile                                       |  2 +
 Gemfile.lock                                  |  8 +++
 Procfile                                      |  3 +-
 app/mailers/emails/issues.rb                  |  8 +++
 app/mailers/emails/merge_requests.rb          | 11 +++-
 app/mailers/emails/notes.rb                   |  6 +++
 app/mailers/notify.rb                         | 54 ++++++++++++-------
 app/models/sent_notification.rb               | 29 ++++++++++
 app/workers/email_receiver_worker.rb          | 22 ++++++++
 config/gitlab.yml.example                     |  5 ++
 config/initializers/1_settings.rb             |  6 +++
 config/mail_room.yml.example                  | 14 +++++
 .../20150818213832_add_sent_notifications.rb  | 13 +++++
 db/schema.rb                                  | 13 ++++-
 lib/gitlab/email_receiver.rb                  | 50 +++++++++++++++++
 16 files changed, 224 insertions(+), 21 deletions(-)
 create mode 100644 app/models/sent_notification.rb
 create mode 100644 app/workers/email_receiver_worker.rb
 create mode 100644 config/mail_room.yml.example
 create mode 100644 db/migrate/20150818213832_add_sent_notifications.rb
 create mode 100644 lib/gitlab/email_receiver.rb

diff --git a/.gitignore b/.gitignore
index 3e30fb8cf7..8a68bb3e4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ config/initializers/rack_attack.rb
 config/initializers/smtp_settings.rb
 config/resque.yml
 config/unicorn.rb
+config/mail_room.yml
 coverage/*
 db/*.sqlite3
 db/*.sqlite3-journal
diff --git a/Gemfile b/Gemfile
index 8f65a274ba..e3f76671f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -272,3 +272,5 @@ end
 gem "newrelic_rpm"
 
 gem 'octokit', '3.7.0'
+
+gem "mail_room", github: "DouweM/mail_room", branch: "sidekiq"
diff --git a/Gemfile.lock b/Gemfile.lock
index f0c661fa9c..3aca2c8890 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,10 @@
+GIT
+  remote: git://github.com/DouweM/mail_room.git
+  revision: e1795b807f492533ad40afcb80abf870f1baddb5
+  branch: sidekiq
+  specs:
+    mail_room (0.3.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -805,6 +812,7 @@ DEPENDENCIES
   jquery-ui-rails
   kaminari (~> 0.15.1)
   letter_opener
+  mail_room!
   minitest (~> 5.3.0)
   mousetrap-rails
   mysql2
diff --git a/Procfile b/Procfile
index 799b92729f..51154f150d 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,3 @@
 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 -c config/mail_room.yml
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index 687bac3aa3..c8b7775c32 100644
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -8,6 +8,8 @@ module Emails
                       from: sender(@issue.author_id),
                       to: recipient(recipient_id),
                       subject: subject("#{@issue.title} (##{@issue.iid})"))
+
+      sent_notification!(@issue, recipient_id)
     end
 
     def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id, updated_by_user_id)
@@ -19,6 +21,8 @@ module Emails
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@issue.title} (##{@issue.iid})"))
+
+      sent_notification!(@issue, recipient_id)
     end
 
     def closed_issue_email(recipient_id, issue_id, updated_by_user_id)
@@ -30,6 +34,8 @@ module Emails
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@issue.title} (##{@issue.iid})"))
+
+      sent_notification!(@issue, recipient_id)
     end
 
     def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
@@ -42,6 +48,8 @@ module Emails
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@issue.title} (##{@issue.iid})"))
+
+      sent_notification!(@issue, recipient_id)
     end
   end
 end
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 512a8f7ea6..7a685c04eb 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -10,6 +10,8 @@ module Emails
                       from: sender(@merge_request.author_id),
                       to: recipient(recipient_id),
                       subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
+
+      sent_notification!(@merge_request, recipient_id)
     end
 
     def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id, updated_by_user_id)
@@ -23,6 +25,8 @@ module Emails
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
+
+      sent_notification!(@merge_request, recipient_id)
     end
 
     def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
@@ -36,6 +40,8 @@ module Emails
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
+
+      sent_notification!(@merge_request, recipient_id)
     end
 
     def merged_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
@@ -48,6 +54,8 @@ module Emails
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
+
+      sent_notification!(@merge_request, recipient_id)
     end
 
     def merge_request_status_email(recipient_id, merge_request_id, status, updated_by_user_id)
@@ -58,11 +66,12 @@ module Emails
       @target_url = namespace_project_merge_request_url(@project.namespace,
                                                         @project,
                                                         @merge_request)
-      set_reference("merge_request_#{merge_request_id}")
       mail_answer_thread(@merge_request,
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid}) #{@mr_status}"))
+
+      sent_notification!(@merge_request, recipient_id)
     end
   end
 
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index ff251209e0..2612074a5f 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -11,6 +11,8 @@ module Emails
                          from: sender(@note.author_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@commit.title} (#{@commit.short_id})"))
+
+      sent_notification!(@commit, recipient_id)
     end
 
     def note_issue_email(recipient_id, note_id)
@@ -24,6 +26,8 @@ module Emails
                          from: sender(@note.author_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@issue.title} (##{@issue.iid})"))
+
+      sent_notification!(@issue, recipient_id)
     end
 
     def note_merge_request_email(recipient_id, note_id)
@@ -38,6 +42,8 @@ module Emails
                          from: sender(@note.author_id),
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
+
+      sent_notification!(@merge_request, recipient_id)
     end
   end
 end
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 79fb48b00d..44df3d6407 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -46,6 +46,17 @@ class Notify < ActionMailer::Base
     allowed_domains
   end
 
+  def sent_notification!(noteable, recipient_id)
+    return unless reply_key
+
+    SentNotification.create(
+      project: noteable.project,
+      noteable: noteable,
+      recipient_id: recipient_id,
+      reply_key: reply_key
+    )
+  end
+
   private
 
   # The default email address to send emails from
@@ -85,14 +96,6 @@ class Notify < ActionMailer::Base
     @current_user.notification_email
   end
 
-  # Set the References header field
-  #
-  # local_part - The local part of the referenced message ID
-  #
-  def set_reference(local_part)
-    headers["References"] = "<#{local_part}@#{Gitlab.config.gitlab.host}>"
-  end
-
   # Formats arguments into a String suitable for use as an email subject
   #
   # extra - Extra Strings to be inserted into the subject
@@ -130,10 +133,23 @@ class Notify < ActionMailer::Base
   # with headers suitable for grouping by thread in email clients.
   #
   # See: mail_answer_thread
-  def mail_new_thread(model, headers = {}, &block)
+  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)
+    end
+
+    mail(headers)
   end
 
   # Send an email that responds to an existing conversation thread,
@@ -144,19 +160,21 @@ class Notify < ActionMailer::Base
   #  * have a subject that begin by 'Re: '
   #  * have a 'In-Reply-To' or 'References' header that references the original 'Message-ID'
   #
-  def mail_answer_thread(model, headers = {}, &block)
+  def mail_answer_thread(model, headers = {})
+    headers['Message-ID'] = SecureRandom.hex
     headers['In-Reply-To'] = message_id(model)
     headers['References'] = message_id(model)
-    headers['X-GitLab-Project'] = "#{@project.name} | " if @project
 
-    if headers[:subject]
-      headers[:subject].prepend('Re: ')
-    end
-
-    mail(headers, &block)
+    mail_new_thread(model, headers)
   end
 
   def can?
     Ability.abilities.allowed?(user, action, subject)
   end
+
+  def reply_key
+    return nil unless Gitlab.config.reply_by_email.enabled
+
+    @reply_key ||= SecureRandom.hex(16)
+  end
 end
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
new file mode 100644
index 0000000000..a3d24669b5
--- /dev/null
+++ b/app/models/sent_notification.rb
@@ -0,0 +1,29 @@
+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' }
+
+  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
+  end
+end
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb
new file mode 100644
index 0000000000..e44a430f6b
--- /dev/null
+++ b/app/workers/email_receiver_worker.rb
@@ -0,0 +1,22 @@
+class EmailReceiverWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: :incoming_email
+
+  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}")
+  end
+end
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 56770335dd..e78429b29a 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -94,6 +94,11 @@ production: &base
     # The default is 'tmp/repositories' relative to the root of the Rails app.
     # repository_downloads_path: tmp/repositories
 
+  ## Reply by email
+  reply_by_email:
+    enabled: false
+    address: "replies+%{reply_key}@gitlab.example.com"
+
   ## Gravatar
   ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html
   gravatar:
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 026c1a5792..9e83660e10 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -149,6 +149,12 @@ Settings.gitlab.default_projects_features['visibility_level']    = Settings.send
 Settings.gitlab['repository_downloads_path'] = File.absolute_path(Settings.gitlab['repository_downloads_path'] || 'tmp/repositories', Rails.root)
 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?
+
 #
 # Gravatar
 #
diff --git a/config/mail_room.yml.example b/config/mail_room.yml.example
new file mode 100644
index 0000000000..a7a6a25362
--- /dev/null
+++ b/config/mail_room.yml.example
@@ -0,0 +1,14 @@
+:mailboxes:
+  # -
+  #   :host: "imap.gmail.com"
+  #   :port: 993
+  #   :ssl: true
+  #   :email: "replies@gitlab.example.com"
+  #   :password: "password"
+  #   :name: "inbox"
+  #   :delivery_method: sidekiq
+  #   :delivery_options:
+  #     :redis_url: redis://localhost:6379
+  #     :namespace: resque:gitlab
+  #     :queue: incoming_email
+  #     :worker: EmailReceiverWorker
diff --git a/db/migrate/20150818213832_add_sent_notifications.rb b/db/migrate/20150818213832_add_sent_notifications.rb
new file mode 100644
index 0000000000..43e8d6a1a8
--- /dev/null
+++ b/db/migrate/20150818213832_add_sent_notifications.rb
@@ -0,0 +1,13 @@
+class AddSentNotifications < ActiveRecord::Migration
+  def change
+    create_table :sent_notifications do |t|
+      t.references :project
+      t.references :noteable, polymorphic: true
+      t.references :recipient
+      t.string :commit_id
+      t.string :reply_key, null: false
+    end
+
+    add_index :sent_notifications, :reply_key, unique: true
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6e919f2883..0827e810f1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150806104937) do
+ActiveRecord::Schema.define(version: 20150818213832) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -404,6 +404,17 @@ ActiveRecord::Schema.define(version: 20150806104937) do
 
   add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree
 
+  create_table "sent_notifications", force: true do |t|
+    t.integer "project_id"
+    t.integer "noteable_id"
+    t.string  "noteable_type"
+    t.integer "recipient_id"
+    t.string  "commit_id"
+    t.string  "reply_key",     null: false
+  end
+
+  add_index "sent_notifications", ["reply_key"], name: "index_sent_notifications_on_reply_key", unique: true, using: :btree
+
   create_table "services", force: true do |t|
     t.string   "type"
     t.string   "title"
diff --git a/lib/gitlab/email_receiver.rb b/lib/gitlab/email_receiver.rb
new file mode 100644
index 0000000000..a9f67bb5da
--- /dev/null
+++ b/lib/gitlab/email_receiver.rb
@@ -0,0 +1,50 @@
+module Gitlab
+  class EmailReceiver
+    def initialize(raw)
+      @raw = raw
+    end
+
+    def message
+      @message ||= Mail::Message.new(@raw)
+    end
+
+    def process
+      return unless message && sent_notification
+
+      Notes::CreateService.new(
+        sent_notification.project,
+        sent_notification.recipient,
+        note:           message.text_part.to_s,
+        noteable_type:  sent_notification.noteable_type,
+        noteable_id:    sent_notification.noteable_id,
+        commit_id:      sent_notification.commit_id
+      ).execute
+    end
+
+    private
+
+    def reply_key
+      address = Gitlab.config.reply_by_email.address
+      return nil unless address
+
+      regex = Regexp.escape(address)
+      regex = regex.gsub(Regexp.escape('%{reply_key}'), "(.*)")
+      regex = Regexp.new(regex)
+
+      address = message.to.find { |address| address =~ regex }
+      return nil unless address
+
+      match = address.match(regex)
+        
+      return nil unless match && match[1].present?
+
+      match[1]
+    end
+
+    def sent_notification
+      return nil unless reply_key
+      
+      SentNotification.for(reply_key)
+    end
+  end
+end

From a428838dc00dd95f5dad0e433ad2eb73df2eff0f Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 18 Aug 2015 15:50:46 -0700
Subject: [PATCH 006/111] Update mail_room

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3aca2c8890..597eb4cde0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/DouweM/mail_room.git
-  revision: e1795b807f492533ad40afcb80abf870f1baddb5
+  revision: b9deb6430ca13b2d44676827c45476d76966922c
   branch: sidekiq
   specs:
     mail_room (0.3.1)

From b04914ab4629be1af093736725e43bf5586a092e Mon Sep 17 00:00:00 2001
From: karen Carias <karen@gitlab.com>
Date: Tue, 18 Aug 2015 15:56:38 -0700
Subject: [PATCH 007/111] added note about backing up recovery codes

---
 doc/profile/two_factor_authentication.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/profile/two_factor_authentication.md b/doc/profile/two_factor_authentication.md
index f60ce35d3e..a0e23c1586 100644
--- a/doc/profile/two_factor_authentication.md
+++ b/doc/profile/two_factor_authentication.md
@@ -8,6 +8,10 @@ your phone.
 By enabling 2FA, the only way someone other than you can log into your account
 is to know your username and password *and* have access to your phone.
 
+#### Note
+When you enable 2FA, don't forget to back up your recovery codes. For your safety, if you
+lose your codes for GitLab.com, we can't disable or recover them.  
+
 ## Enabling 2FA
 
 **In GitLab:**

From 8906cabae7a6be44cafcedcaf27352614fcc462b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 18 Aug 2015 17:02:26 -0700
Subject: [PATCH 008/111] Changes and stuff.

---
 Gemfile                              |   2 +
 Gemfile.lock                         |   2 +
 app/mailers/notify.rb                |  10 +-
 app/models/sent_notification.rb      |   8 +-
 app/workers/email_receiver_worker.rb |   2 +-
 config/initializers/1_settings.rb    |   2 +-
 lib/gitlab/email_html_cleaner.rb     | 133 +++++++++++++++++++++++++
 lib/gitlab/email_receiver.rb         | 144 +++++++++++++++++++++++----
 lib/gitlab/reply_by_email.rb         |  47 +++++++++
 9 files changed, 320 insertions(+), 30 deletions(-)
 create mode 100644 lib/gitlab/email_html_cleaner.rb
 create mode 100644 lib/gitlab/reply_by_email.rb

diff --git a/Gemfile b/Gemfile
index e3f76671f5..9879141f5c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -274,3 +274,5 @@ gem "newrelic_rpm"
 gem 'octokit', '3.7.0'
 
 gem "mail_room", github: "DouweM/mail_room", branch: "sidekiq"
+
+gem 'email_reply_parser'
diff --git a/Gemfile.lock b/Gemfile.lock
index 597eb4cde0..629d128b42 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -163,6 +163,7 @@ GEM
     dotenv (0.9.0)
     dropzonejs-rails (0.7.1)
       rails (> 3.1)
+    email_reply_parser (0.5.8)
     email_spec (1.6.0)
       launchy (~> 2.1)
       mail (~> 2.2)
@@ -780,6 +781,7 @@ DEPENDENCIES
   diffy (~> 3.0.3)
   doorkeeper (= 2.1.3)
   dropzonejs-rails
+  email_reply_parser
   email_spec (~> 1.6.0)
   enumerize
   factory_girl_rails
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 44df3d6407..c2ea99d968 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -146,7 +146,7 @@ class Notify < ActionMailer::Base
 
     if reply_key
       headers['X-GitLab-Reply-Key'] = reply_key
-      headers['Reply-To'] = Gitlab.config.reply_by_email.address.gsub('%{reply_key}', reply_key)
+      headers['Reply-To'] = Gitlab::ReplyByEmail.reply_address(reply_key)
     end
 
     mail(headers)
@@ -165,6 +165,10 @@ class Notify < ActionMailer::Base
     headers['In-Reply-To'] = message_id(model)
     headers['References'] = message_id(model)
 
+    if headers[:subject]
+      headers[:subject].prepend('Re: ')
+    end
+
     mail_new_thread(model, headers)
   end
 
@@ -173,8 +177,6 @@ class Notify < ActionMailer::Base
   end
 
   def reply_key
-    return nil unless Gitlab.config.reply_by_email.enabled
-
-    @reply_key ||= SecureRandom.hex(16)
+    @reply_key ||= Gitlab::ReplyByEmail.reply_key
   end
 end
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index a3d24669b5..23a1b19ea7 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -6,8 +6,8 @@ class SentNotification < ActiveRecord::Base
   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' }
+  validates :noteable_id, presence: true, unless: :for_commit?
+  validates :commit_id, presence: true, if: :for_commit?
 
   def self.for(reply_key)
     find_by(reply_key: reply_key)
@@ -19,11 +19,9 @@ class SentNotification < ActiveRecord::Base
 
   def noteable
     if for_commit?
-      project.commit(commit_id)
+      project.commit(commit_id) rescue nil
     else
       super
     end
-  rescue
-    nil
   end
 end
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb
index e44a430f6b..94e346b5a5 100644
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
@@ -4,7 +4,7 @@ class EmailReceiverWorker
   sidekiq_options queue: :incoming_email
 
   def perform(raw)
-    return unless Gitlab.config.reply_by_email.enabled
+    return unless Gitlab::ReplyByEmail.enabled?
 
     # begin
       Gitlab::EmailReceiver.new(raw).process
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 9e83660e10..654de6238d 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -153,7 +153,7 @@ 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?
+Settings.reply_by_email['enabled'] = false if Settings.reply_by_email['enabled'].nil?
 
 #
 # Gravatar
diff --git a/lib/gitlab/email_html_cleaner.rb b/lib/gitlab/email_html_cleaner.rb
new file mode 100644
index 0000000000..6d7a17fe87
--- /dev/null
+++ b/lib/gitlab/email_html_cleaner.rb
@@ -0,0 +1,133 @@
+# 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
+    # Elements to hoist all children out of
+    HTML_HOIST_ELEMENTS = %w(div span font table tbody th tr td)
+    # Node types to always delete
+    HTML_DELETE_ELEMENT_TYPES = [
+      Nokogiri::XML::Node::DTD_NODE,
+      Nokogiri::XML::Node::COMMENT_NODE,
+    ]
+
+    # Private variables:
+    #   @doc - nokogiri document
+    #   @out - same as @doc, but only if trimming has occured
+    def initialize(html)
+      if html.is_a?(String)
+        @doc = Nokogiri::HTML(html)
+      else
+        @doc = html
+      end
+    end
+
+    class << self
+      # EmailHtmlCleaner.trim(inp, opts={})
+      #
+      # Arguments:
+      #   inp - Either a HTML string or a Nokogiri document.
+      # Options:
+      #   :return => :doc, :string
+      #     Specify the desired return type.
+      #     Defaults to the type of the input.
+      #     A value of :string is equivalent to calling get_document_text()
+      #     on the returned document.
+      def trim(inp, opts={})
+        cleaner = EmailHtmlCleaner.new(inp)
+
+        opts[:return] ||= (inp.is_a?(String) ? :string : :doc)
+
+        if opts[:return] == :string
+          cleaner.output_html
+        else
+          cleaner.output_document
+        end
+      end
+
+      # EmailHtmlCleaner.get_document_text(doc)
+      #
+      # Get the body portion of the document, including html, as a string.
+      def get_document_text(doc)
+        body = doc.xpath('//body')
+        if body
+          body.inner_html
+        else
+          doc.inner_html
+        end
+      end
+    end
+
+    def output_document
+      @out ||= begin
+        doc = @doc
+        trim_process_node doc
+        add_newlines doc
+        doc
+      end
+    end
+
+    def output_html
+      EmailHtmlCleaner.get_document_text(output_document)
+    end
+
+    private
+
+    def add_newlines(doc)
+      # Replace <br> tags with a markdown \n
+      doc.xpath('//br').each do |br|
+        br.replace(new_linebreak_node doc, 2)
+      end
+      # Surround <p> tags with newlines, to help with line-wise postprocessing
+      # and ensure markdown paragraphs
+      doc.xpath('//p').each do |p|
+        p.before(new_linebreak_node doc)
+        p.after(new_linebreak_node doc, 2)
+      end
+    end
+
+    def new_linebreak_node(doc, count=1)
+      Nokogiri::XML::Text.new("\n" * count, doc)
+    end
+
+    def trim_process_node(node)
+      if should_hoist?(node)
+        hoisted = trim_hoist_element node
+        hoisted.each { |child| trim_process_node child }
+      elsif should_delete?(node)
+        node.remove
+      else
+        if children = node.children
+          children.each { |child| trim_process_node child }
+        end
+      end
+
+      node
+    end
+
+    def trim_hoist_element(element)
+      hoisted = []
+      element.children.each do |child|
+        element.before(child)
+        hoisted << child
+      end
+      element.remove
+      hoisted
+    end
+
+    def should_hoist?(node)
+      return false unless node.element?
+      HTML_HOIST_ELEMENTS.include? node.name
+    end
+
+    def should_delete?(node)
+      return true if HTML_DELETE_ELEMENT_TYPES.include? node.type
+      return true if node.element? && node.name == 'head'
+      return true if node.text? && node.text.strip.blank?
+
+      false
+    end
+  end
+end
diff --git a/lib/gitlab/email_receiver.rb b/lib/gitlab/email_receiver.rb
index a9f67bb5da..18a06d2ee8 100644
--- a/lib/gitlab/email_receiver.rb
+++ b/lib/gitlab/email_receiver.rb
@@ -1,44 +1,69 @@
+# Inspired in great part by Discourse's Email::Receiver
 module Gitlab
   class EmailReceiver
+    class ProcessingError < StandardError; end
+    class EmailUnparsableError < ProcessingError; end
+    class EmptyEmailError < ProcessingError; end
+    class UserNotFoundError < ProcessingError; end
+    class UserNotAuthorizedLevelError < ProcessingError; end
+    class NoteableNotFoundError < ProcessingError; end
+    class AutoGeneratedEmailError < ProcessingError; end
+    class SentNotificationNotFound < ProcessingError; end
+    class InvalidNote < ProcessingError; end
+
     def initialize(raw)
       @raw = raw
     end
 
     def message
       @message ||= Mail::Message.new(@raw)
+    rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError => e
+      raise EmailUnparsableError, e
     end
 
     def process
-      return unless message && sent_notification
+      raise EmptyEmailError if @raw.blank?
 
-      Notes::CreateService.new(
-        sent_notification.project,
-        sent_notification.recipient,
-        note:           message.text_part.to_s,
+      raise AutoGeneratedEmailError if message.header.to_s =~ /auto-(generated|replied)/
+
+      raise SentNotificationNotFound unless sent_notification
+
+      author = sent_notification.recipient
+
+      raise UserNotFoundError unless author
+
+      project = sent_notification.project
+
+      raise UserNotAuthorizedLevelError unless author.can?(:create_note, project)
+
+      raise NoteableNotFoundError unless sent_notification.noteable
+
+      body = parse_body(message)
+
+      note = Notes::CreateService.new(
+        project,
+        author,
+        note:           body,
         noteable_type:  sent_notification.noteable_type,
         noteable_id:    sent_notification.noteable_id,
         commit_id:      sent_notification.commit_id
       ).execute
+
+      unless note.persisted?
+        raise InvalidNote, note.errors.full_messages.join("\n")
+      end
     end
 
     private
 
     def reply_key
-      address = Gitlab.config.reply_by_email.address
-      return nil unless address
+      reply_key = nil
+      message.to.each do |address|
+        reply_key = Gitlab::ReplyByEmail.reply_key_from_address(address)
+        break if reply_key
+      end
 
-      regex = Regexp.escape(address)
-      regex = regex.gsub(Regexp.escape('%{reply_key}'), "(.*)")
-      regex = Regexp.new(regex)
-
-      address = message.to.find { |address| address =~ regex }
-      return nil unless address
-
-      match = address.match(regex)
-        
-      return nil unless match && match[1].present?
-
-      match[1]
+      reply_key
     end
 
     def sent_notification
@@ -46,5 +71,86 @@ module Gitlab
       
       SentNotification.for(reply_key)
     end
+
+    def parse_body(message)
+      body = select_body(message)
+
+      encoding = body.encoding
+      raise EmptyEmailError if body.strip.blank?
+
+      body = discourse_email_trimmer(body)
+      raise EmptyEmailError if body.strip.blank?
+
+      body = EmailReplyParser.parse_reply(body)
+      raise EmptyEmailError if body.strip.blank?
+
+      body.force_encoding(encoding).encode("UTF-8")
+    end
+
+    def select_body(message)
+      html = nil
+      text = nil
+
+      if message.multipart?
+        html = fix_charset(message.html_part)
+        text = fix_charset(message.text_part)
+      elsif message.content_type =~ /text\/html/
+        html = fix_charset(message)
+      end
+
+      # prefer plain text
+      return text if text
+
+      if html
+        body = EmailHtmlCleaner.new(html).output_html
+      else
+        body = fix_charset(message)
+      end
+
+      # Certain trigger phrases that means we didn't parse correctly
+      if body =~ /(Content\-Type\:|multipart\/alternative|text\/plain)/
+        raise EmptyEmailError
+      end
+
+      body
+    end
+
+    # Force encoding to UTF-8 on a Mail::Message or Mail::Part
+    def fix_charset(object)
+      return nil if object.nil?
+
+      if object.charset
+        object.body.decoded.force_encoding(object.charset.gsub(/utf8/i, "UTF-8")).encode("UTF-8").to_s
+      else
+        object.body.to_s
+      end
+    rescue
+      nil
+    end
+
+    REPLYING_HEADER_LABELS = %w(From Sent To Subject Reply To Cc Bcc Date)
+    REPLYING_HEADER_REGEX = Regexp.union(REPLYING_HEADER_LABELS.map { |label| "#{label}:" })
+
+    def discourse_email_trimmer(body)
+      lines = body.scrub.lines.to_a
+      range_end = 0
+
+      lines.each_with_index do |l, idx|
+        break if l =~ /\A\s*\-{3,80}\s*\z/ ||
+                 # This one might be controversial but so many reply lines have years, times and end with a colon.
+                 # Let's try it and see how well it works.
+                 (l =~ /\d{4}/ && l =~ /\d:\d\d/ && l =~ /\:$/) ||
+                 (l =~ /On \w+ \d+,? \d+,?.*wrote:/)
+
+        # Headers on subsequent lines
+        break if (0..2).all? { |off| lines[idx+off] =~ REPLYING_HEADER_REGEX }
+        # Headers on the same line
+        break if REPLYING_HEADER_LABELS.count { |label| l.include?(label) } >= 3
+
+        range_end = idx
+      end
+
+      lines[0..range_end].join.strip
+    end
   end
 end
diff --git a/lib/gitlab/reply_by_email.rb b/lib/gitlab/reply_by_email.rb
new file mode 100644
index 0000000000..b6157de361
--- /dev/null
+++ b/lib/gitlab/reply_by_email.rb
@@ -0,0 +1,47 @@
+module Gitlab
+  module ReplyByEmail
+    class << self
+      def enabled?
+        config.enabled &&
+          config.address &&
+          config.address.include?("%{reply_key}")
+      end
+
+      def reply_key
+        return nil unless enabled?
+
+        SecureRandom.hex(16)
+      end
+
+      def reply_address(reply_key)
+        config.address.gsub('%{reply_key}', reply_key)
+      end
+
+      def reply_key_from_address(address)
+        return unless address_regex
+
+        match = address.match(address_regex)
+        return unless match
+
+        match[1]
+      end
+
+      private
+
+      def config
+        Gitlab.config.reply_by_email
+      end
+
+      def address_regex
+        @address_regex ||= begin
+          wildcard_address = config.address
+          return nil unless wildcard_address
+
+          regex = Regexp.escape(wildcard_address)
+          regex = regex.gsub(Regexp.escape('%{reply_key}'), "(.+)")
+          Regexp.new(regex).freeze
+        end
+      end
+    end
+  end
+end

From 3ebbed25f0538f170fdf64a3ca34bc1d34b4836b Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem.sidorenko@telekom.de>
Date: Mon, 10 Aug 2015 19:42:09 +0200
Subject: [PATCH 009/111] Allow listing of archived projects

Resolves #9285
---
 CHANGELOG                                      | 1 +
 app/controllers/admin/projects_controller.rb   | 1 +
 app/controllers/explore/projects_controller.rb | 2 ++
 app/models/project.rb                          | 2 +-
 app/views/admin/projects/index.html.haml       | 4 ++++
 5 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f6592f8221..8214e57aaa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 8.0.0 (unreleased)
   - Better performance for web editor (switched from satellites to rugged)
   - Faster merge
   - Ability to fetch merge requests from refs/merge-requests/:id
+  - Allow displaying of archived projects in the admin interface (Artem Sidorenko)
 
 v 7.14.0 (unreleased)
   - Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller)
diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb
index da5f5bb83f..ae1de06b98 100644
--- a/app/controllers/admin/projects_controller.rb
+++ b/app/controllers/admin/projects_controller.rb
@@ -9,6 +9,7 @@ class Admin::ProjectsController < Admin::ApplicationController
     @projects = @projects.where("visibility_level IN (?)", params[:visibility_levels]) if params[:visibility_levels].present?
     @projects = @projects.with_push if params[:with_push].present?
     @projects = @projects.abandoned if params[:abandoned].present?
+    @projects = @projects.non_archived unless params[:with_archived].present?
     @projects = @projects.search(params[:name]) if params[:name].present?
     @projects = @projects.sort(@sort = params[:sort])
     @projects = @projects.includes(:namespace).order("namespaces.path, projects.name ASC").page(params[:page]).per(PER_PAGE)
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index e9bcb44f6b..6c733c1ae4 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -7,6 +7,7 @@ class Explore::ProjectsController < Explore::ApplicationController
     @tags = @projects.tags_on(:tags)
     @projects = @projects.tagged_with(params[:tag]) if params[:tag].present?
     @projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present?
+    @projects = @projects.non_archived
     @projects = @projects.search(params[:search]) if params[:search].present?
     @projects = @projects.sort(@sort = params[:sort])
     @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE)
@@ -14,6 +15,7 @@ class Explore::ProjectsController < Explore::ApplicationController
 
   def trending
     @trending_projects = TrendingProjectsFinder.new.execute(current_user)
+    @trending_projects = @trending_projects.non_archived
     @trending_projects = @trending_projects.page(params[:page]).per(PER_PAGE)
   end
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 4628f478ca..69f9af91c5 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -215,7 +215,7 @@ class Project < ActiveRecord::Base
     end
 
     def search(query)
-      joins(:namespace).where('projects.archived = ?', false).
+      joins(:namespace).
         where('LOWER(projects.name) LIKE :query OR
               LOWER(projects.path) LIKE :query OR
               LOWER(namespaces.name) LIKE :query OR
diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index f43d46356f..e8aefbda25 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -23,6 +23,10 @@
             = label_tag :abandoned do
               = check_box_tag :abandoned, 1, params[:abandoned]
               %span No activity over 6 month
+          .checkbox
+            = label_tag :with_archived do
+              = check_box_tag :with_archived, 1, params[:with_archived]
+              %span Show archived projects
 
         %fieldset
           %strong Visibility level:

From 10d2281d73536d6c38cd5613630433b1ecfc5632 Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem.sidorenko@telekom.de>
Date: Mon, 10 Aug 2015 19:42:17 +0200
Subject: [PATCH 010/111] Show label on archived projects

---
 app/views/admin/projects/index.html.haml | 2 ++
 app/views/groups/projects.html.haml      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml
index e8aefbda25..d9b481404f 100644
--- a/app/views/admin/projects/index.html.haml
+++ b/app/views/admin/projects/index.html.haml
@@ -77,6 +77,8 @@
                 = visibility_level_icon(project.visibility_level)
               = link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project]
             .pull-right
+              - if project.archived
+                %span.label.label-warning archived
               %span.label.label-gray
                 = repository_size(project)
               = link_to 'Edit', edit_namespace_project_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm"
diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml
index 6b7efa83de..bf44e75e7c 100644
--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
@@ -14,9 +14,11 @@
         .list-item-name
           = visibility_level_icon(project.visibility_level)
           %strong= link_to project.name_with_namespace, project
+        .pull-right
+          - if project.archived
+            %span.label.label-warning archived
           %span.label.label-gray
             = repository_size(project)
-        .pull-right
           = link_to 'Members', namespace_project_project_members_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm"
           = link_to 'Edit', edit_namespace_project_path(project.namespace, project), id: "edit_#{dom_id(project)}", class: "btn btn-sm"
           = link_to 'Remove', project, data: { confirm: remove_project_message(project)}, method: :delete, class: "btn btn-sm btn-remove"

From 15cdf551fc612495f4bdbb02bf109feee33a471f Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem.sidorenko@telekom.de>
Date: Mon, 10 Aug 2015 19:42:23 +0200
Subject: [PATCH 011/111] Show colored icons like in the admin listing

---
 app/views/groups/projects.html.haml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/groups/projects.html.haml b/app/views/groups/projects.html.haml
index bf44e75e7c..d06cfa7ff9 100644
--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
@@ -12,7 +12,8 @@
     - @projects.each do |project|
       %li
         .list-item-name
-          = visibility_level_icon(project.visibility_level)
+          %span{ class: visibility_level_color(project.visibility_level) }
+            = visibility_level_icon(project.visibility_level)
           %strong= link_to project.name_with_namespace, project
         .pull-right
           - if project.archived

From 07190227395674715522f7a6aef30d4235b5d55c Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem.sidorenko@telekom.de>
Date: Tue, 18 Aug 2015 17:46:57 +0200
Subject: [PATCH 012/111] Spinach tests

---
 features/admin/projects.feature   | 11 ++++++++++-
 features/explore/projects.feature | 15 ++++++++++++---
 features/groups.feature           |  7 +++++++
 features/steps/admin/projects.rb  | 16 ++++++++++++++++
 features/steps/groups.rb          |  9 +++++++++
 features/steps/shared/paths.rb    |  4 ++++
 features/steps/shared/project.rb  | 23 +++++++++++++++++++++++
 7 files changed, 81 insertions(+), 4 deletions(-)

diff --git a/features/admin/projects.feature b/features/admin/projects.feature
index a6c3d6b782..f7cec04eb7 100644
--- a/features/admin/projects.feature
+++ b/features/admin/projects.feature
@@ -4,9 +4,18 @@ Feature: Admin Projects
     Given I sign in as an admin
     And there are projects in system
 
-  Scenario: Projects list
+  Scenario: I should see non-archived projects in the list
+    Given archived project "Archive"
     When I visit admin projects page
+    Then I should see all non-archived projects
+    And I should not see project "Archive"
+
+  Scenario: I should see all projects in the list
+    Given archived project "Archive"
+    When I visit admin projects page
+    And I check "Show archived projects"
     Then I should see all projects
+    And I should see "archived" label
 
   Scenario: Projects show
     When I visit admin projects page
diff --git a/features/explore/projects.feature b/features/explore/projects.feature
index a1b2972267..5d3870827f 100644
--- a/features/explore/projects.feature
+++ b/features/explore/projects.feature
@@ -6,10 +6,12 @@ Feature: Explore Projects
     And private project "Enterprise"
 
   Scenario: I visit public area
+    Given archived project "Archive"
     When I visit the public projects area
     Then I should see project "Community"
     And I should not see project "Internal"
     And I should not see project "Enterprise"
+    And I should not see project "Archive"
 
   Scenario: I visit public project page
     When I visit project "Community" page
@@ -37,11 +39,13 @@ Feature: Explore Projects
     And I should see empty public project details with ssh clone info
 
   Scenario: I visit public area as user
-    Given I sign in as a user
+    Given archived project "Archive"
+    And I sign in as a user
     When I visit the public projects area
     Then I should see project "Community"
     And I should see project "Internal"
     And I should not see project "Enterprise"
+    And I should not see project "Archive"
 
   Scenario: I visit internal project page as user
     Given I sign in as a user
@@ -102,15 +106,20 @@ Feature: Explore Projects
     Then I should see list of merge requests for "Internal" project
 
   Scenario: Trending page
-    Given I sign in as a user
+    Given archived project "Archive"
+    And project "Archive" has comments
+    And I sign in as a user
     And project "Community" has comments
     When I visit the explore trending projects
     Then I should see project "Community"
     And I should not see project "Internal"
     And I should not see project "Enterprise"
+    And I should not see project "Archive"
 
   Scenario: Most starred page
-    Given I sign in as a user
+    Given archived project "Archive"
+    And I sign in as a user
     When I visit the explore starred projects
     Then I should see project "Community"
     And I should see project "Internal"
+    And I should see project "Archive"
diff --git a/features/groups.feature b/features/groups.feature
index 299e846edb..d5272fdddc 100644
--- a/features/groups.feature
+++ b/features/groups.feature
@@ -152,3 +152,10 @@ Feature: Groups
     And I click on one group milestone
     Then I should see group milestone with descriptions and expiry date
     And I should see group milestone with all issues and MRs assigned to that milestone
+
+  # Group projects in settings
+  Scenario: I should see all projects in the project list in settings
+    Given Group "Owned" has archived project
+    When I visit group "Owned" projects page
+    Then I should see group "Owned" projects list
+    And I should see "archived" label
diff --git a/features/steps/admin/projects.rb b/features/steps/admin/projects.rb
index 655f189527..17233f89f3 100644
--- a/features/steps/admin/projects.rb
+++ b/features/steps/admin/projects.rb
@@ -2,6 +2,13 @@ class Spinach::Features::AdminProjects < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
   include SharedAdmin
+  include SharedProject
+
+  step 'I should see all non-archived projects' do
+    Project.non_archived.each do |p|
+      expect(page).to have_content p.name_with_namespace
+    end
+  end
 
   step 'I should see all projects' do
     Project.all.each do |p|
@@ -9,6 +16,15 @@ class Spinach::Features::AdminProjects < Spinach::FeatureSteps
     end
   end
 
+  step 'I check "Show archived projects"' do
+    page.check 'Show archived projects'
+    click_button "Search"
+  end
+
+  step 'I should see "archived" label' do
+    expect(page).to have_xpath("//span[@class='label label-warning']", text: 'archived')
+  end
+
   step 'I click on first project' do
     click_link Project.first.name_with_namespace
   end
diff --git a/features/steps/groups.rb b/features/steps/groups.rb
index 46e1f4d099..18a1c4d32c 100644
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
@@ -226,6 +226,15 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
     expect(page).to have_link(@mr3.title, href: namespace_project_merge_request_path(@project3.namespace, @project3, @mr3))
   end
 
+  step 'Group "Owned" has archived project' do
+    group = Group.find_by(name: 'Owned')
+    create(:project, namespace: group, archived: true, path: "archived-project")
+  end
+
+  step 'I should see "archived" label' do
+    expect(page).to have_xpath("//span[@class='label label-warning']", text: 'archived')
+  end
+
   protected
 
   def assigned_to_me(key)
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index bb0cd9ac10..ca8fbb4910 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -39,6 +39,10 @@ module SharedPaths
     visit edit_group_path(Group.find_by(name: "Owned"))
   end
 
+  step 'I visit group "Owned" projects page' do
+    visit projects_group_path(Group.find_by(name: "Owned"))
+  end
+
   step 'I visit group "Guest" page' do
     visit group_path(Group.find_by(name: "Guest"))
   end
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 9ee2e5dfbe..ccbe8f96a4 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -92,6 +92,29 @@ module SharedProject
     @project ||= Project.first
   end
 
+  # ----------------------------------------
+  # Visibility of archived project
+  # ----------------------------------------
+
+  step 'archived project "Archive"' do
+    create :project, :public, archived: true, name: 'Archive'
+  end
+
+  step 'I should not see project "Archive"' do
+    project = Project.find_by(name: "Archive")
+    expect(page).not_to have_content project.name_with_namespace
+  end
+
+  step 'I should see project "Archive"' do
+    project = Project.find_by(name: "Archive")
+    expect(page).to have_content project.name_with_namespace
+  end
+
+  step 'project "Archive" has comments' do
+    project = Project.find_by(name: "Archive")
+    2.times { create(:note_on_issue, project: project) }
+  end
+
   # ----------------------------------------
   # Visibility level
   # ----------------------------------------

From b7e6ae03dceb168ca542ee11987b248ec62cc947 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 19 Aug 2015 15:59:48 +0200
Subject: [PATCH 013/111] Case-insensetive search for comments

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG                | 1 +
 app/models/note.rb       | 2 +-
 spec/models/note_spec.rb | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f6592f8221..ea5def6000 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ v 8.0.0 (unreleased)
   - Better performance for web editor (switched from satellites to rugged)
   - Faster merge
   - Ability to fetch merge requests from refs/merge-requests/:id
+  - Search for comments should be case insensetive
 
 v 7.14.0 (unreleased)
   - Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller)
diff --git a/app/models/note.rb b/app/models/note.rb
index 913a8c0033..36cad8f583 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -90,7 +90,7 @@ class Note < ActiveRecord::Base
     end
 
     def search(query)
-      where("note like :query", query: "%#{query}%")
+      where("LOWER(note) like :query", query: "%#{query.downcase}%")
     end
   end
 
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 250d1e2da8..331505a01b 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -198,4 +198,10 @@ describe Note do
     let(:backref_text) { issue.gfm_reference }
     let(:set_mentionable_text) { ->(txt) { subject.note = txt } }
   end
+
+  describe :search do
+    let!(:note) { create(:note, note: "WoW") }
+
+    it { expect(Note.search('wow')).to include(note) }
+  end
 end

From 73eef57d5e3dfc4a60e3e661c04a9172b94f1535 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 10:16:30 -0700
Subject: [PATCH 014/111] Make MR notification email subject more standard.

---
 app/mailers/emails/merge_requests.rb | 43 +---------------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 7a685c04eb..76902b58f3 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -69,50 +69,9 @@ module Emails
       mail_answer_thread(@merge_request,
                          from: sender(updated_by_user_id),
                          to: recipient(recipient_id),
-                         subject: subject("#{@merge_request.title} (##{@merge_request.iid}) #{@mr_status}"))
+                         subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
 
       sent_notification!(@merge_request, recipient_id)
     end
   end
-
-  # Over rides default behaviour to show source/target
-  # Formats arguments into a String suitable for use as an email subject
-  #
-  # extra - Extra Strings to be inserted into the subject
-  #
-  # Examples
-  #
-  #   >> subject('Lorem ipsum')
-  #   => "GitLab Merge Request | Lorem ipsum"
-  #
-  #   # Automatically inserts Project name:
-  #   Forked MR
-  #   => source project => <Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...>
-  #   => target project => <Project id: 2, name: "My Ror", path: "ruby_on_rails", ...>
-  #   => source branch => source
-  #   => target branch => target
-  #   >> subject('Lorem ipsum')
-  #   => "GitLab Merge Request | Ruby on Rails:source >> My Ror:target | Lorem ipsum "
-  #
-  #   Non Forked MR
-  #   => source project => <Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...>
-  #   => target project => <Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...>
-  #   => source branch => source
-  #   => target branch => target
-  #   >> subject('Lorem ipsum')
-  #   => "GitLab Merge Request | Ruby on Rails | source >> target | Lorem ipsum "
-  #   # Accepts multiple arguments
-  #   >> subject('Lorem ipsum', 'Dolor sit amet')
-  #   => "GitLab Merge Request | Lorem ipsum | Dolor sit amet"
-  def subject(*extra)
-    subject = "Merge Request | "
-    if @merge_request.for_fork?
-      subject << "#{@merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} >> #{@merge_request.target_project.name_with_namespace}:#{merge_request.target_branch}"
-    else
-      subject << "#{@merge_request.source_project.name_with_namespace} | #{merge_request.source_branch} >> #{merge_request.target_branch}"
-    end
-    subject << " | " + extra.join(' | ') if extra.present?
-    subject
-  end
-
 end

From 4f34d363a532613df60f3e566644c082ed3fa395 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 10:17:20 -0700
Subject: [PATCH 015/111] Correctly set Message-ID for comment notifications.

---
 app/mailers/notify.rb | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index c2ea99d968..e893009c72 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -129,11 +129,7 @@ class Notify < ActionMailer::Base
     "<#{model_name}_#{model.id}@#{Gitlab.config.gitlab.host}>"
   end
 
-  # Send an email that starts a new conversation thread,
-  # with headers suitable for grouping by thread in email clients.
-  #
-  # See: mail_answer_thread
-  def mail_new_thread(model, headers = {})
+  def mail_thread(model, headers = {})
     if @project
       headers['X-GitLab-Project'] = @project.name 
       headers['X-GitLab-Project-Id'] = @project.id
@@ -142,8 +138,6 @@ class Notify < ActionMailer::Base
 
     headers["X-GitLab-#{model.class.name}-ID"] = model.id
 
-    headers['Message-ID'] = message_id(model)
-
     if reply_key
       headers['X-GitLab-Reply-Key'] = reply_key
       headers['Reply-To'] = Gitlab::ReplyByEmail.reply_address(reply_key)
@@ -152,6 +146,16 @@ class Notify < ActionMailer::Base
     mail(headers)
   end
 
+  # Send an email that starts a new conversation thread,
+  # with headers suitable for grouping by thread in email clients.
+  #
+  # See: mail_answer_thread
+  def mail_new_thread(model, headers = {})
+    headers['Message-ID'] = message_id(model)
+
+    mail_thread(model, headers)
+  end
+
   # Send an email that responds to an existing conversation thread,
   # with headers suitable for grouping by thread in email clients.
   #
@@ -165,11 +169,9 @@ class Notify < ActionMailer::Base
     headers['In-Reply-To'] = message_id(model)
     headers['References'] = message_id(model)
 
-    if headers[:subject]
-      headers[:subject].prepend('Re: ')
-    end
+    headers[:subject].prepend('Re: ') if headers[:subject]
 
-    mail_new_thread(model, headers)
+    mail_thread(model, headers)
   end
 
   def can?

From 6b31827a41b3a057569d8476f9e8d5a22980cc16 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 10:17:32 -0700
Subject: [PATCH 016/111] Include display name with reply to address.

---
 app/mailers/notify.rb | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index e893009c72..8a386de9a3 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -17,7 +17,7 @@ class Notify < ActionMailer::Base
   helper_method :current_user, :can?
 
   default from: Proc.new { default_sender_address.format }
-  default reply_to: Gitlab.config.gitlab.email_reply_to
+  default reply_to: Proc.new { default_reply_to_address.format }
 
   # Just send email with 2 seconds delay
   def self.delay
@@ -66,6 +66,13 @@ class Notify < ActionMailer::Base
     address
   end
 
+  # The default email address to send emails from
+  def default_reply_to_address
+    address = Mail::Address.new(Gitlab.config.gitlab.email_reply_to)
+    address.display_name = Gitlab.config.gitlab.email_display_name
+    address
+  end
+
   def can_send_from_user_email?(sender)
     sender_domain = sender.email.split("@").last
     self.class.allowed_email_domains.include?(sender_domain)
@@ -140,7 +147,13 @@ class Notify < ActionMailer::Base
 
     if reply_key
       headers['X-GitLab-Reply-Key'] = reply_key
-      headers['Reply-To'] = Gitlab::ReplyByEmail.reply_address(reply_key)
+
+      address = Mail::Address.new(Gitlab::ReplyByEmail.reply_address(reply_key))
+      address.display_name = @project.name_with_namespace
+
+      headers['Reply-To'] = address
+
+      @reply_by_email = true
     end
 
     mail(headers)

From 01c5ecedd405fed29dbae11039ecb1a90f170c28 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 10:17:51 -0700
Subject: [PATCH 017/111] Add "Reply to this email directly" to notification
 footer.

---
 app/views/layouts/notify.html.haml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/notify.html.haml b/app/views/layouts/notify.html.haml
index c8662a15ad..ec209c38ee 100644
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -36,7 +36,11 @@
         &mdash;
         %br
         - if @target_url
-          #{link_to "View it on GitLab", @target_url}
+          - if @reply_by_email
+            Reply to this email directly or
+            #{link_to "view it on GitLab", @target_url}.
+          - else
+            #{link_to "View it on GitLab", @target_url}
           = email_action @target_url
         - if @project && !@disable_footer
           You're receiving this notification because you are a member of the #{link_to_unless @target_url, @project.name_with_namespace, namespace_project_url(@project.namespace, @project)} project team.

From ee1eb2948d30365be241bed6a68b29da57495af8 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 10:18:05 -0700
Subject: [PATCH 018/111] Turn reply-by-email attachments into uploads.

---
 app/services/projects/upload_service.rb |  6 ++---
 lib/gitlab/email_receiver.rb            | 33 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/services/projects/upload_service.rb b/app/services/projects/upload_service.rb
index 992a7a7a1d..279550d6f4 100644
--- a/app/services/projects/upload_service.rb
+++ b/app/services/projects/upload_service.rb
@@ -13,9 +13,9 @@ module Projects
       filename = uploader.image? ? uploader.file.basename : uploader.file.filename
 
       {
-        'alt'       => filename,
-        'url'       => uploader.secure_url,
-        'is_image'  => uploader.image?
+        alt:      filename,
+        url:      uploader.secure_url,
+        is_image: uploader.image?
       }
     end
 
diff --git a/lib/gitlab/email_receiver.rb b/lib/gitlab/email_receiver.rb
index 18a06d2ee8..3dd8942a26 100644
--- a/lib/gitlab/email_receiver.rb
+++ b/lib/gitlab/email_receiver.rb
@@ -40,6 +40,10 @@ module Gitlab
 
       body = parse_body(message)
 
+      upload_attachments.each do |link|
+        body << "\n\n#{link}"
+      end
+
       note = Notes::CreateService.new(
         project,
         author,
@@ -152,5 +156,34 @@ module Gitlab
 
       lines[0..range_end].join.strip
     end
+
+    def upload_attachments
+      attachments = []
+
+      message.attachments.each do |attachment|
+        tmp = Tempfile.new("gitlab-email-attachment")
+        begin
+          File.open(tmp.path, "w+b") { |f| f.write attachment.body.decoded }
+
+          file = {
+            tempfile:     tmp,
+            filename:     attachment.filename,
+            content_type: attachment.content_type
+          }
+
+          link = ::Projects::UploadService.new(sent_notification.project, file).execute
+          if link
+            text = "[#{link[:alt]}](#{link[:url]})"
+            text.prepend("!") if link[:is_image]
+
+            attachments << text
+          end
+        ensure
+          tmp.close!
+        end
+      end
+
+      attachments
+    end
   end
 end

From 170aa3b43b5186f73b149eae6b80b96a9b1171b2 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 10:18:20 -0700
Subject: [PATCH 019/111] Update mail_room.

---
 Gemfile.lock | 2 +-
 Procfile     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 629d128b42..c4c327aa75 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/DouweM/mail_room.git
-  revision: b9deb6430ca13b2d44676827c45476d76966922c
+  revision: c17c74cdef55dcd962333545fdb4d6e496cd9050
   branch: sidekiq
   specs:
     mail_room (0.3.1)
diff --git a/Procfile b/Procfile
index 51154f150d..0b58566e2f 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,3 @@
 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 incoming_email -q common -q default
-mail_room: bundle exec mail_room -c config/mail_room.yml
+mail_room: bundle exec mail_room -q -c config/mail_room.yml

From 76dbafba86dda96b7ba2f93fc7e07eea3ca48302 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 11:10:21 -0700
Subject: [PATCH 020/111] Send a rejection email when the incoming email
 couldn't be processed.

---
 app/mailers/email_rejection_mailer.rb         | 35 ++++++++++++++++++
 .../rejection.html.haml                       |  5 +++
 .../rejection.text.haml                       |  4 ++
 app/workers/email_receiver_worker.rb          | 37 ++++++++++++++++---
 lib/gitlab/email_receiver.rb                  | 16 +++++---
 5 files changed, 85 insertions(+), 12 deletions(-)
 create mode 100644 app/mailers/email_rejection_mailer.rb
 create mode 100644 app/views/email_rejection_mailer/rejection.html.haml
 create mode 100644 app/views/email_rejection_mailer/rejection.text.haml

diff --git a/app/mailers/email_rejection_mailer.rb b/app/mailers/email_rejection_mailer.rb
new file mode 100644
index 0000000000..f29c4e052f
--- /dev/null
+++ b/app/mailers/email_rejection_mailer.rb
@@ -0,0 +1,35 @@
+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}>"
+
+  def rejection(reason, original_raw, can_retry = false)
+    @reason = reason
+    @original_message = Mail::Message.new(original_raw)
+
+    headers = {
+      to: @original_message.from,
+      subject: "[Rejected] #{@original_message.subject}"
+    }
+
+    headers['Message-ID'] = SecureRandom.hex
+    headers['In-Reply-To'] = @original_message.message_id
+    headers['References'] = @original_message.message_id
+
+    headers['Reply-To'] = @original_message.to.first if can_retry
+
+    mail(headers)
+  end
+
+  def current_user
+    nil
+  end
+
+  def can?
+    false
+  end
+end
diff --git a/app/views/email_rejection_mailer/rejection.html.haml b/app/views/email_rejection_mailer/rejection.html.haml
new file mode 100644
index 0000000000..de29d399d3
--- /dev/null
+++ b/app/views/email_rejection_mailer/rejection.html.haml
@@ -0,0 +1,5 @@
+%p
+  Unfortunately, your email message to GitLab could not be processed.
+
+%p
+  = gfm @reason
diff --git a/app/views/email_rejection_mailer/rejection.text.haml b/app/views/email_rejection_mailer/rejection.text.haml
new file mode 100644
index 0000000000..6693e6f90e
--- /dev/null
+++ b/app/views/email_rejection_mailer/rejection.text.haml
@@ -0,0 +1,4 @@
+Unfortunately, your email message to GitLab could not be processed.
+
+
+= @reason
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb
index 94e346b5a5..2cfd64cefa 100644
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
@@ -6,17 +6,42 @@ class EmailReceiverWorker
   def perform(raw)
     return unless Gitlab::ReplyByEmail.enabled?
 
-    # begin
-      Gitlab::EmailReceiver.new(raw).process
-    # rescue => e
-    #   handle_failure(raw, e)
-    # end
+    begin
+      Gitlab::EmailReceiver.new(raw).execute
+    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}")
+
+    can_retry = false
+    reason = nil
+
+    case e
+    when Gitlab::EmailReceiver::SentNotificationNotFound
+      reason = "We couldn't figure out what the email is in reply to. Please create your comment through the web interface."
+    when Gitlab::EmailReceiver::EmptyEmailError
+      can_retry = true
+      reason = "It appears that the email is blank. Make sure your reply is at the top of the email, we can't process inline replies."
+    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)
   end
 end
diff --git a/lib/gitlab/email_receiver.rb b/lib/gitlab/email_receiver.rb
index 3dd8942a26..a0b4ff87e0 100644
--- a/lib/gitlab/email_receiver.rb
+++ b/lib/gitlab/email_receiver.rb
@@ -5,7 +5,7 @@ module Gitlab
     class EmailUnparsableError < ProcessingError; end
     class EmptyEmailError < ProcessingError; end
     class UserNotFoundError < ProcessingError; end
-    class UserNotAuthorizedLevelError < ProcessingError; end
+    class UserNotAuthorizedError < ProcessingError; end
     class NoteableNotFoundError < ProcessingError; end
     class AutoGeneratedEmailError < ProcessingError; end
     class SentNotificationNotFound < ProcessingError; end
@@ -21,20 +21,20 @@ module Gitlab
       raise EmailUnparsableError, e
     end
 
-    def process
+    def execute
+      raise SentNotificationNotFound unless sent_notification
+
       raise EmptyEmailError if @raw.blank?
 
       raise AutoGeneratedEmailError if message.header.to_s =~ /auto-(generated|replied)/
 
-      raise SentNotificationNotFound unless sent_notification
-
       author = sent_notification.recipient
 
       raise UserNotFoundError unless author
 
       project = sent_notification.project
 
-      raise UserNotAuthorizedLevelError unless author.can?(:create_note, project)
+      raise UserNotAuthorizedError unless author.can?(:create_note, project)
 
       raise NoteableNotFoundError unless sent_notification.noteable
 
@@ -54,7 +54,11 @@ module Gitlab
       ).execute
 
       unless note.persisted?
-        raise InvalidNote, note.errors.full_messages.join("\n")
+        message = "The comment could not be created for the following reasons:"
+        note.errors.full_messages.each do |error|
+          message << "\n\n- #{error}"
+        end
+        raise InvalidNote, message
       end
     end
 

From 03b54f1f0324c4d424d66e4bf36e42c2a88fc26d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 11:35:13 -0700
Subject: [PATCH 021/111] Fix responding to commit notes

---
 app/mailers/notify.rb | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 8a386de9a3..b4c83f8c5f 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -49,11 +49,21 @@ class Notify < ActionMailer::Base
   def sent_notification!(noteable, recipient_id)
     return unless reply_key
 
+    noteable_id = nil
+    commit_id = nil
+    if noteable.is_a?(Commit)
+      commit_id = noteable.id
+    else
+      noteable_id = noteable.id
+    end
+
     SentNotification.create(
-      project: noteable.project,
-      noteable: noteable,
-      recipient_id: recipient_id,
-      reply_key: reply_key
+      project:        noteable.project,
+      noteable_type:  noteable.class.name,
+      noteable_id:    noteable_id,
+      commit_id:      commit_id,
+      recipient_id:   recipient_id,
+      reply_key:      reply_key
     )
   end
 

From a8a861ae2a122b310d1aca6f9f9b1d0601b8c49f Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 12:35:08 -0700
Subject: [PATCH 022/111] Add BaseMailer to house shared mailer functionality.

---
 app/mailers/base_mailer.rb            | 50 +++++++++++++++++++++++++++
 app/mailers/email_rejection_mailer.rb | 18 +---------
 app/mailers/notify.rb                 | 33 +-----------------
 3 files changed, 52 insertions(+), 49 deletions(-)
 create mode 100644 app/mailers/base_mailer.rb

diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb
new file mode 100644
index 0000000000..38b8a29684
--- /dev/null
+++ b/app/mailers/base_mailer.rb
@@ -0,0 +1,50 @@
+class EmailRejectionMailer < ActionMailer::Base
+  add_template_helper ApplicationHelper
+  add_template_helper GitlabMarkdownHelper
+
+  attr_accessor :current_user
+  helper_method :current_user, :can?
+
+  default from:     Proc.new { default_sender_address.format }
+  default reply_to: Proc.new { default_reply_to_address.format }
+
+  def self.delay
+    delay_for(2.seconds)
+  end
+
+  def rejection(reason, original_raw, can_retry = false)
+    @reason = reason
+    @original_message = Mail::Message.new(original_raw)
+
+    headers = {
+      to: @original_message.from,
+      subject: "[Rejected] #{@original_message.subject}"
+    }
+
+    headers['Message-ID'] = SecureRandom.hex
+    headers['In-Reply-To'] = @original_message.message_id
+    headers['References'] = @original_message.message_id
+
+    headers['Reply-To'] = @original_message.to.first if can_retry
+
+    mail(headers)
+  end
+
+  def can?
+    Ability.abilities.allowed?(user, action, subject)
+  end
+
+  private
+
+  def default_sender_address
+    address = Mail::Address.new(Gitlab.config.gitlab.email_from)
+    address.display_name = Gitlab.config.gitlab.email_display_name
+    address
+  end
+
+  def default_reply_to_address
+    address = Mail::Address.new(Gitlab.config.gitlab.email_reply_to)
+    address.display_name = Gitlab.config.gitlab.email_display_name
+    address
+  end
+end
diff --git a/app/mailers/email_rejection_mailer.rb b/app/mailers/email_rejection_mailer.rb
index f29c4e052f..89aceda82d 100644
--- a/app/mailers/email_rejection_mailer.rb
+++ b/app/mailers/email_rejection_mailer.rb
@@ -1,12 +1,4 @@
-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}>"
-
+class EmailRejectionMailer < BaseMailer
   def rejection(reason, original_raw, can_retry = false)
     @reason = reason
     @original_message = Mail::Message.new(original_raw)
@@ -24,12 +16,4 @@ class EmailRejectionMailer < ActionMailer::Base
 
     mail(headers)
   end
-
-  def current_user
-    nil
-  end
-
-  def can?
-    false
-  end
 end
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index b4c83f8c5f..1a2286f9d4 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -1,4 +1,4 @@
-class Notify < ActionMailer::Base
+class Notify < BaseMailer
   include ActionDispatch::Routing::PolymorphicRoutes
 
   include Emails::Issues
@@ -8,22 +8,9 @@ class Notify < ActionMailer::Base
   include Emails::Profile
   include Emails::Groups
 
-  add_template_helper ApplicationHelper
-  add_template_helper GitlabMarkdownHelper
   add_template_helper MergeRequestsHelper
   add_template_helper EmailsHelper
 
-  attr_accessor :current_user
-  helper_method :current_user, :can?
-
-  default from: Proc.new { default_sender_address.format }
-  default reply_to: Proc.new { default_reply_to_address.format }
-
-  # Just send email with 2 seconds delay
-  def self.delay
-    delay_for(2.seconds)
-  end
-
   def test_email(recipient_email, subject, body)
     mail(to: recipient_email,
          subject: subject,
@@ -69,20 +56,6 @@ class Notify < ActionMailer::Base
 
   private
 
-  # The default email address to send emails from
-  def default_sender_address
-    address = Mail::Address.new(Gitlab.config.gitlab.email_from)
-    address.display_name = Gitlab.config.gitlab.email_display_name
-    address
-  end
-
-  # The default email address to send emails from
-  def default_reply_to_address
-    address = Mail::Address.new(Gitlab.config.gitlab.email_reply_to)
-    address.display_name = Gitlab.config.gitlab.email_display_name
-    address
-  end
-
   def can_send_from_user_email?(sender)
     sender_domain = sender.email.split("@").last
     self.class.allowed_email_domains.include?(sender_domain)
@@ -197,10 +170,6 @@ class Notify < ActionMailer::Base
     mail_thread(model, headers)
   end
 
-  def can?
-    Ability.abilities.allowed?(user, action, subject)
-  end
-
   def reply_key
     @reply_key ||= Gitlab::ReplyByEmail.reply_key
   end

From 992dbbd9fe619ab3002f7c0c552657da8269df49 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 12:35:23 -0700
Subject: [PATCH 023/111] Move `sent_notification!` out of Notify.

---
 app/mailers/emails/issues.rb         |  8 ++++----
 app/mailers/emails/merge_requests.rb | 10 +++++-----
 app/mailers/emails/notes.rb          |  6 +++---
 app/mailers/notify.rb                | 21 ---------------------
 app/models/sent_notification.rb      | 27 +++++++++++++++++++++++++--
 5 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index c8b7775c32..2c035fbb70 100644
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -9,7 +9,7 @@ module Emails
                       to: recipient(recipient_id),
                       subject: subject("#{@issue.title} (##{@issue.iid})"))
 
-      sent_notification!(@issue, recipient_id)
+      SentNotification.record(@issue, recipient_id, reply_key)
     end
 
     def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id, updated_by_user_id)
@@ -22,7 +22,7 @@ module Emails
                          to: recipient(recipient_id),
                          subject: subject("#{@issue.title} (##{@issue.iid})"))
 
-      sent_notification!(@issue, recipient_id)
+      SentNotification.record(@issue, recipient_id, reply_key)
     end
 
     def closed_issue_email(recipient_id, issue_id, updated_by_user_id)
@@ -35,7 +35,7 @@ module Emails
                          to: recipient(recipient_id),
                          subject: subject("#{@issue.title} (##{@issue.iid})"))
 
-      sent_notification!(@issue, recipient_id)
+      SentNotification.record(@issue, recipient_id, reply_key)
     end
 
     def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
@@ -49,7 +49,7 @@ module Emails
                          to: recipient(recipient_id),
                          subject: subject("#{@issue.title} (##{@issue.iid})"))
 
-      sent_notification!(@issue, recipient_id)
+      SentNotification.record(@issue, recipient_id, reply_key)
     end
   end
 end
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 76902b58f3..7923fb770d 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -11,7 +11,7 @@ module Emails
                       to: recipient(recipient_id),
                       subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
 
-      sent_notification!(@merge_request, recipient_id)
+      SentNotification.record(@merge_request, recipient_id, reply_key)
     end
 
     def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id, updated_by_user_id)
@@ -26,7 +26,7 @@ module Emails
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
 
-      sent_notification!(@merge_request, recipient_id)
+      SentNotification.record(@merge_request, recipient_id, reply_key)
     end
 
     def closed_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
@@ -41,7 +41,7 @@ module Emails
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
 
-      sent_notification!(@merge_request, recipient_id)
+      SentNotification.record(@merge_request, recipient_id, reply_key)
     end
 
     def merged_merge_request_email(recipient_id, merge_request_id, updated_by_user_id)
@@ -55,7 +55,7 @@ module Emails
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
 
-      sent_notification!(@merge_request, recipient_id)
+      SentNotification.record(@merge_request, recipient_id, reply_key)
     end
 
     def merge_request_status_email(recipient_id, merge_request_id, status, updated_by_user_id)
@@ -71,7 +71,7 @@ module Emails
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
 
-      sent_notification!(@merge_request, recipient_id)
+      SentNotification.record(@merge_request, recipient_id, reply_key)
     end
   end
 end
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index 2612074a5f..63d4aca61a 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -12,7 +12,7 @@ module Emails
                          to: recipient(recipient_id),
                          subject: subject("#{@commit.title} (#{@commit.short_id})"))
 
-      sent_notification!(@commit, recipient_id)
+      SentNotification.record(@commit, recipient_id, reply_key)
     end
 
     def note_issue_email(recipient_id, note_id)
@@ -27,7 +27,7 @@ module Emails
                          to: recipient(recipient_id),
                          subject: subject("#{@issue.title} (##{@issue.iid})"))
 
-      sent_notification!(@issue, recipient_id)
+      SentNotification.record(@issue, recipient_id, reply_key)
     end
 
     def note_merge_request_email(recipient_id, note_id)
@@ -43,7 +43,7 @@ module Emails
                          to: recipient(recipient_id),
                          subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
 
-      sent_notification!(@merge_request, recipient_id)
+      SentNotification.record(@merge_request, recipient_id, reply_key)
     end
   end
 end
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 1a2286f9d4..5717c89e61 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -33,27 +33,6 @@ class Notify < BaseMailer
     allowed_domains
   end
 
-  def sent_notification!(noteable, recipient_id)
-    return unless reply_key
-
-    noteable_id = nil
-    commit_id = nil
-    if noteable.is_a?(Commit)
-      commit_id = noteable.id
-    else
-      noteable_id = noteable.id
-    end
-
-    SentNotification.create(
-      project:        noteable.project,
-      noteable_type:  noteable.class.name,
-      noteable_id:    noteable_id,
-      commit_id:      commit_id,
-      recipient_id:   recipient_id,
-      reply_key:      reply_key
-    )
-  end
-
   private
 
   def can_send_from_user_email?(sender)
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index 23a1b19ea7..460ca40be3 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -9,8 +9,31 @@ class SentNotification < ActiveRecord::Base
   validates :noteable_id, presence: true, unless: :for_commit?
   validates :commit_id, presence: true, if: :for_commit?
 
-  def self.for(reply_key)
-    find_by(reply_key: reply_key)
+  class << self
+    def for(reply_key)
+      find_by(reply_key: reply_key)
+    end
+
+    def record(noteable, recipient_id, reply_key)
+      return unless reply_key
+
+      noteable_id = nil
+      commit_id = nil
+      if noteable.is_a?(Commit)
+        commit_id = noteable.id
+      else
+        noteable_id = noteable.id
+      end
+
+      create(
+        project:        noteable.project,
+        noteable_type:  noteable.class.name,
+        noteable_id:    noteable_id,
+        commit_id:      commit_id,
+        recipient_id:   recipient_id,
+        reply_key:      reply_key
+      )
+    end
   end
 
   def for_commit?

From ed6122d7ea1d7ffa1e89078cedf416c6ae2e0383 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 12:37:34 -0700
Subject: [PATCH 024/111] Markdown, not GFM.

---
 app/views/email_rejection_mailer/rejection.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/email_rejection_mailer/rejection.html.haml b/app/views/email_rejection_mailer/rejection.html.haml
index de29d399d3..84b040d8cb 100644
--- a/app/views/email_rejection_mailer/rejection.html.haml
+++ b/app/views/email_rejection_mailer/rejection.html.haml
@@ -2,4 +2,4 @@
   Unfortunately, your email message to GitLab could not be processed.
 
 %p
-  = gfm @reason
+  = markdown @reason

From 4e33127b3a72d507e093fd5cc520089c88640892 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 12:38:08 -0700
Subject: [PATCH 025/111] We'll get the <p> for free.

---
 app/views/email_rejection_mailer/rejection.html.haml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/email_rejection_mailer/rejection.html.haml b/app/views/email_rejection_mailer/rejection.html.haml
index 84b040d8cb..7f7d841fe2 100644
--- a/app/views/email_rejection_mailer/rejection.html.haml
+++ b/app/views/email_rejection_mailer/rejection.html.haml
@@ -1,5 +1,4 @@
 %p
   Unfortunately, your email message to GitLab could not be processed.
 
-%p
-  = markdown @reason
+= markdown @reason

From 0bc94198fc64f7a0f9f7ee7d33dcae9aa50d1e3f Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 12:51:42 -0700
Subject: [PATCH 026/111] Fix BaseMailer.

---
 app/mailers/base_mailer.rb | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb
index 38b8a29684..8299a4140d 100644
--- a/app/mailers/base_mailer.rb
+++ b/app/mailers/base_mailer.rb
@@ -1,4 +1,4 @@
-class EmailRejectionMailer < ActionMailer::Base
+class BaseMailer < ActionMailer::Base
   add_template_helper ApplicationHelper
   add_template_helper GitlabMarkdownHelper
 
@@ -12,24 +12,6 @@ class EmailRejectionMailer < ActionMailer::Base
     delay_for(2.seconds)
   end
 
-  def rejection(reason, original_raw, can_retry = false)
-    @reason = reason
-    @original_message = Mail::Message.new(original_raw)
-
-    headers = {
-      to: @original_message.from,
-      subject: "[Rejected] #{@original_message.subject}"
-    }
-
-    headers['Message-ID'] = SecureRandom.hex
-    headers['In-Reply-To'] = @original_message.message_id
-    headers['References'] = @original_message.message_id
-
-    headers['Reply-To'] = @original_message.to.first if can_retry
-
-    mail(headers)
-  end
-
   def can?
     Ability.abilities.allowed?(user, action, subject)
   end

From 089aa2de2badcb4d6caf2d2001ad17db42d08de8 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 13:57:27 -0700
Subject: [PATCH 027/111] Add Reply by email feature to admin dashboard.

---
 app/views/admin/dashboard/index.html.haml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 3732ff847b..54191aadda 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -55,6 +55,10 @@
         OmniAuth
         %span.light.pull-right
           = boolean_to_icon Gitlab.config.omniauth.enabled
+      %p
+        Reply by email
+        %span.light.pull-right
+          = boolean_to_icon Gitlab::ReplyByEmail.enabled?
     .col-md-4
       %h4
         Components

From f3b57ce677f016fbbbcc6426e33b2b61c34c068f Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 13:58:07 -0700
Subject: [PATCH 028/111] Update init scripts.

---
 Procfile                                  |  2 +-
 bin/background_jobs                       |  2 +-
 bin/mail_room                             | 51 ++++++++++++
 lib/support/init.d/gitlab                 | 95 ++++++++++++++++++-----
 lib/support/init.d/gitlab.default.example |  9 +++
 5 files changed, 137 insertions(+), 22 deletions(-)
 create mode 100755 bin/mail_room

diff --git a/Procfile b/Procfile
index 0b58566e2f..18fd9eb3d9 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,3 @@
 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 incoming_email -q common -q default
-mail_room: bundle exec mail_room -q -c config/mail_room.yml
+# mail_room: bundle exec mail_room -q -c config/mail_room.yml
diff --git a/bin/background_jobs b/bin/background_jobs
index a041a4b043..a4895cf658 100755
--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -37,7 +37,7 @@ start_no_deamonize()
 
 start_sidekiq()
 {
-  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 -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1
+  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 -e $RAILS_ENV -P $sidekiq_pidfile $@ >> $sidekiq_logfile 2>&1
 }
 
 load_ok()
diff --git a/bin/mail_room b/bin/mail_room
new file mode 100755
index 0000000000..0fabfa778b
--- /dev/null
+++ b/bin/mail_room
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+cd $(dirname $0)/..
+app_root=$(pwd)
+
+mail_room_pidfile="$app_root/tmp/pids/mail_room.pid"
+mail_room_config="$app_root/config/mail_room.yml"
+
+get_mail_room_pid()
+{
+  local pid=$(cat $mail_room_pidfile)
+  if [ -z "$pid" ] ; then
+    echo "Could not find a PID in $mail_room_pidfile"
+    exit 1
+  fi
+  mail_room_pid=$pid
+}
+
+start()
+{
+  bundle exec mail_room -q -c $mail_room_config
+  PID=$!
+  echo $PID > $mail_room_pidfile
+}
+
+stop()
+{
+  get_mail_room_pid
+  kill -QUIT $mail_room_pid
+}
+
+reload()
+{
+  get_mail_room_pid
+  kill -USR2 $mail_room_pid
+}
+
+case "$1" in
+  start)
+    start
+    ;;
+  stop)
+    stop
+    ;;
+  reload)
+    reload
+    ;;
+  *)
+    echo "Usage: $0 {start|stop|reload}"
+    ;;
+esac
diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index a3455728a9..57478434e0 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -35,6 +35,8 @@ pid_path="$app_root/tmp/pids"
 socket_path="$app_root/tmp/sockets"
 web_server_pid_path="$pid_path/unicorn.pid"
 sidekiq_pid_path="$pid_path/sidekiq.pid"
+mail_room_enabled=false
+mail_room_pid_path="$pid_path/mail_room.pid"
 shell_path="/bin/bash"
 
 # Read configuration variable file if it is present
@@ -70,13 +72,20 @@ check_pids(){
   else
     spid=0
   fi
+  if [ "$mail_room_enabled" = true ]; then
+    if [ -f "$mail_room_pid_path" ]; then
+      mpid=$(cat "$mail_room_pid_path")
+    else
+      mpid=0
+    fi
+  fi
 }
 
 ## Called when we have started the two processes and are waiting for their pid files.
 wait_for_pids(){
   # We are sleeping a bit here mostly because sidekiq is slow at writing it's pid
   i=0;
-  while [ ! -f $web_server_pid_path -o ! -f $sidekiq_pid_path ]; do
+  while [ ! -f $web_server_pid_path -o ! -f $sidekiq_pid_path -o [ "$mail_room_enabled" = true && ! -f $mail_room_pid_path ] ]; do
     sleep 0.1;
     i=$((i+1))
     if [ $((i%10)) = 0 ]; then
@@ -111,7 +120,13 @@ check_status(){
   else
     sidekiq_status="-1"
   fi
-  if [ $web_status = 0 -a $sidekiq_status = 0 ]; then
+  if [ "$mail_room_enabled" = true && $mpid -ne 0 ]; then
+    kill -0 "$mpid" 2>/dev/null
+    mail_room_status="$?"
+  else
+    mail_room_status="-1"
+  fi
+  if [ $web_status = 0 -a $sidekiq_status = 0 -a [ "$mail_room_enabled" != true || $mail_room_status = 0 ] ]; then
     gitlab_status=0
   else
     # http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
@@ -139,12 +154,19 @@ check_stale_pids(){
       exit 1
     fi
   fi
+  if [ "$mail_room_enabled" = true && "$mpid" != "0" -a "$mail_room_status" != "0" ]; then
+    echo "Removing stale MailRoom job dispatcher pid. This is most likely caused by MailRoom crashing the last time it ran."
+    if ! rm "$mail_room_pid_path"; then
+      echo "Unable to remove stale pid, exiting"
+      exit 1
+    fi
+  fi
 }
 
 ## If no parts of the service is running, bail out.
 exit_if_not_running(){
   check_stale_pids
-  if [ "$web_status" != "0" -a "$sidekiq_status" != "0" ]; then
+  if [ "$web_status" != "0" -a "$sidekiq_status" != "0" -a [ "$mail_room_enabled" = true && "$mail_room_status" != "0" ] ]; then
     echo "GitLab is not running."
     exit
   fi
@@ -154,13 +176,15 @@ exit_if_not_running(){
 start_gitlab() {
   check_stale_pids
 
-  if [ "$web_status" != "0" -a "$sidekiq_status" != "0" ]; then
-    echo -n "Starting both the GitLab Unicorn and Sidekiq"
-  elif [ "$web_status" != "0" ]; then
+  if [ "$web_status" != "0" ]; then
     echo -n "Starting GitLab Unicorn"
-  elif [ "$sidekiq_status" != "0" ]; then
+  fi
+  if [ "$sidekiq_status" != "0" ]; then
     echo -n "Starting GitLab Sidekiq"
   fi
+  if [ "$mail_room_enabled" = true && "$mail_room_status" != "0" ]; then
+    echo -n "Starting GitLab MailRoom"
+  fi
 
   # Then check if the service is running. If it is: don't start again.
   if [ "$web_status" = "0" ]; then
@@ -179,22 +203,33 @@ start_gitlab() {
     RAILS_ENV=$RAILS_ENV bin/background_jobs start &
   fi
 
+  if [ "$mail_room_enabled" = true ]; then
+    # If MailRoom is already running, don't start it again.
+    if [ "$mail_room_status" = "0" ]; then
+      echo "The MailRoom email processor is already running with pid $spid, not restarting"
+    else
+      RAILS_ENV=$RAILS_ENV bin/mail_room start &
+    fi
+  fi
+
   # Wait for the pids to be planted
   wait_for_pids
   # Finally check the status to tell wether or not GitLab is running
   print_status
 }
 
-## Asks the Unicorn and the Sidekiq if they would be so kind as to stop, if not kills them.
+## Asks Unicorn, Sidekiq and MailRoom if they would be so kind as to stop, if not kills them.
 stop_gitlab() {
   exit_if_not_running
 
-  if [ "$web_status" = "0" -a "$sidekiq_status" = "0" ]; then
-    echo -n "Shutting down both Unicorn and Sidekiq"
-  elif [ "$web_status" = "0" ]; then
-    echo -n "Shutting down Unicorn"
-  elif [ "$sidekiq_status" = "0" ]; then
-    echo -n "Shutting down Sidekiq"
+  if [ "$web_status" = "0" ]; then
+    echo -n "Shutting down GitLab Unicorn"
+  fi
+  if [ "$sidekiq_status" = "0" ]; then
+    echo -n "Shutting down GitLab Sidekiq"
+  fi
+  if [ "$mail_room_enabled" = true && "$mail_room_status" = "0" ]; then
+    echo -n "Shutting down GitLab MailRoom"
   fi
 
   # If the Unicorn web server is running, tell it to stop;
@@ -205,13 +240,17 @@ stop_gitlab() {
   if [ "$sidekiq_status" = "0" ]; then
     RAILS_ENV=$RAILS_ENV bin/background_jobs stop
   fi
+  # And do the same thing for the MailRoom.
+  if [ "$mail_room_enabled" = true && "$mail_room_status" = "0" ]; then
+    RAILS_ENV=$RAILS_ENV bin/mail_room stop
+  fi
 
   # If something needs to be stopped, lets wait for it to stop. Never use SIGKILL in a script.
-  while [ "$web_status" = "0" -o "$sidekiq_status" = "0" ]; do
+  while [ "$web_status" = "0" -o "$sidekiq_status" = "0" -o [ "$mail_room_enabled" = true && "$mail_room_status" = "0" ] ]; do
     sleep 1
     check_status
     printf "."
-    if [ "$web_status" != "0" -a "$sidekiq_status" != "0" ]; then
+    if [ "$web_status" != "0" -a "$sidekiq_status" != "0" -a [ "$mail_room_enabled" != true || "$mail_room_status" != "0" ] ]; then
       printf "\n"
       break
     fi
@@ -220,7 +259,10 @@ stop_gitlab() {
   sleep 1
   # Cleaning up unused pids
   rm "$web_server_pid_path" 2>/dev/null
-  # rm "$sidekiq_pid_path" # Sidekiq seems to be cleaning up it's own pid.
+  # rm "$sidekiq_pid_path" 2>/dev/null # Sidekiq seems to be cleaning up it's own pid.
+  if [ "$mail_room_enabled" = true ]; then
+    rm "$mail_room_pid_path" 2>/dev/null
+  fi
 
   print_status
 }
@@ -228,7 +270,7 @@ stop_gitlab() {
 ## Prints the status of GitLab and it's components.
 print_status() {
   check_status
-  if [ "$web_status" != "0" -a "$sidekiq_status" != "0" ]; then
+  if [ "$web_status" != "0" -a "$sidekiq_status" != "0" -a [ "$mail_room_enabled" != true || "$mail_room_status" != "0" ] ]; then
     echo "GitLab is not running."
     return
   fi
@@ -242,7 +284,14 @@ print_status() {
   else
       printf "The GitLab Sidekiq job dispatcher is \033[31mnot running\033[0m.\n"
   fi
-  if [ "$web_status" = "0" -a "$sidekiq_status" = "0" ]; then
+  if [ "$mail_room_enabled" = true ]; then
+    if [ "$mail_room_status" = "0" ]; then
+        echo "The GitLab MailRoom email processor with pid $spid is running."
+    else
+        printf "The GitLab MailRoom email processor is \033[31mnot running\033[0m.\n"
+    fi
+    end
+  if [ "$web_status" = "0" -a "$sidekiq_status" = "0" -a [ "$mail_room_enabled" != true || "$mail_room_status" = "0" ] ]; then
     printf "GitLab and all its components are \033[32mup and running\033[0m.\n"
   fi
 }
@@ -257,9 +306,15 @@ reload_gitlab(){
   printf "Reloading GitLab Unicorn configuration... "
   RAILS_ENV=$RAILS_ENV bin/web reload
   echo "Done."
+
   echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..."
   RAILS_ENV=$RAILS_ENV bin/background_jobs restart
 
+  if [ "$mail_room_enabled" != true ]; then
+    echo "Restarting GitLab MailRoom since it isn't capable of reloading its config..."
+    RAILS_ENV=$RAILS_ENV bin/mail_room restart
+  fi
+
   wait_for_pids
   print_status
 }
@@ -267,7 +322,7 @@ reload_gitlab(){
 ## Restarts Sidekiq and Unicorn.
 restart_gitlab(){
   check_status
-  if [ "$web_status" = "0" -o "$sidekiq_status" = "0" ]; then
+  if [ "$web_status" = "0" -o "$sidekiq_status" = "0" -o [ "$mail_room_enabled" = true && "$mail_room_status" = "0" ] ]; then
     stop_gitlab
   fi
   start_gitlab
diff --git a/lib/support/init.d/gitlab.default.example b/lib/support/init.d/gitlab.default.example
index cf7f4198cb..fd70cb7cc7 100755
--- a/lib/support/init.d/gitlab.default.example
+++ b/lib/support/init.d/gitlab.default.example
@@ -30,6 +30,15 @@ web_server_pid_path="$pid_path/unicorn.pid"
 # The default is "$pid_path/sidekiq.pid"
 sidekiq_pid_path="$pid_path/sidekiq.pid"
 
+# mail_room_enabled specifies whether mail_room, which is used to process incoming email, is enabled.
+# This is required for the Reply by email feature.
+# The default is "false"
+mail_room_enabled=false
+
+# mail_room_pid_path defines the path in which to create the pid file for mail_room
+# The default is "$pid_path/mail_room.pid"
+mail_room_pid_path="$pid_path/mail_room.pid"
+
 # shell_path defines the path of shell for "$app_user" in case you are using
 # shell other than "bash"
 # The default is "/bin/bash"

From 34026c97b4d55026c414e839af926af3ffeb31cc Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 13:58:14 -0700
Subject: [PATCH 029/111] Add documentation.

---
 config/gitlab.yml.example    |  2 +
 config/mail_room.yml.example | 37 ++++++++++------
 doc/README.md                |  1 +
 doc/reply_by_email/README.md | 85 ++++++++++++++++++++++++++++++++++++
 4 files changed, 112 insertions(+), 13 deletions(-)
 create mode 100644 doc/reply_by_email/README.md

diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index e78429b29a..c7b60a1d4b 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -95,6 +95,8 @@ production: &base
     # repository_downloads_path: tmp/repositories
 
   ## Reply by email
+  # Allow users to comment on issues and merge requests by replying to notification emails.
+  # For documentation on how to set this up, see http://doc.gitlab.com/ce/reply_by_email/README.md
   reply_by_email:
     enabled: false
     address: "replies+%{reply_key}@gitlab.example.com"
diff --git a/config/mail_room.yml.example b/config/mail_room.yml.example
index a7a6a25362..28366eb739 100644
--- a/config/mail_room.yml.example
+++ b/config/mail_room.yml.example
@@ -1,14 +1,25 @@
 :mailboxes:
-  # -
-  #   :host: "imap.gmail.com"
-  #   :port: 993
-  #   :ssl: true
-  #   :email: "replies@gitlab.example.com"
-  #   :password: "password"
-  #   :name: "inbox"
-  #   :delivery_method: sidekiq
-  #   :delivery_options:
-  #     :redis_url: redis://localhost:6379
-  #     :namespace: resque:gitlab
-  #     :queue: incoming_email
-  #     :worker: EmailReceiverWorker
+  -
+    # # IMAP server host
+    # :host: "imap.gmail.com"
+    # # IMAP server port
+    # :port: 993
+    # # Whether the IMAP server uses SSL
+    # :ssl: true
+    # # Email account username. Usually the full email address.
+    # :email: "replies@gitlab.example.com"
+    # # Email account password
+    # :password: "password"
+    # # The name of the mailbox where incoming mail will end up. Usually "inbox".
+    # :name: "inbox"
+    # # Always "sidekiq".
+    # :delivery_method: sidekiq
+    # :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
diff --git a/doc/README.md b/doc/README.md
index 0524fda3ed..337c4e6a62 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -29,6 +29,7 @@
 - [System hooks](system_hooks/system_hooks.md) Notifications when users, projects and keys are changed.
 - [Update](update/README.md) Update guides to upgrade your installation.
 - [Welcome message](customization/welcome_message.md) Add a custom welcome message to the sign-in page.
+- [Reply by email](reply_by_email/README.md) Allow users to comment on issues and merge requests by replying to notification emails.
 
 ## Contributor documentation
 
diff --git a/doc/reply_by_email/README.md b/doc/reply_by_email/README.md
new file mode 100644
index 0000000000..fffc120d2b
--- /dev/null
+++ b/doc/reply_by_email/README.md
@@ -0,0 +1,85 @@
+# Reply by email
+
+GitLab can be set up to allow users to comment on issues and merge requests by replying to notification emails.
+
+In order to do this, you need access to an IMAP-enabled email account, with a provider or server that supports [email sub-addressing](https://en.wikipedia.org/wiki/Email_address#Sub-addressing). Sub-addressing is a feature where any email to `user+some_arbitrary_tag@example.com` will end up in the mailbox for `user@example.com`, and is supported by providers such as Gmail, Yahoo! Mail, Outlook.com and iCloud, as well as the [Postfix](http://www.postfix.org/) mail server which you can run on-premises.
+
+## Set it up
+
+In this example, we'll use the Gmail address `gitlab-replies@gmail.com`. If you're actually using Gmail with Reply by email, make sure you have [IMAP access enabled](https://support.google.com/mail/troubleshooter/1668960?hl=en#ts=1665018) and [allow less secure apps to access the account](https://support.google.com/accounts/answer/6010255).
+
+### Installations from source
+
+
+1. Find the `reply_by_email` section in `config/gitlab.yml`, enable the feature and enter the email address including a placeholder for the `reply_key`:
+    
+    ```yaml
+    reply_by_email:
+      enabled: true
+      address: "gitlab-replies+%{reply_key}@gmail.com"
+    ```
+
+    As mentioned, the part after `+` is ignored, and this will end up in the mailbox for `gitlab-replies@gmail.com`.
+
+2. Find `config/mail_room.yml.example` and copy it to `config/mail_room.yml`:
+    
+    ```sh
+    cp config/mail_room.yml.example config/mail_room.yml
+    ```
+
+3. Uncomment the configuration options in `config/mail_room.yml` and fill in the details for your specific IMAP server and email account:
+
+    ```yaml
+    :mailboxes:
+      -
+        # IMAP server host
+        :host: "imap.gmail.com"
+        # IMAP server port
+        :port: 993
+        # Whether the IMAP server uses SSL
+        :ssl: true
+        # Email account username. Usually the full email address.
+        :email: "gitlab-replies@gmail.com"
+        # Email account password
+        :password: "[REDACTED]"
+        # The name of the mailbox where incoming mail will end up. Usually "inbox".
+        :name: "inbox"
+        # Always "sidekiq".
+        :delivery_method: sidekiq
+        :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
+    ```
+
+5. Edit `/etc/default/gitlab` to enable `mail_room`:
+
+    ```sh
+    mail_room_enabled=true
+    ```
+
+6. Restart GitLab
+    
+    ```sh
+    sudo service gitlab restart
+    ```
+
+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`.
+
+### Omnibus package installations
+
+TODO

From c50e5e68c7d4863c26700ced7ea31a18ddfc1c66 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 14:27:47 -0700
Subject: [PATCH 030/111] Fix bin/mail_room.

---
 bin/mail_room | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/bin/mail_room b/bin/mail_room
index 0fabfa778b..f4f1a170c0 100755
--- a/bin/mail_room
+++ b/bin/mail_room
@@ -4,6 +4,7 @@ cd $(dirname $0)/..
 app_root=$(pwd)
 
 mail_room_pidfile="$app_root/tmp/pids/mail_room.pid"
+mail_room_logfile="$app_root/log/mail_room.log"
 mail_room_config="$app_root/config/mail_room.yml"
 
 get_mail_room_pid()
@@ -18,7 +19,7 @@ get_mail_room_pid()
 
 start()
 {
-  bundle exec mail_room -q -c $mail_room_config
+  bundle exec mail_room -q -c $mail_room_config >> $mail_room_logfile 2>&1 &
   PID=$!
   echo $PID > $mail_room_pidfile
 }
@@ -26,13 +27,13 @@ start()
 stop()
 {
   get_mail_room_pid
-  kill -QUIT $mail_room_pid
+  kill -TERM $mail_room_pid
 }
 
-reload()
+restart()
 {
-  get_mail_room_pid
-  kill -USR2 $mail_room_pid
+  stop
+  start
 }
 
 case "$1" in
@@ -42,10 +43,10 @@ case "$1" in
   stop)
     stop
     ;;
-  reload)
-    reload
+  restart)
+    restart
     ;;
   *)
-    echo "Usage: $0 {start|stop|reload}"
+    echo "Usage: $0 {start|stop|restart}"
     ;;
 esac

From 1202875dff5a120c27842b80994b19a682d080f5 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 14:54:30 -0700
Subject: [PATCH 031/111] Fix lib/support/init.d/gitlab.

---
 lib/support/init.d/gitlab | 42 ++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index 57478434e0..3f13dfbfdf 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -85,7 +85,7 @@ check_pids(){
 wait_for_pids(){
   # We are sleeping a bit here mostly because sidekiq is slow at writing it's pid
   i=0;
-  while [ ! -f $web_server_pid_path -o ! -f $sidekiq_pid_path -o [ "$mail_room_enabled" = true && ! -f $mail_room_pid_path ] ]; do
+  while [ ! -f $web_server_pid_path ] || [ ! -f $sidekiq_pid_path ] || { [ "$mail_room_enabled" = true ] && [ ! -f $mail_room_pid_path ] }; do
     sleep 0.1;
     i=$((i+1))
     if [ $((i%10)) = 0 ]; then
@@ -120,13 +120,15 @@ check_status(){
   else
     sidekiq_status="-1"
   fi
-  if [ "$mail_room_enabled" = true && $mpid -ne 0 ]; then
-    kill -0 "$mpid" 2>/dev/null
-    mail_room_status="$?"
-  else
-    mail_room_status="-1"
+  if [ "$mail_room_enabled" = true ]; then
+    if [ $mpid -ne 0 ]; then
+      kill -0 "$mpid" 2>/dev/null
+      mail_room_status="$?"
+    else
+      mail_room_status="-1"
+    fi
   fi
-  if [ $web_status = 0 -a $sidekiq_status = 0 -a [ "$mail_room_enabled" != true || $mail_room_status = 0 ] ]; then
+  if [ $web_status = 0 ] && [ $sidekiq_status = 0 ] && { [ "$mail_room_enabled" != true ] || [ $mail_room_status = 0 ] }; then
     gitlab_status=0
   else
     # http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
@@ -140,21 +142,21 @@ check_stale_pids(){
   check_status
   # If there is a pid it is something else than 0, the service is running if
   # *_status is == 0.
-  if [ "$wpid" != "0" -a "$web_status" != "0" ]; then
+  if [ "$wpid" != "0" ] && [ "$web_status" != "0" ]; then
     echo "Removing stale Unicorn web server pid. This is most likely caused by the web server crashing the last time it ran."
     if ! rm "$web_server_pid_path"; then
       echo "Unable to remove stale pid, exiting."
       exit 1
     fi
   fi
-  if [ "$spid" != "0" -a "$sidekiq_status" != "0" ]; then
+  if [ "$spid" != "0" ] && [ "$sidekiq_status" != "0" ]; then
     echo "Removing stale Sidekiq job dispatcher pid. This is most likely caused by Sidekiq crashing the last time it ran."
     if ! rm "$sidekiq_pid_path"; then
       echo "Unable to remove stale pid, exiting"
       exit 1
     fi
   fi
-  if [ "$mail_room_enabled" = true && "$mpid" != "0" -a "$mail_room_status" != "0" ]; then
+  if [ "$mail_room_enabled" = true ] && [ "$mpid" != "0" ] && [ "$mail_room_status" != "0" ]; then
     echo "Removing stale MailRoom job dispatcher pid. This is most likely caused by MailRoom crashing the last time it ran."
     if ! rm "$mail_room_pid_path"; then
       echo "Unable to remove stale pid, exiting"
@@ -166,7 +168,7 @@ check_stale_pids(){
 ## If no parts of the service is running, bail out.
 exit_if_not_running(){
   check_stale_pids
-  if [ "$web_status" != "0" -a "$sidekiq_status" != "0" -a [ "$mail_room_enabled" = true && "$mail_room_status" != "0" ] ]; then
+  if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ] }; then
     echo "GitLab is not running."
     exit
   fi
@@ -182,7 +184,7 @@ start_gitlab() {
   if [ "$sidekiq_status" != "0" ]; then
     echo -n "Starting GitLab Sidekiq"
   fi
-  if [ "$mail_room_enabled" = true && "$mail_room_status" != "0" ]; then
+  if [ "$mail_room_enabled" = true ] && [ "$mail_room_status" != "0" ]; then
     echo -n "Starting GitLab MailRoom"
   fi
 
@@ -206,7 +208,7 @@ start_gitlab() {
   if [ "$mail_room_enabled" = true ]; then
     # If MailRoom is already running, don't start it again.
     if [ "$mail_room_status" = "0" ]; then
-      echo "The MailRoom email processor is already running with pid $spid, not restarting"
+      echo "The MailRoom email processor is already running with pid $mpid, not restarting"
     else
       RAILS_ENV=$RAILS_ENV bin/mail_room start &
     fi
@@ -228,7 +230,7 @@ stop_gitlab() {
   if [ "$sidekiq_status" = "0" ]; then
     echo -n "Shutting down GitLab Sidekiq"
   fi
-  if [ "$mail_room_enabled" = true && "$mail_room_status" = "0" ]; then
+  if [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; then
     echo -n "Shutting down GitLab MailRoom"
   fi
 
@@ -241,16 +243,16 @@ stop_gitlab() {
     RAILS_ENV=$RAILS_ENV bin/background_jobs stop
   fi
   # And do the same thing for the MailRoom.
-  if [ "$mail_room_enabled" = true && "$mail_room_status" = "0" ]; then
+  if [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; then
     RAILS_ENV=$RAILS_ENV bin/mail_room stop
   fi
 
   # If something needs to be stopped, lets wait for it to stop. Never use SIGKILL in a script.
-  while [ "$web_status" = "0" -o "$sidekiq_status" = "0" -o [ "$mail_room_enabled" = true && "$mail_room_status" = "0" ] ]; do
+  while [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ] }; do
     sleep 1
     check_status
     printf "."
-    if [ "$web_status" != "0" -a "$sidekiq_status" != "0" -a [ "$mail_room_enabled" != true || "$mail_room_status" != "0" ] ]; then
+    if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ] }; then
       printf "\n"
       break
     fi
@@ -270,7 +272,7 @@ stop_gitlab() {
 ## Prints the status of GitLab and it's components.
 print_status() {
   check_status
-  if [ "$web_status" != "0" -a "$sidekiq_status" != "0" -a [ "$mail_room_enabled" != true || "$mail_room_status" != "0" ] ]; then
+  if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ] }; then
     echo "GitLab is not running."
     return
   fi
@@ -291,7 +293,7 @@ print_status() {
         printf "The GitLab MailRoom email processor is \033[31mnot running\033[0m.\n"
     fi
     end
-  if [ "$web_status" = "0" -a "$sidekiq_status" = "0" -a [ "$mail_room_enabled" != true || "$mail_room_status" = "0" ] ]; then
+  if [ "$web_status" = "0" ] && [ "$sidekiq_status" = "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" = "0" ] }; then
     printf "GitLab and all its components are \033[32mup and running\033[0m.\n"
   fi
 }
@@ -322,7 +324,7 @@ reload_gitlab(){
 ## Restarts Sidekiq and Unicorn.
 restart_gitlab(){
   check_status
-  if [ "$web_status" = "0" -o "$sidekiq_status" = "0" -o [ "$mail_room_enabled" = true && "$mail_room_status" = "0" ] ]; then
+  if [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ] }; then
     stop_gitlab
   fi
   start_gitlab

From eacdd5080a4f62442e7ee885d4053562a4bb8acc Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 14:58:41 -0700
Subject: [PATCH 032/111] Fix Basemailer#can?

---
 app/mailers/base_mailer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb
index 8299a4140d..aedb088918 100644
--- a/app/mailers/base_mailer.rb
+++ b/app/mailers/base_mailer.rb
@@ -13,7 +13,7 @@ class BaseMailer < ActionMailer::Base
   end
 
   def can?
-    Ability.abilities.allowed?(user, action, subject)
+    Ability.abilities.allowed?(current_user, action, subject)
   end
 
   private

From 41fdd20c746f34a02d670dc2784cc279b2478cb7 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 16:05:58 -0700
Subject: [PATCH 033/111] Test Gitlab::ReplyByEmail.

---
 spec/lib/gitlab/reply_by_email_spec.rb | 86 ++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 spec/lib/gitlab/reply_by_email_spec.rb

diff --git a/spec/lib/gitlab/reply_by_email_spec.rb b/spec/lib/gitlab/reply_by_email_spec.rb
new file mode 100644
index 0000000000..a52af51e97
--- /dev/null
+++ b/spec/lib/gitlab/reply_by_email_spec.rb
@@ -0,0 +1,86 @@
+require "spec_helper"
+
+describe Gitlab::ReplyByEmail do
+  describe "self.enabled?" do
+    context "when reply by email is enabled" do
+      before do
+        allow(Gitlab.config.reply_by_email).to receive(:enabled).and_return(true)
+      end
+
+      context "when the address is valid" do
+        before do
+          allow(Gitlab.config.reply_by_email).to receive(:address).and_return("replies+%{reply_key}@example.com")
+        end
+
+        it "returns true" do
+          expect(described_class.enabled?).to be_truthy
+        end
+      end
+
+      context "when the address is invalid" do
+        before do
+          allow(Gitlab.config.reply_by_email).to receive(:address).and_return("replies@example.com")
+        end
+
+        it "returns false" do
+          expect(described_class.enabled?).to be_falsey
+        end
+      end
+    end
+
+    context "when reply by email is disabled" do
+      before do
+        allow(Gitlab.config.reply_by_email).to receive(:enabled).and_return(false)
+      end
+
+      it "returns false" do
+        expect(described_class.enabled?).to be_falsey
+      end
+    end
+  end
+
+  describe "self.reply_key" do
+    context "when enabled" do
+      before do
+        allow(described_class).to receive(:enabled?).and_return(true)
+      end
+
+      it "returns a random hex" do
+        key = described_class.reply_key
+        key2 = described_class.reply_key
+
+        expect(key).not_to eq(key2)
+      end
+    end
+
+    context "when disabled" do
+      before do
+        allow(described_class).to receive(:enabled?).and_return(false)
+      end
+
+      it "returns nil" do
+        expect(described_class.reply_key).to be_nil
+      end
+    end
+  end
+
+  context "self.reply_address" do
+    before do
+      allow(Gitlab.config.reply_by_email).to receive(:address).and_return("replies+%{reply_key}@example.com")
+    end
+
+    it "returns the address with an interpolated reply key" do
+      expect(described_class.reply_address("key")).to eq("replies+key@example.com")
+    end
+  end
+
+  context "self.reply_key_from_address" do
+    before do
+      allow(Gitlab.config.reply_by_email).to receive(:address).and_return("replies+%{reply_key}@example.com")
+    end
+
+    it "returns reply key" do
+      expect(described_class.reply_key_from_address("replies+key@example.com")).to eq("key")
+    end
+  end
+end

From 475bb00bdeba37757fd7833d138d4ccb31720cc9 Mon Sep 17 00:00:00 2001
From: Patricio Cano <suprnova32@gmail.com>
Date: Wed, 19 Aug 2015 18:13:01 -0500
Subject: [PATCH 034/111] Improved 2FA warning message about lost codes

---
 app/views/profiles/two_factor_auths/_codes.html.haml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/profiles/two_factor_auths/_codes.html.haml b/app/views/profiles/two_factor_auths/_codes.html.haml
index 1b1395eaa1..43b58be7f9 100644
--- a/app/views/profiles/two_factor_auths/_codes.html.haml
+++ b/app/views/profiles/two_factor_auths/_codes.html.haml
@@ -1,6 +1,8 @@
 %p.slead
   Should you ever lose your phone, each of these recovery codes can be used one
-  time each to regain access to your account. Please save them in a safe place.
+  time each to regain access to your account. Please save them in a safe place, or you
+  %b will
+  lose access to your account.
 
 .codes.well
   %ul

From 9501495aeb512202dc4ce1a88afb39d66f3d39f1 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 17:43:24 -0700
Subject: [PATCH 035/111] Fix init.d script.

---
 lib/support/init.d/gitlab | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index 3f13dfbfdf..41a2f254db 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -85,7 +85,7 @@ check_pids(){
 wait_for_pids(){
   # We are sleeping a bit here mostly because sidekiq is slow at writing it's pid
   i=0;
-  while [ ! -f $web_server_pid_path ] || [ ! -f $sidekiq_pid_path ] || { [ "$mail_room_enabled" = true ] && [ ! -f $mail_room_pid_path ] }; do
+  while [ ! -f $web_server_pid_path ] || [ ! -f $sidekiq_pid_path ] || { [ "$mail_room_enabled" = true ] && [ ! -f $mail_room_pid_path ]; }; do
     sleep 0.1;
     i=$((i+1))
     if [ $((i%10)) = 0 ]; then
@@ -128,7 +128,7 @@ check_status(){
       mail_room_status="-1"
     fi
   fi
-  if [ $web_status = 0 ] && [ $sidekiq_status = 0 ] && { [ "$mail_room_enabled" != true ] || [ $mail_room_status = 0 ] }; then
+  if [ $web_status = 0 ] && [ $sidekiq_status = 0 ] && { [ "$mail_room_enabled" != true ] || [ $mail_room_status = 0 ]; }; then
     gitlab_status=0
   else
     # http://refspecs.linuxbase.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html
@@ -168,7 +168,7 @@ check_stale_pids(){
 ## If no parts of the service is running, bail out.
 exit_if_not_running(){
   check_stale_pids
-  if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ] }; then
+  if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; }; then
     echo "GitLab is not running."
     exit
   fi
@@ -179,13 +179,13 @@ start_gitlab() {
   check_stale_pids
 
   if [ "$web_status" != "0" ]; then
-    echo -n "Starting GitLab Unicorn"
+    echo "Starting GitLab Unicorn"
   fi
   if [ "$sidekiq_status" != "0" ]; then
-    echo -n "Starting GitLab Sidekiq"
+    echo "Starting GitLab Sidekiq"
   fi
   if [ "$mail_room_enabled" = true ] && [ "$mail_room_status" != "0" ]; then
-    echo -n "Starting GitLab MailRoom"
+    echo "Starting GitLab MailRoom"
   fi
 
   # Then check if the service is running. If it is: don't start again.
@@ -225,13 +225,13 @@ stop_gitlab() {
   exit_if_not_running
 
   if [ "$web_status" = "0" ]; then
-    echo -n "Shutting down GitLab Unicorn"
+    echo "Shutting down GitLab Unicorn"
   fi
   if [ "$sidekiq_status" = "0" ]; then
-    echo -n "Shutting down GitLab Sidekiq"
+    echo "Shutting down GitLab Sidekiq"
   fi
   if [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; then
-    echo -n "Shutting down GitLab MailRoom"
+    echo "Shutting down GitLab MailRoom"
   fi
 
   # If the Unicorn web server is running, tell it to stop;
@@ -248,11 +248,11 @@ stop_gitlab() {
   fi
 
   # If something needs to be stopped, lets wait for it to stop. Never use SIGKILL in a script.
-  while [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ] }; do
+  while [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; }; do
     sleep 1
     check_status
     printf "."
-    if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ] }; then
+    if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; }; then
       printf "\n"
       break
     fi
@@ -272,7 +272,7 @@ stop_gitlab() {
 ## Prints the status of GitLab and it's components.
 print_status() {
   check_status
-  if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ] }; then
+  if [ "$web_status" != "0" ] && [ "$sidekiq_status" != "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" != "0" ]; }; then
     echo "GitLab is not running."
     return
   fi
@@ -292,8 +292,8 @@ print_status() {
     else
         printf "The GitLab MailRoom email processor is \033[31mnot running\033[0m.\n"
     fi
-    end
-  if [ "$web_status" = "0" ] && [ "$sidekiq_status" = "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" = "0" ] }; then
+  fi
+  if [ "$web_status" = "0" ] && [ "$sidekiq_status" = "0" ] && { [ "$mail_room_enabled" != true ] || [ "$mail_room_status" = "0" ]; }; then
     printf "GitLab and all its components are \033[32mup and running\033[0m.\n"
   fi
 }
@@ -324,7 +324,7 @@ reload_gitlab(){
 ## Restarts Sidekiq and Unicorn.
 restart_gitlab(){
   check_status
-  if [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ] }; then
+  if [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; }; then
     stop_gitlab
   fi
   start_gitlab

From 19a049ece9e350623e3adb141298c00344cab02d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 17:43:36 -0700
Subject: [PATCH 036/111] Make documentation clearer.

---
 doc/install/installation.md  |  2 +-
 doc/reply_by_email/README.md | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 202704088a..c75e1d8786 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -370,7 +370,7 @@ Make sure to edit the config file to match your setup:
     # domain name of your host serving GitLab.
     # If using Ubuntu default nginx install:
     # either remove the default_server from the listen line
-    # or else rm -f /etc/sites-enabled/default
+    # or else sudo rm -f /etc/nginx/sites-enabled/default
     sudo editor /etc/nginx/sites-available/gitlab
 
 **Note:** If you want to use HTTPS, replace the `gitlab` Nginx config with `gitlab-ssl`. See [Using HTTPS](#using-https) for HTTPS configuration details.
diff --git a/doc/reply_by_email/README.md b/doc/reply_by_email/README.md
index fffc120d2b..e168e9a17e 100644
--- a/doc/reply_by_email/README.md
+++ b/doc/reply_by_email/README.md
@@ -10,8 +10,17 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`. If you'
 
 ### Installations from source
 
+1. Go to the GitLab installation directory:
+
+    ```sh
+    cd /home/git/gitlab
+    ```
 
 1. Find the `reply_by_email` section in `config/gitlab.yml`, enable the feature and enter the email address including a placeholder for the `reply_key`:
+
+    ```sh
+    sudo editor config/gitlab.yml
+    ```
     
     ```yaml
     reply_by_email:
@@ -24,11 +33,15 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`. If you'
 2. Find `config/mail_room.yml.example` and copy it to `config/mail_room.yml`:
     
     ```sh
-    cp config/mail_room.yml.example config/mail_room.yml
+    sudo cp config/mail_room.yml.example config/mail_room.yml
     ```
 
 3. Uncomment the configuration options in `config/mail_room.yml` and fill in the details for your specific IMAP server and email account:
 
+    ```sh
+    sudo editor config/mail_room.yml
+    ```
+
     ```yaml
     :mailboxes:
       -
@@ -66,6 +79,10 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`. If you'
 
 5. Edit `/etc/default/gitlab` to enable `mail_room`:
 
+    ```sh
+    sudo editor /etc/default/gitlab
+    ```
+    
     ```sh
     mail_room_enabled=true
     ```

From 83081f167397c6c325a4f8c604191e766b2c3d3b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Wed, 19 Aug 2015 18:00:13 -0700
Subject: [PATCH 037/111] Start on tests.

---
 lib/gitlab/email_receiver.rb                  |  37 +-
 spec/fixtures/emails/android_gmail.eml        | 177 +++++++
 spec/fixtures/emails/attachment.eml           | 351 +++++++++++++
 spec/fixtures/emails/auto_reply.eml           |  21 +
 spec/fixtures/emails/big5.eml                 |  26 +
 spec/fixtures/emails/bottom_reply.eml         | 160 ++++++
 spec/fixtures/emails/boundary.eml             |  61 +++
 spec/fixtures/emails/dutch.eml                |  20 +
 spec/fixtures/emails/empty.eml                |  21 +
 spec/fixtures/emails/gmail_web.eml            | 181 +++++++
 spec/fixtures/emails/hebrew.eml               |  17 +
 spec/fixtures/emails/html_only.eml            |  93 ++++
 spec/fixtures/emails/html_paragraphs.eml      | 205 ++++++++
 spec/fixtures/emails/inline_reply.eml         |  60 +++
 spec/fixtures/emails/ios_default.eml          | 136 +++++
 spec/fixtures/emails/iphone_signature.eml     |  29 ++
 .../fixtures/emails/multiple_destinations.eml |  40 ++
 spec/fixtures/emails/newlines.eml             |  84 +++
 spec/fixtures/emails/no_content_reply.eml     |  34 ++
 spec/fixtures/emails/on_wrote.eml             | 277 ++++++++++
 spec/fixtures/emails/outlook.eml              | 188 +++++++
 spec/fixtures/emails/paragraphs.cooked        |   7 +
 spec/fixtures/emails/paragraphs.eml           |  42 ++
 spec/fixtures/emails/previous.eml             |  38 ++
 spec/fixtures/emails/previous_replies.eml     | 180 +++++++
 spec/fixtures/emails/too_many_mentions.eml    |  31 ++
 spec/fixtures/emails/too_short.eml            |  21 +
 spec/fixtures/emails/valid_incoming.cooked    |   5 +
 spec/fixtures/emails/valid_incoming.eml       |  25 +
 spec/fixtures/emails/valid_reply.cooked       |   4 +
 spec/fixtures/emails/valid_reply.eml          |  40 ++
 spec/fixtures/emails/via_line.eml             |  25 +
 spec/fixtures/emails/windows_8_metro.eml      | 173 +++++++
 spec/fixtures/emails/wrong_reply_key.eml      |  40 ++
 spec/lib/gitlab/email_receiver_spec.rb        | 481 ++++++++++++++++++
 35 files changed, 3311 insertions(+), 19 deletions(-)
 create mode 100644 spec/fixtures/emails/android_gmail.eml
 create mode 100644 spec/fixtures/emails/attachment.eml
 create mode 100644 spec/fixtures/emails/auto_reply.eml
 create mode 100644 spec/fixtures/emails/big5.eml
 create mode 100644 spec/fixtures/emails/bottom_reply.eml
 create mode 100644 spec/fixtures/emails/boundary.eml
 create mode 100644 spec/fixtures/emails/dutch.eml
 create mode 100644 spec/fixtures/emails/empty.eml
 create mode 100644 spec/fixtures/emails/gmail_web.eml
 create mode 100644 spec/fixtures/emails/hebrew.eml
 create mode 100644 spec/fixtures/emails/html_only.eml
 create mode 100644 spec/fixtures/emails/html_paragraphs.eml
 create mode 100644 spec/fixtures/emails/inline_reply.eml
 create mode 100644 spec/fixtures/emails/ios_default.eml
 create mode 100644 spec/fixtures/emails/iphone_signature.eml
 create mode 100644 spec/fixtures/emails/multiple_destinations.eml
 create mode 100644 spec/fixtures/emails/newlines.eml
 create mode 100644 spec/fixtures/emails/no_content_reply.eml
 create mode 100644 spec/fixtures/emails/on_wrote.eml
 create mode 100644 spec/fixtures/emails/outlook.eml
 create mode 100644 spec/fixtures/emails/paragraphs.cooked
 create mode 100644 spec/fixtures/emails/paragraphs.eml
 create mode 100644 spec/fixtures/emails/previous.eml
 create mode 100644 spec/fixtures/emails/previous_replies.eml
 create mode 100644 spec/fixtures/emails/too_many_mentions.eml
 create mode 100644 spec/fixtures/emails/too_short.eml
 create mode 100644 spec/fixtures/emails/valid_incoming.cooked
 create mode 100644 spec/fixtures/emails/valid_incoming.eml
 create mode 100644 spec/fixtures/emails/valid_reply.cooked
 create mode 100644 spec/fixtures/emails/valid_reply.eml
 create mode 100644 spec/fixtures/emails/via_line.eml
 create mode 100644 spec/fixtures/emails/windows_8_metro.eml
 create mode 100644 spec/fixtures/emails/wrong_reply_key.eml
 create mode 100644 spec/lib/gitlab/email_receiver_spec.rb

diff --git a/lib/gitlab/email_receiver.rb b/lib/gitlab/email_receiver.rb
index a0b4ff87e0..3c1f346c0c 100644
--- a/lib/gitlab/email_receiver.rb
+++ b/lib/gitlab/email_receiver.rb
@@ -62,6 +62,21 @@ module Gitlab
       end
     end
 
+    def parse_body(message)
+      body = select_body(message)
+
+      encoding = body.encoding
+      raise EmptyEmailError if body.strip.blank?
+
+      body = discourse_email_trimmer(body)
+      raise EmptyEmailError if body.strip.blank?
+
+      body = EmailReplyParser.parse_reply(body)
+      raise EmptyEmailError if body.strip.blank?
+
+      body.force_encoding(encoding).encode("UTF-8")
+    end
+
     private
 
     def reply_key
@@ -80,21 +95,6 @@ module Gitlab
       SentNotification.for(reply_key)
     end
 
-    def parse_body(message)
-      body = select_body(message)
-
-      encoding = body.encoding
-      raise EmptyEmailError if body.strip.blank?
-
-      body = discourse_email_trimmer(body)
-      raise EmptyEmailError if body.strip.blank?
-
-      body = EmailReplyParser.parse_reply(body)
-      raise EmptyEmailError if body.strip.blank?
-
-      body.force_encoding(encoding).encode("UTF-8")
-    end
-
     def select_body(message)
       html = nil
       text = nil
@@ -144,10 +144,9 @@ module Gitlab
       range_end = 0
 
       lines.each_with_index do |l, idx|
-        break if l =~ /\A\s*\-{3,80}\s*\z/ ||
-                 # This one might be controversial but so many reply lines have years, times and end with a colon.
-                 # Let's try it and see how well it works.
-                 (l =~ /\d{4}/ && l =~ /\d:\d\d/ && l =~ /\:$/) ||
+        # This one might be controversial but so many reply lines have years, times and end with a colon.
+       # Let's try it and see how well it works.
+       break if (l =~ /\d{4}/ && l =~ /\d:\d\d/ && l =~ /\:$/) ||
                  (l =~ /On \w+ \d+,? \d+,?.*wrote:/)
 
         # Headers on subsequent lines
diff --git a/spec/fixtures/emails/android_gmail.eml b/spec/fixtures/emails/android_gmail.eml
new file mode 100644
index 0000000000..21c5dde234
--- /dev/null
+++ b/spec/fixtures/emails/android_gmail.eml
@@ -0,0 +1,177 @@
+Delivered-To: reply@discourse.org
+Return-Path: <walter.white@googlemail.com>
+MIME-Version: 1.0
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+References: <topic/22638@meta.discourse.org>
+  <topic/22638/86406@meta.discourse.org>
+Date: Fri, 28 Nov 2014 12:53:21 -0800
+Subject: Re: [Discourse Meta] [Lounge] Testing default email replies
+From: Walter White <walter.white@googlemail.com>
+To: Discourse Meta <reply@discourse.org>
+Content-Type: multipart/alternative; boundary=089e0149cfa485c6630508f173df
+
+--089e0149cfa485c6630508f173df
+Content-Type: text/plain; charset=UTF-8
+
+### this is a reply from Android 5 gmail
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+
+This is **bold** in Markdown.
+
+This is a link to http://example.com
+On Nov 28, 2014 12:36 PM, "Arpit Jalan" <info@discourse.org> wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+--089e0149cfa485c6630508f173df
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<p dir=3D"ltr">### this is a reply from Android 5 gmail</p>
+<p dir=3D"ltr">The quick brown fox jumps over the lazy dog. The quick brown=
+ fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. =
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over=
+ the lazy dog. The quick brown fox jumps over the lazy dog. </p>
+<p dir=3D"ltr">This is **bold** in Markdown.</p>
+<p dir=3D"ltr">This is a link to <a href=3D"http://example.com">http://exam=
+ple.com</a></p>
+<div class=3D"gmail_quote">On Nov 28, 2014 12:36 PM, &quot;Arpit Jalan&quot=
+; &lt;<a href=3D"mailto:info@discourse.org">info@discourse.org</a>&gt; wrot=
+e:<br type=3D"attribution"><blockquote class=3D"gmail_quote" style=3D"margi=
+n:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div>
+
+<table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" bor=
+der=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/techapj/45/3281.png" title=3D"techAPJ" style=3D"max-wi=
+dth:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/techapj" style=3D"text-=
+decoration:none;font-weight:bold;color:#006699;font-size:13px;font-family:&=
+#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;text-d=
+ecoration:none;font-weight:bold" target=3D"_blank">techAPJ</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">Test reply.</p>
+
+<p style=3D"margin-top:0;border:0">First paragraph.</p>
+
+<p style=3D"margin-top:0;border:0">Second paragraph.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+  <div style=3D"color:#666">
+    <p>To respond, reply to this email or visit <a href=3D"https://meta.dis=
+course.org/t/testing-default-email-replies/22638/3" style=3D"text-decoratio=
+n:none;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https:/=
+/meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your bro=
+wser.</p>
+  </div>
+  <hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-c=
+olor:#ddd;min-height:1px;border:1px">
+  <h4>Previous Replies</h4>
+
+  <table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" b=
+order=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/codinghorror/45/5297.png" title=3D"codinghorror" style=
+=3D"max-width:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/codinghorror" style=3D"=
+text-decoration:none;font-weight:bold;color:#006699;font-size:13px;font-fam=
+ily:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;t=
+ext-decoration:none;font-weight:bold" target=3D"_blank">codinghorror</a><br=
+>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">We&#39;re testing the latest GitHub emai=
+l processing library which we are integrating now.</p>
+
+<p style=3D"margin-top:0;border:0"><a href=3D"https://github.com/github/ema=
+il_reply_parser" style=3D"text-decoration:none;font-weight:bold;color:#0066=
+99" target=3D"_blank">https://github.com/github/email_reply_parser</a></p>
+
+<p style=3D"margin-top:0;border:0">Go ahead and reply to this topic and I&#=
+39;ll reply from various email clients for testing.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-col=
+or:#ddd;min-height:1px;border:1px">
+
+<div style=3D"color:#666">
+<p>To respond, reply to this email or visit <a href=3D"https://meta.discour=
+se.org/t/testing-default-email-replies/22638/3" style=3D"text-decoration:no=
+ne;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https://met=
+a.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser=
+.</p>
+</div>
+<div style=3D"color:#666">
+<p>To unsubscribe from these emails, visit your <a href=3D"https://meta.dis=
+course.org/my/preferences" style=3D"text-decoration:none;font-weight:bold;c=
+olor:#006699;color:#666" target=3D"_blank">user preferences</a>.</p>
+</div>
+</div>
+</blockquote></div>
+
+--089e0149cfa485c6630508f173df--
diff --git a/spec/fixtures/emails/attachment.eml b/spec/fixtures/emails/attachment.eml
new file mode 100644
index 0000000000..f25c3d1a44
--- /dev/null
+++ b/spec/fixtures/emails/attachment.eml
@@ -0,0 +1,351 @@
+Message-ID: <51C22E52.1030509@darthvader.ca>
+Date: Wed, 19 Jun 2013 18:18:58 -0400
+From: Anakin Skywalker <FROM>
+User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6
+MIME-Version: 1.0
+To: Han Solo via Death Star <TO>
+Subject: Re: [Death Star] [PM] re: Regarding your post in "Site Customization
+ not working"
+References: <51d23d33f41fb_5f4e4b35d7d60798@xwing.mail>
+In-Reply-To: <51d23d33f41fb_5f4e4b35d7d60798@xwing.mail>
+Content-Type: multipart/mixed; boundary=047d7b45041e19c68004eb9f3de8
+
+--047d7b45041e19c68004eb9f3de8
+Content-Type: multipart/alternative; boundary=047d7b45041e19c67b04eb9f3de6
+
+--047d7b45041e19c67b04eb9f3de6
+Content-Type: text/plain; charset=ISO-8859-1
+
+here is an image attachment
+
+
+On Tue, Nov 19, 2013 at 5:11 PM, Neil <info@discourse.org> wrote:
+
+>    Neil <http://meta.discourse.org/users/neil>
+> November 19
+>
+> Actually, deleting a spammer does what it's supposed to. It does mark the
+> topic as deleted.
+>
+> That topic has id 11002, and you're right that the user was deleted.
+>
+> @eviltrout <http://users/eviltrout> Any idea why it showed up in
+> suggested topics?
+>
+> To respond, reply to this email or visit
+> http://meta.discourse.org/t/spam-post-pops-back-up-in-suggested-topics/11005/5in your browser.
+>  ------------------------------
+> Previous Replies    Neil <http://meta.discourse.org/users/neil>
+> November 19
+>
+> Looks like a bug when deleting a spammer. I'll look at it.
+>     riking <http://meta.discourse.org/users/riking>
+> November 19
+>
+>  codinghorror:
+>
+> I can't even find that topic by name.
+>
+>  In that case, I'm fairly certain someone used the 'Delete Spammer'
+> function on the user, which would explain your inability to find it - it's
+> gone.
+>
+> I'm raising this because, well, it's gone and shouldn't be showing up. And
+> even if it was hanging around, it should be invisible to me, and not
+> showing up in Suggested Topics.
+>      codinghorror <http://meta.discourse.org/users/codinghorror>
+> November 19
+>
+> Hmm, that's interesting -- can you have a look @eviltrout<http://users/eviltrout>?
+> I can't even find that topic by name.
+>     riking <http://meta.discourse.org/users/riking>
+> November 19
+>
+> I'm one of the users who flagged this particular spam post, and it was
+> promptly deleted/hidden, but it just popped up in the Suggested Topics box:
+>
+>  Pasted image1125x220 27.7 KB
+> <//cdn.discourse.org/uploads/meta_discourse/2158/50b8b49557cb249e.png>
+>
+> We may want to recheck the suppression on these.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> http://meta.discourse.org/t/spam-post-pops-back-up-in-suggested-topics/11005/5in your browser.
+>
+> To unsubscribe from these emails, visit your user preferences<http://meta.discourse.org/user_preferences>
+> .
+>
+
+--047d7b45041e19c67b04eb9f3de6
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">here is an image attachment</div><div class=3D"gmail_extra=
+"><br><br><div class=3D"gmail_quote">On Tue, Nov 19, 2013 at 5:11 PM, Neil =
+<span dir=3D"ltr">&lt;<a href=3D"mailto:info@discourse.org" target=3D"_blan=
+k">info@discourse.org</a>&gt;</span> wrote:<br>
+<blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1p=
+x #ccc solid;padding-left:1ex"><div>
+<table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cellp=
+adding=3D"0" border=3D"0"><tbody>
+<tr>
+<td style=3D"vertical-align:top;width:55px">
+        <img src=3D"http://www.gravatar.com/avatar/42776c4982dff1fa45ee8248=
+532f8ad0.png?s=3D45&amp;r=3Dpg&amp;d=3Didenticon" title=3D"Neil" style=3D"m=
+ax-width:694px" width=3D"45" height=3D"45">
+</td>
+      <td>
+        <a href=3D"http://meta.discourse.org/users/neil" style=3D"font-size=
+:13px;font-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;c=
+olor:#3b5998;text-decoration:none;font-weight:bold" target=3D"_blank">Neil<=
+/a><br>
+<span style=3D"text-align:right;color:#999999;padding-right:5px;font-family=
+:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:11px">No=
+vember 19</span>
+      </td>
+    </tr>
+<tr>
+<td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0">Actually, deleting a spammer does what it&#39;s s=
+upposed to. It does mark the topic as deleted.</p>
+
+<p style=3D"margin-top:0">That topic has id 11002, and you&#39;re right tha=
+t the user was deleted.</p>
+
+<p style=3D"margin-top:0"><a href=3D"http://users/eviltrout" target=3D"_bla=
+nk">@eviltrout</a> Any idea why it showed up in suggested topics? </p>
+</td>
+    </tr>
+</tbody></table>
+<div style=3D"color:#666">
+    <p>To respond, reply to this email or visit <a href=3D"http://meta.disc=
+ourse.org/t/spam-post-pops-back-up-in-suggested-topics/11005/5" style=3D"co=
+lor:#666" target=3D"_blank">http://meta.discourse.org/t/spam-post-pops-back=
+-up-in-suggested-topics/11005/5</a> in your browser.</p>
+
+  </div>
+  <hr style=3D"background-color:#ddd;min-height:1px;border:1px">
+<h4>Previous Replies</h4>
+
+  <table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cel=
+lpadding=3D"0" border=3D"0"><tbody>
+<tr>
+<td style=3D"vertical-align:top;width:55px">
+        <img src=3D"http://www.gravatar.com/avatar/42776c4982dff1fa45ee8248=
+532f8ad0.png?s=3D45&amp;r=3Dpg&amp;d=3Didenticon" title=3D"Neil" style=3D"m=
+ax-width:694px" width=3D"45" height=3D"45">
+</td>
+      <td>
+        <a href=3D"http://meta.discourse.org/users/neil" style=3D"font-size=
+:13px;font-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;c=
+olor:#3b5998;text-decoration:none;font-weight:bold" target=3D"_blank">Neil<=
+/a><br>
+<span style=3D"text-align:right;color:#999999;padding-right:5px;font-family=
+:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:11px">No=
+vember 19</span>
+      </td>
+    </tr>
+<tr>
+<td style=3D"padding-top:5px" colspan=3D"2"><p style=3D"margin-top:0">Looks=
+ like a bug when deleting a spammer. I&#39;ll look at it.</p></td>
+    </tr>
+</tbody></table>
+<table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cellp=
+adding=3D"0" border=3D"0"><tbody>
+<tr>
+<td style=3D"vertical-align:top;width:55px">
+        <img src=3D"http://www.gravatar.com/avatar/5120fc4e345db0d1a9648882=
+72073819.png?s=3D45&amp;r=3Dpg&amp;d=3Didenticon" title=3D"riking" style=3D=
+"max-width:694px" width=3D"45" height=3D"45">
+</td>
+      <td>
+        <a href=3D"http://meta.discourse.org/users/riking" style=3D"font-si=
+ze:13px;font-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif=
+;color:#3b5998;text-decoration:none;font-weight:bold" target=3D"_blank">rik=
+ing</a><br>
+<span style=3D"text-align:right;color:#999999;padding-right:5px;font-family=
+:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:11px">No=
+vember 19</span>
+      </td>
+    </tr>
+<tr>
+<td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0"><u></u></p><div>
+<div></div>
+<img width=3D"20" height=3D"20" src=3D"http://www.gravatar.com/avatar/51d62=
+3f33f8b83095db84ff35e15dbe8.png?s=3D40&amp;r=3Dpg&amp;d=3Didenticon" style=
+=3D"max-width:694px">codinghorror:</div>
+<blockquote><p style=3D"margin-top:0">I can&#39;t even find that topic by n=
+ame.</p></blockquote><u></u><p></p>
+
+<p style=3D"margin-top:0">In that case, I&#39;m fairly certain someone used=
+ the &#39;Delete Spammer&#39; function on the user, which would explain you=
+r inability to find it - it&#39;s gone.</p>
+
+<p style=3D"margin-top:0">I&#39;m raising this because, well, it&#39;s gone=
+ and shouldn&#39;t be showing up. And even if it was hanging around, it sho=
+uld be invisible to me, and not showing up in Suggested Topics.</p>
+</td>
+    </tr>
+</tbody></table>
+<table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cellp=
+adding=3D"0" border=3D"0"><tbody>
+<tr>
+<td style=3D"vertical-align:top;width:55px">
+        <img src=3D"http://www.gravatar.com/avatar/51d623f33f8b83095db84ff3=
+5e15dbe8.png?s=3D45&amp;r=3Dpg&amp;d=3Didenticon" title=3D"codinghorror" st=
+yle=3D"max-width:694px" width=3D"45" height=3D"45">
+</td>
+      <td>
+        <a href=3D"http://meta.discourse.org/users/codinghorror" style=3D"f=
+ont-size:13px;font-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans=
+-serif;color:#3b5998;text-decoration:none;font-weight:bold" target=3D"_blan=
+k">codinghorror</a><br>
+<span style=3D"text-align:right;color:#999999;padding-right:5px;font-family=
+:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:11px">No=
+vember 19</span>
+      </td>
+    </tr>
+<tr>
+<td style=3D"padding-top:5px" colspan=3D"2"><p style=3D"margin-top:0">Hmm, =
+that&#39;s interesting -- can you have a look <a href=3D"http://users/evilt=
+rout" target=3D"_blank">@eviltrout</a>? I can&#39;t even find that topic by=
+ name. </p>
+</td>
+    </tr>
+</tbody></table>
+<table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cellp=
+adding=3D"0" border=3D"0"><tbody>
+<tr>
+<td style=3D"vertical-align:top;width:55px">
+        <img src=3D"http://www.gravatar.com/avatar/5120fc4e345db0d1a9648882=
+72073819.png?s=3D45&amp;r=3Dpg&amp;d=3Didenticon" title=3D"riking" style=3D=
+"max-width:694px" width=3D"45" height=3D"45">
+</td>
+      <td>
+        <a href=3D"http://meta.discourse.org/users/riking" style=3D"font-si=
+ze:13px;font-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif=
+;color:#3b5998;text-decoration:none;font-weight:bold" target=3D"_blank">rik=
+ing</a><br>
+<span style=3D"text-align:right;color:#999999;padding-right:5px;font-family=
+:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:11px">No=
+vember 19</span>
+      </td>
+    </tr>
+<tr>
+<td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0">I&#39;m one of the users who flagged this particu=
+lar spam post, and it was promptly deleted/hidden, but it just popped up in=
+ the Suggested Topics box:</p>
+
+<p style=3D"margin-top:0"></p>
+<div><a href=3D"//cdn.discourse.org/uploads/meta_discourse/2158/50b8b49557c=
+b249e.png" target=3D"_blank"><img src=3D"http://cdn.discourse.org/uploads/m=
+eta_discourse/_optimized/ab1/c92/acd2c33402_584x134.png" width=3D"584" heig=
+ht=3D"134" style=3D"max-width:694px"><div>
+
+<span>Pasted image</span><span>1125x220 27.7 KB</span><span></span>
+</div></a></div>
+
+<p style=3D"margin-top:0">We may want to recheck the suppression on these.<=
+/p>
+</td>
+    </tr>
+</tbody></table>
+<hr style=3D"background-color:#ddd;min-height:1px;border:1px">
+<div style=3D"color:#666">
+<p>To respond, reply to this email or visit <a href=3D"http://meta.discours=
+e.org/t/spam-post-pops-back-up-in-suggested-topics/11005/5" style=3D"color:=
+#666" target=3D"_blank">http://meta.discourse.org/t/spam-post-pops-back-up-=
+in-suggested-topics/11005/5</a> in your browser.</p>
+
+</div>
+<div style=3D"color:#666">
+<p>To unsubscribe from these emails, visit your <a href=3D"http://meta.disc=
+ourse.org/user_preferences" style=3D"color:#666" target=3D"_blank">user pre=
+ferences</a>.</p>
+</div>
+</div></blockquote></div><br></div>
+
+--047d7b45041e19c67b04eb9f3de6--
+--047d7b45041e19c68004eb9f3de8
+Content-Type: image/png; name="bricks.png"
+Content-Disposition: attachment; filename="bricks.png"
+Content-Transfer-Encoding: base64
+X-Attachment-Id: f_ho8uteve0
+
+iVBORw0KGgoAAAANSUhEUgAAASEAAAB+CAIAAADk0DDaAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
+bWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdp
+bj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6
+eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEz
+NDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJo
+dHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlw
+dGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAv
+IiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RS
+ZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpD
+cmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBNYWNpbnRvc2giIHhtcE1NOkluc3RhbmNl
+SUQ9InhtcC5paWQ6MDYxQjcyOUUzMDM1MTFFM0JFRTFBOTQ1RUY4QUU4MDIiIHhtcE1NOkRvY3Vt
+ZW50SUQ9InhtcC5kaWQ6MDYxQjcyOUYzMDM1MTFFM0JFRTFBOTQ1RUY4QUU4MDIiPiA8eG1wTU06
+RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowNjFCNzI5QzMwMzUxMUUzQkVF
+MUE5NDVFRjhBRTgwMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowNjFCNzI5RDMwMzUxMUUz
+QkVFMUE5NDVFRjhBRTgwMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1w
+bWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pm2fyz0AAAyISURBVHja7F2/i11FFL6rL12aBdlGRDCF
+EQmEbVJtChfSJJDGRkgZBBsVUhgQ7NSkCKiFVUr/AUGbhW1MlWaJBAkWVsFmG0HshMT7duJk9szc
+uefOjzPn3vd9xfL2/bh35rtnznfOuXNnth7c/6ID2Lh261vO13669wm4SsZ7H3396gmePXu2OkH/
+Yr4Mv4IrCgAYY8Am4vnz51sn8EVsXth68P7eYq7Kj4cP3H+v79fq2tWDX/u/d25/7n/08/3PzIvb
+u3vLs3sxhh/vXrOvb9/50v1o77W/X340B5IXMsbsta931eN24I6uRQ4wd3SJkUwYnqkLQ6wIAHWx
+gn/Nx3ff3Ov/njvbWFcXFibESdZw3aFjAKBDx46Ofk/42e7u2/3f4G8jH5XF07+O7es3tnfSThps
+beRNA/PRmd1rxrlGkMNDf8a2DLskJzOcRrJ5/7czb/Z/fzk8qESyjBlDxwBAZT4WGd/1/CtxLcaz
+ZiLYWvOmezpXxMQwxKQYwzIkK2S4LMnQMQCorGMm4C7irhp6nUzPHfSs7un6176jffT4cULSuGkM
++1mWq5b2jDlqRpJGdWNsFqNLxqrstfejxEzjA8l+LBpkm+DihQucmodyhhErAoCOmkcvx4t3xsG4
+RaZEbgOeZZNMwu9u+P7EkkiGjgGADh2LDH21Ehd0Wvz82E/VqiLOsE6JizM8iWSZ2n0TM4aOAYAO
+HUvzDW0RbNhoa8ld0Ui2cPHCBU7JCwz7DDPzMc7dEf0krzqAESsCIBmxIgAsN1YUSKMlU/9N8KxD
++b02hvn3oDWbMXQMADZMxyIOtUnqn1lTVluuWAzD+kmGjgGAeh2rcfMu7YDCd8PFKss10qRkhiV1
+Q7J2X8+Mpe+PuRcpOCEgp59lOWry1GCRfgVJdg+STFRxK4yTLFnzSCCZacaIFQGgcqworP5FvKlM
+YFBwvuIGkszscny+Ij9WlJ/SyY+8oGMAUFnHZIa+tpnjRVrCn68o0PFFMqztdGkkQ8cAQCQfI87A
+X0lGlZtJW4gmx9Mnr5lDGuyenawko82RJ5OczLCflfHriprNGDoGAOL5WD/63QX7tU1USV7oq2FH
+yKmNf7Ukq2V4RiRrNuOVf+3LLsSrYXTlI7l2TwLUSgvxahhdNRhmRuMkQNVmxogVAUBEx9yh7zoz
+STc2quwFHVKTdX7sc/WtGB4NUMsynH/AqXOpdJoxdAwAKuuYGwc3SXj0TL2NIFi7n+pfWyU8c2E4
+p6mazRg6BgAi+ZgbRIpF2yRDKIhRuRhdMJTTu8v7VyY9dpFAcr4nJhlCDZKTGS4uNTrNOLBXLeeU
+beuhVefm8Q8bma/4ZLt756+XRyMkM0+xVJL5x4zU7nuGe1iSNZsxYkUAqBwrBoXbf1Os2F3E/cg0
+NeJle//qPyRLGkZiLcmJ83MhOVK7d8OEIZKDZizTcjwHDQCCOubGtfHbdpNSVc6+UuYL1/f33JRx
+RttwRfKxvv2mI4Ze63pHb4zySWZuj9Z/gTDczWc3uUik4OqSJZljxt2UslYRM4aOAUBlHTNDPxJN
+EmEx/wbfPBUcHy2fu4iXPeiOu22aPAyR7Eu3JTl4ITaH4QjWDPfYZjHc1oxXoxHL0DtumyIJJWl3
+8CHF0QZkJqxFbsj4ExE4aw0Er32wj3GG48Unsg4Zh2T/dHb05iy9mBnnE5KZ8xWHSK5nxt3Ak6DB
+IyNWBADBmkca+P6YfPr08JS8vFD/kGc69au8+dTJP89xz5kkT2J4iGTTfkuy35jgNZJkOIdkYTM+
+RdeYGUPHAKCyjpV1BqXwZHs8nxGG8VsHR+u/r1+6sX7rdM3jj3/WPvjc2eNgR9QyrJPkqzfvBqtK
+PcmEYf0kQ8cAoC62rr4FEibAKJipd333zb2hr/m+FphKskWwrjgjhrfO7+zgonLw8ae3bPRirrp5
+Jz7YgEm4vH/F/df4srmTjFgRAKBjOkQsqGAG7kdAvoL18jU0h2aOJEPHAKCyjn34wY2hz9xomIC4
+GfPNtJ1FyW8jJ423Ie7/cnpnvmzyAZIw1OtdPsnkXO4P7Uf1Llm9CxE5sqtywdSulJlN6iB0DAAq
+69j3X92ND8rgqHXdwNBvR4e7+4W4L0xug+/5gv5s9Mi9g/QVLO5TM3vHVJtI++OdCrJX8JKNXohS
+ZjYaZYiZ2dChoGMAUFnHvn1LS13xzM1bHH/z7kOU79Lx26XxLOXf+7jdl8uwa8Ar5sqsZPk482R1
+WRyZS3vSxKAo//nwh/Xfrru9u7e8a+Mv0FeD5O7EQ5GRZvHz/c/s600guR7Dj1DzAIDGsaIrbmlb
+0dnFRsh+oaOyaX5lHa3RXNe/Xul2hprK34+UNM9/TY5vWz70acdexMZvedpWdP6pO/aq8f3X/Mjc
+kkwY7pK21Q0yk8Yh+UICwzkkB814lGTXjKFjANBOx0aH/qjX4bwZdADGy3b/zwR1J1nb54KC25O6
+p+AIy1TxKQjOhmCZDEdIdlMyc+vWkuw+eRXcZdeehcleK5KVmDF0DABa6FiRhZzS3K3rAOzjDEwd
+S0gXJ31UFkUWckpzt1bH3MlHHB3LbJiwrNUz4yE7CZrxKnigIovIBkkcqjQII3KB6117clXESN4o
+hmXM2C/hRPaMR6wIAHWxqudaguVO88I9XbKaNdn3tZJrzyfZDxDs6XLihSb7vupk2Cd51IxNKA4d
+AwARHavtVIJ3ISO5L//hnFn4VwGSh4gdKuEwl7kGyUN3g4LTGAjMcwDQMQCYrY4FnUHatKNMzGhP
+syLulkNy2hPQINl9zTTjVUFC+UUIX3+rItIYzZYxtEULM34jYSRB8cVn5kiyjBkjVgQAlbFicHzz
+d/4cFVmxJb40xzYJJPOfAzDL18ksDKqW5GQznhQrQscAYBE1j0ggG4QpemJV0KokAzIMQ8cAQETH
+ZCo/m+BZI0wG64StGC5eu1fCsCozNjf6Vw2z0syqveZyRXA4geTaI00bw5h3DwAS4I6xzH24p6IX
+2UlLw+e4wxpdS3ColVqiRHOKd61neC4kQ8cAoC64tfuykW6TJ3OL9MtNA4LTmpKJKp5LzJpkwrB7
+kByimpgxdAwAdOhYmqcfQsE5wcLzTYtIlgDD3dic4EnPjwncdQiS3LCqWcSM8Rw0AMxTx4r4Hm3P
+QQs7coEuT5oNLNB3bc+/FGmJmRK4GurtpNPkEBRcbIQfyQTT4rRF8MWMLG21n2SSgwxPmncfNImE
+RfAlh7EeM0asCACCsWLyQl8NJT64IHvaJh1imfTCSNY230qPGWMuFQAI6ljD9UAjixhPjZ5rLHat
+wb+2YtgnucZi10rChBokG0DHAEBExwoO+iJF2KlPQFv/2mRaLTMJLEVykzK3q2AaSK7KcCmSTz0/
+1hCZlWX3h/LBmJ45gVMZnjTPw/62STA2X5IRKwKAYKxYMK0cXcuS4wKnPgnvxmnMXuS74d5pTT1v
+keoIh+FRkgUYztc6PwgXq44UNGPoGACI61i9uXlFDvtk+8VmquZoZCIP8xRti871ihalGO66XJKb
+l/U1mDHmUgFAIx2LD9Pm/qn3r/5DsqRtJNqWLHYX8fFtSXYVjJDsNoykJWIkFwlVZBg2+dhK59CP
+VJbtmDEhjWsW8fs2/HoAcx3z/gvX9/dIUj6XLYLiDNuOWJI5DE+qB3BINp8Skme3CRNiRQAQjxWV
+46A77jwFi0QCJPc1XjD45kv/fbT8Cx+p3a8Z7sEmmQiLZXjoQrzQug0gGTUPABDUsZwYt8gMJrub
+06iXjTtXP/UayiLcLkeydvtmcJo/swH2+JkM55BMJvsw51KVJTnOcDcwzX8Sw6rMGPkYAIjomOsP
+MudT5/ycOA/+jFX3hmmRNkf8Mfn06eEpz/cijQm5/+DPhUkmDE+aS2Xv+xdpc5zhU3QdUgG3JA8x
+rMqMMZcKAATzseboncfB0dp/XL151//0j3/W7uHc2WNfwQq624Igt5WUMLzWgf9Jvnjyphsp9CQT
+hn2SM6OGGgxrI9kw/PqlGy/HmG+prRAcXaMjjTDepDtPumOOKeghuY9hgtvicBgGyXGY0WXoRawI
+ABLYOr+jYk6KWVGV1Dy6icvZAqMMu/7VAnvbFzdjN0yAjgHA0mseZukO4lnNv70zMI4BjrZgjOA7
+WqhZcZJde4aOAUDlfOz7r+6SYdd7OPJv51Si3AQp6CD9Hw65TytW/tCPwz9y/FyRb7r/Tu3pEFHx
+/g7pCbOR8SP7Le/DBNI7v+Uckl2VC2YdkQMmXAi/zfGm+t8hJ2U2tdQldr/5nwADACLM1IGrPYuL
+AAAAAElFTkSuQmCC
+--047d7b45041e19c68004eb9f3de8--
diff --git a/spec/fixtures/emails/auto_reply.eml b/spec/fixtures/emails/auto_reply.eml
new file mode 100644
index 0000000000..7999c8d78b
--- /dev/null
+++ b/spec/fixtures/emails/auto_reply.eml
@@ -0,0 +1,21 @@
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <jake@adventuretime.ooo>
+To: reply+636ca428858779856c226bb145ef4fad@appmail.adventuretime.ooo
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+Auto-Submitted: auto-generated
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+Test reply to Discourse email digest
diff --git a/spec/fixtures/emails/big5.eml b/spec/fixtures/emails/big5.eml
new file mode 100644
index 0000000000..4a7b208248
--- /dev/null
+++ b/spec/fixtures/emails/big5.eml
@@ -0,0 +1,26 @@
+
+Delivered-To: discourse-reply+cd480e301683c9902891f15968bf07a5@discourse.org
+Received: by 10.194.216.104 with SMTP id op8csp80593wjc;
+        Wed, 24 Jul 2013 07:59:14 -0700 (PDT)
+Return-Path: <walter.white@googlemail.com>
+References: <topic/5043@discourse.org> <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
+From: Walter White <walter.white@googlemail.com>
+In-Reply-To: <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
+Mime-Version: 1.0 (1.0)
+Date: Wed, 24 Jul 2013 15:59:10 +0100
+Message-ID: <4597127794206131679@unknownmsgid>
+Subject: Re: [Discourse] new reply to your post in 'Crystal Blue'
+To: walter via Discourse <reply+cd480e301683c9902891f15968bf07a5@appmail.adventuretime.ooo>
+Content-Type: multipart/alternative; boundary=20cf301cc47ada510404f040b262
+
+--20cf301cc47ada510404f040b262
+Content-Type: text/plain; charset=Big5
+Content-Transfer-Encoding: base64
+
+tv2hSafapFe5cbX4pEahSQ0K
+--20cf301cc47ada510404f040b262
+Content-Type: text/html; charset=Big5
+Content-Transfer-Encoding: base64
+
+PGRpdiBkaXI9Imx0ciI+tv2hSafapFe5cbX4pEahSTxicj48L2Rpdj4NCg==
+--20cf301cc47ada510404f040b262--
diff --git a/spec/fixtures/emails/bottom_reply.eml b/spec/fixtures/emails/bottom_reply.eml
new file mode 100644
index 0000000000..5fc992971f
--- /dev/null
+++ b/spec/fixtures/emails/bottom_reply.eml
@@ -0,0 +1,160 @@
+Received: by 10.107.19.29 with SMTP id b29csp111716ioj;
+        Wed, 30 Jul 2014 17:52:05 -0700 (PDT)
+X-Received: by 10.194.238.6 with SMTP id vg6mr11340975wjc.24.1406767925330;
+        Wed, 30 Jul 2014 17:52:05 -0700 (PDT)
+Received: from localhost (localhost [127.0.0.1])
+	by bendel.debian.org (Postfix) with QMQP
+	id 18F5C417; Thu, 31 Jul 2014 00:52:04 +0000 (UTC)
+Old-Return-Path: <vorlon@debian.org>
+X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on bendel.debian.org
+X-Spam-Level:
+X-Spam-Status: No, score=-25.9 required=4.0 tests=FOURLA,LDOSUBSCRIBER,
+	LDO_WHITELIST,MURPHY_DEBIAN_MESSAGE,PGPSIGNATURE autolearn=unavailable
+	version=3.3.2
+X-Original-To: lists-debian-ctte@bendel.debian.org
+Delivered-To: lists-debian-ctte@bendel.debian.org
+Received: from localhost (localhost [127.0.0.1])
+	by bendel.debian.org (Postfix) with ESMTP id CE6CDEE
+	for <lists-debian-ctte@bendel.debian.org>; Thu, 31 Jul 2014 00:51:52 +0000 (UTC)
+X-Virus-Scanned: at lists.debian.org with policy bank en-lt
+X-Amavis-Spam-Status: No, score=-11.9 tagged_above=-10000 required=5.3
+	tests=[BAYES_00=-2, FOURLA=0.1, LDO_WHITELIST=-5, PGPSIGNATURE=-5]
+	autolearn=ham
+Received: from bendel.debian.org ([127.0.0.1])
+	by localhost (lists.debian.org [127.0.0.1]) (amavisd-new, port 2525)
+	with ESMTP id SB451DwGZCOe for <lists-debian-ctte@bendel.debian.org>;
+	Thu, 31 Jul 2014 00:51:47 +0000 (UTC)
+X-policyd-weight:  NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .debian. - helo: .becquer.dodds. - helo-domain: .dodds.)  FROM/MX_MATCHES_NOT_HELO(DOMAIN)=0; rate: -5
+Received: from becquer.dodds.net (becquer.dodds.net [207.224.24.209])
+	by bendel.debian.org (Postfix) with ESMTP id 8E89A2B4
+	for <debian-ctte@lists.debian.org>; Thu, 31 Jul 2014 00:51:47 +0000 (UTC)
+Received: from virgil.dodds.net (unknown [192.168.15.59])
+	by becquer.dodds.net (Postfix) with ESMTPA id 9B0A9256EB
+	for <debian-ctte@lists.debian.org>; Wed, 30 Jul 2014 17:51:19 -0700 (PDT)
+Received: by virgil.dodds.net (Postfix, from userid 1000)
+	id 942FB60199; Wed, 30 Jul 2014 17:51:15 -0700 (PDT)
+Date: Wed, 30 Jul 2014 17:51:15 -0700
+From: Jake <jake@adventuretime.ooo>
+To: incoming+amazing@appmail.adventuretime.ooo
+Subject: Re: Next Debian CTTE IRC Meeting at date -d'Thu Jul 31 17:00:00 UTC
+ 2014'
+Message-ID: <20140731005115.GA19044@virgil.dodds.net>
+Mail-Followup-To: debian-ctte@lists.debian.org
+References: <20140730213924.GA12356@teltox.donarmstrong.com>
+MIME-Version: 1.0
+Content-Type: multipart/signed; micalg=pgp-sha256;
+	protocol="application/pgp-signature"; boundary="qMm9M+Fa2AknHoGS"
+Content-Disposition: inline
+In-Reply-To: <20140730213924.GA12356@teltox.donarmstrong.com>
+User-Agent: Mutt/1.5.23 (2014-03-12)
+X-Debian-Message: Signature check passed for Debian member
+X-Rc-Virus: 2007-09-13_01
+X-Rc-Spam: 2008-11-04_01
+Resent-Message-ID: <c_LGA2C2wUK.A.URD.zMZ2TB@bendel>
+Resent-From: debian-ctte@lists.debian.org
+X-Mailing-List: <debian-ctte@lists.debian.org> archive/latest/4791
+X-Loop: debian-ctte@lists.debian.org
+List-Id: <debian-ctte.lists.debian.org>
+List-Post: <mailto:debian-ctte@lists.debian.org>
+List-Help: <mailto:debian-ctte-request@lists.debian.org?subject=help>
+List-Subscribe: <mailto:debian-ctte-request@lists.debian.org?subject=subscribe>
+List-Unsubscribe: <mailto:debian-ctte-request@lists.debian.org?subject=unsubscribe>
+Precedence: list
+Resent-Sender: debian-ctte-request@lists.debian.org
+Resent-Date: Thu, 31 Jul 2014 00:52:04 +0000 (UTC)
+
+
+--qMm9M+Fa2AknHoGS
+Content-Type: text/plain; charset=us-ascii
+Content-Disposition: inline
+Content-Transfer-Encoding: quoted-printable
+
+On Wed, Jul 30, 2014 at 02:39:24PM -0700, Don Armstrong wrote:
+> The next Debian CTTE IRC meeting is at=20
+
+> date -d 'Thu Jul 31 17:00:00 UTC 2014' on irc.debian.org in
+> #debian-ctte.
+
+> The current meeting agenda is here, and more up-to-date ones may be
+> found in the git repository.
+
+> #startmeeting
+
+> #topic Who is here?
+
+> #topic Next Meeting?
+
+> #topic #717076 Decide between libjpeg-turbo and libjpeg8 et al.
+
+This has been voted on; should probably be removed from the agenda, someone
+just needs to confirm the vote results and get it on the website.  (AIUI the
+archive has already begun moving on accordingly.)
+
+> #topic #636783 constitution: super-majority bug
+
+> #topic #636783 constitution: casting vote
+
+> #topic #636783 constitution: minimum discussion period
+
+> #topic #636783 constitution: TC member retirement/rollover
+
+> #topic #636783 constitution: TC chair retirement/rollover
+
+> #topic #681419 Depends: foo | foo-nonfree
+
+> #topic #741573 menu systems and mime-support
+
+> #topic #746715 init system fallout
+
+Also voted and just needs to be confirmed.
+
+> #topic #750135 Maintainer of aptitude package
+>=20
+> #topic #752400 Advice on util-linux
+
+This has been closed by mutual agreement of the people involved and doesn't
+require any action from the TC.  Removed from the agenda.
+
+There's also bug #744246, which was assigned to the TC at my request but
+without any preamble so it may have escaped notice.  However, that situation
+has been evolving constructively among the related parties (apparently, an
+informal comment from a member of the release team was mistaken for a
+release team position, so that's now being revisited), so I don't believe
+this is anything we need to put on the agenda for tomorrow despite being on
+the open bug list.
+
+--=20
+Steve Langasek                   Give me a lever long enough and a Free OS
+Debian Developer                   to set it on, and I can move the world.
+Ubuntu Developer                                    http://www.debian.org/
+slangasek@ubuntu.com                                     vorlon@debian.org
+
+--qMm9M+Fa2AknHoGS
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: Digital signature
+
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAEBCAAGBQJT2ZMDAAoJEFaNMPMhshM9GLsP/244S3wtYZEeVgJWIdB5PE0A
+sZVezEA692y++/0oVZVecwV67yBOyfSjPPetdAph2UDMRtfurwxfj2BkbOFA2+Y6
+++MErbmC3V7IGpd/L/fFGdXgvMQT2MNBpw0fnMA7bLpNjCvoj+Hr1HXRUcWoJSlj
+WmHWwWSTVRcHg8a3iWYJzY6XfLyEEgHlahrlKvJExsTx/9mc1qg7g8KGdnhzHFBl
+ttdH2fxpAk/624dReCcw5RKmOLfZ1HsEl9XcVe1cb4K+MDaQiXmoEK5v3xaNz1tS
+NK5v2D5gDs229zoxKzQnnzOPLHxqI5E0L9PpI/mu4T9z7H2bHR3U5BvhnT99t5uw
+ydf2cZNGY0uFCV3Rvn07BfAIW5WSXhOfN/5IymRKmdhjsTiwZ/wFjFrK8tVjtERu
+yeyA7RIYiblGCEKYIYLWSxhoXeEdmAdfp6EA2/IA1CpgMB+ZdSfaeMgFY7xosgmG
+ax3NTnaKyhr1QEUJ2gjAwHnKjuGbRVDAinYrSvP0o8Bh9sAs2BN2negWBCZVwwkN
+S9hWTjVqsBmpaPOt5SEDwDo9O9dfzkmaamDsxOuUEz9F7v5jYg0mxA/WbogGty9R
+vOMKxdxRkzflL/CferVbkzL/EkZRDfWDp9SleZggrpz7miiNDbS7jdRzJ4EttmJ8
+gHBAVrOzcnbIPOIkk9pw
+=KXIu
+-----END PGP SIGNATURE-----
+
+--qMm9M+Fa2AknHoGS--
+
+
+--
+To UNSUBSCRIBE, email to debian-ctte-REQUEST@lists.debian.org
+with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
+Archive: https://lists.debian.org/20140731005115.GA19044@virgil.dodds.net
diff --git a/spec/fixtures/emails/boundary.eml b/spec/fixtures/emails/boundary.eml
new file mode 100644
index 0000000000..1250fe498b
--- /dev/null
+++ b/spec/fixtures/emails/boundary.eml
@@ -0,0 +1,61 @@
+
+MIME-Version: 1.0
+Received: by 10.64.14.41 with HTTP; Wed, 19 Jun 2013 06:29:41 -0700 (PDT)
+In-Reply-To: <51c19490e928a_13442dd8ae892548@tree.mail>
+References: <51c19490e928a_13442dd8ae892548@tree.mail>
+Date: Wed, 19 Jun 2013 09:29:41 -0400
+Delivered-To: finn@adventuretime.ooo
+Message-ID: <CADkmRcL=2aPV7jOcs2i00QGZNwmjYj3qMaJTsKnB7DTP5sgyFQ@mail.gmail.com>
+Subject: Re: [Adventure Time] jake mentioned you in 'peppermint butler is
+ missing'
+From: Finn the Human <finn@adventuretime.ooo>
+To: jake via Adventure Time <reply+96dcd9072ba9072d06226009d4223a6e@appmail.adventuretime.ooo>
+Content-Type: multipart/alternative; boundary=001a11c206a073876a04df81d2a9
+
+--001a11c206a073876a04df81d2a9
+Content-Type: text/plain; charset=ISO-8859-1
+
+I'll look into it, thanks!
+
+
+On Wednesday, June 19, 2013, jake via Discourse wrote:
+
+> jake mentioned you in 'peppermint butler is missing' on Adventure
+> Time:
+> ------------------------------
+>
+> yeah, just noticed this cc @jake
+> ------------------------------
+>
+> Please visit this link to respond:
+> http://adventuretime.ooo/t/peppermint-butler-is-missing/7628/2
+>
+> To unsubscribe from these emails, visit your user preferences
+> <http://adventuretime.ooo/user_preferences>.
+>
+
+--001a11c206a073876a04df81d2a9
+Content-Type: text/html; charset=ISO-8859-1
+Content-Transfer-Encoding: quoted-printable
+
+I&#39;ll look into it, thanks!<span></span><br><br>On Wednesday, June 19, 2=
+013, jake via Adventure Time  wrote:<br><blockquote class=3D"gmail_quote" st=
+yle=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><p>sa=
+m mentioned you in &#39;Duplicate message are shown in profile&#39; on Adve=
+nture Time</p>
+
+
+<hr><p>yeah, just noticed this cc <a href=3D"http://users/eviltrout" target=
+=3D"_blank">@eviltrout</a> </p>
+
+<hr><p>Please visit this link to respond: <a href=3D"http://adventuretime.oo=
+o/t/duplicate-message-are-shown-in-profile/7628/2" target=3D"_blank">http=
+://adventuretime.ooo/t/peppermint-butler-is-missing/7628/2</a></=
+p>
+
+
+<p>To unsubscribe from these emails, visit your <a href=3D"http://adventuret=
+ime.ooo/user_preferences" target=3D"_blank">user preferences</a>.</p>
+</blockquote>
+
+--001a11c206a073876a04df81d2a9--
diff --git a/spec/fixtures/emails/dutch.eml b/spec/fixtures/emails/dutch.eml
new file mode 100644
index 0000000000..7be08dc493
--- /dev/null
+++ b/spec/fixtures/emails/dutch.eml
@@ -0,0 +1,20 @@
+
+Delivered-To: discourse-reply+cd480e301683c9902891f15968bf07a5@discourse.org
+Received: by 10.194.216.104 with SMTP id op8csp80593wjc;
+        Wed, 24 Jul 2013 07:59:14 -0700 (PDT)
+Return-Path: <walter.white@googlemail.com>
+References: <topic/5043@discourse.org> <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
+From: Walter White <walter.white@googlemail.com>
+In-Reply-To: <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
+Mime-Version: 1.0 (1.0)
+Date: Wed, 24 Jul 2013 15:59:10 +0100
+Message-ID: <4597127794206131679@unknownmsgid>
+Subject: Re: [Discourse] new reply to your post in 'Crystal Blue'
+To: walter via Discourse <reply+cd480e301683c9902891f15968bf07a5@appmail.adventuretime.ooo>
+Content-Type: multipart/alternative; boundary=001a11c20edc15a39304e2432790
+
+Dit is een antwoord in het Nederlands.
+
+Op 18 juli 2013 10:23 schreef Sander Datema het volgende:
+
+Dit is de originele post.
\ No newline at end of file
diff --git a/spec/fixtures/emails/empty.eml b/spec/fixtures/emails/empty.eml
new file mode 100644
index 0000000000..85bebc6624
--- /dev/null
+++ b/spec/fixtures/emails/empty.eml
@@ -0,0 +1,21 @@
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <jake@adventuretime.ooo>
+To: reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+
+
diff --git a/spec/fixtures/emails/gmail_web.eml b/spec/fixtures/emails/gmail_web.eml
new file mode 100644
index 0000000000..8bb8383571
--- /dev/null
+++ b/spec/fixtures/emails/gmail_web.eml
@@ -0,0 +1,181 @@
+Delivered-To: reply@discourse.org
+Return-Path: <walter.white@googlemail.com>
+MIME-Version: 1.0
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+References: <topic/22638@meta.discourse.org>
+  <topic/22638/86406@meta.discourse.org>
+Date: Fri, 28 Nov 2014 12:36:49 -0800
+Subject: Re: [Discourse Meta] [Lounge] Testing default email replies
+From: Walter White <walter.white@googlemail.com>
+To: Discourse Meta <reply@discourse.org>
+Content-Type: multipart/alternative; boundary=001a11c2e04e6544f30508f138ba
+
+--001a11c2e04e6544f30508f138ba
+Content-Type: text/plain; charset=UTF-8
+
+### This is a reply from standard GMail in Google Chrome.
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog.
+
+Here's some **bold** text in Markdown.
+
+Here's a link http://example.com
+
+On Fri, Nov 28, 2014 at 12:35 PM, Arpit Jalan <info@discourse.org> wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+--001a11c2e04e6544f30508f138ba
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr"><div>### This is a reply from standard GMail in Google Chr=
+ome.</div><div><br></div><div>The quick brown fox jumps over the lazy dog. =
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over=
+ the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown=
+ fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. =
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over=
+ the lazy dog.=C2=A0</div><div><br></div><div>Here&#39;s some **bold** text=
+ in Markdown.</div><div><br></div><div>Here&#39;s a link <a href=3D"http://=
+example.com">http://example.com</a></div></div><div class=3D"gmail_extra"><=
+br><div class=3D"gmail_quote">On Fri, Nov 28, 2014 at 12:35 PM, Arpit Jalan=
+ <span dir=3D"ltr">&lt;<a href=3D"mailto:info@discourse.org" target=3D"_bla=
+nk">info@discourse.org</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_=
+quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1=
+ex"><div>
+
+<table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" bor=
+der=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/techapj/45/3281.png" title=3D"techAPJ" style=3D"max-wi=
+dth:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/techapj" style=3D"text-=
+decoration:none;font-weight:bold;color:#006699;font-size:13px;font-family:&=
+#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;text-d=
+ecoration:none;font-weight:bold" target=3D"_blank">techAPJ</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">Test reply.</p>
+
+<p style=3D"margin-top:0;border:0">First paragraph.</p>
+
+<p style=3D"margin-top:0;border:0">Second paragraph.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+  <div style=3D"color:#666">
+    <p>To respond, reply to this email or visit <a href=3D"https://meta.dis=
+course.org/t/testing-default-email-replies/22638/3" style=3D"text-decoratio=
+n:none;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https:/=
+/meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your bro=
+wser.</p>
+  </div>
+  <hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-c=
+olor:#ddd;min-height:1px;border:1px">
+  <h4>Previous Replies</h4>
+
+  <table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" b=
+order=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/codinghorror/45/5297.png" title=3D"codinghorror" style=
+=3D"max-width:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/codinghorror" style=3D"=
+text-decoration:none;font-weight:bold;color:#006699;font-size:13px;font-fam=
+ily:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;t=
+ext-decoration:none;font-weight:bold" target=3D"_blank">codinghorror</a><br=
+>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">We&#39;re testing the latest GitHub emai=
+l processing library which we are integrating now.</p>
+
+<p style=3D"margin-top:0;border:0"><a href=3D"https://github.com/github/ema=
+il_reply_parser" style=3D"text-decoration:none;font-weight:bold;color:#0066=
+99" target=3D"_blank">https://github.com/github/email_reply_parser</a></p>
+
+<p style=3D"margin-top:0;border:0">Go ahead and reply to this topic and I&#=
+39;ll reply from various email clients for testing.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-col=
+or:#ddd;min-height:1px;border:1px">
+
+<div style=3D"color:#666">
+<p>To respond, reply to this email or visit <a href=3D"https://meta.discour=
+se.org/t/testing-default-email-replies/22638/3" style=3D"text-decoration:no=
+ne;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https://met=
+a.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser=
+.</p>
+</div>
+<div style=3D"color:#666">
+<p>To unsubscribe from these emails, visit your <a href=3D"https://meta.dis=
+course.org/my/preferences" style=3D"text-decoration:none;font-weight:bold;c=
+olor:#006699;color:#666" target=3D"_blank">user preferences</a>.</p>
+</div>
+</div>
+</blockquote></div><br></div>
+
+--001a11c2e04e6544f30508f138ba--
diff --git a/spec/fixtures/emails/hebrew.eml b/spec/fixtures/emails/hebrew.eml
new file mode 100644
index 0000000000..f4c8f01adc
--- /dev/null
+++ b/spec/fixtures/emails/hebrew.eml
@@ -0,0 +1,17 @@
+
+Delivered-To: discourse-reply+cd480e301683c9902891f15968bf07a5@discourse.org
+Received: by 10.194.216.104 with SMTP id op8csp80593wjc;
+        Wed, 24 Jul 2013 07:59:14 -0700 (PDT)
+Return-Path: <walter.white@googlemail.com>
+References: <topic/5043@discourse.org> <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
+From: Walter White <walter.white@googlemail.com>
+In-Reply-To: <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
+Mime-Version: 1.0 (1.0)
+Date: Wed, 24 Jul 2013 15:59:10 +0100
+Message-ID: <4597127794206131679@unknownmsgid>
+Subject: Re: [Discourse] new reply to your post in 'Crystal Blue'
+To: walter via Discourse <reply+cd480e301683c9902891f15968bf07a5@appmail.adventuretime.ooo>
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: base64
+
+16nXnNeV150=
\ No newline at end of file
diff --git a/spec/fixtures/emails/html_only.eml b/spec/fixtures/emails/html_only.eml
new file mode 100644
index 0000000000..561b8db2c7
--- /dev/null
+++ b/spec/fixtures/emails/html_only.eml
@@ -0,0 +1,93 @@
+
+Delivered-To: walter@breakingbad.com
+Received: by 10.64.13.41 with SMTP id m9csp29769iec;
+        Thu, 20 Jun 2013 08:53:22 -0700 (PDT)
+X-Received: by 10.252.23.9 with SMTP id p9mr4055675lag.4.1371743601980;
+        Thu, 20 Jun 2013 08:53:21 -0700 (PDT)
+Received: from mail-la0-x229.google.com (mail-la0-x229.google.com [2a00:1450:4010:c03::229])
+        by mx.google.com with ESMTPS id u4si430203lae.48.2013.06.20.08.53.20
+        for <walter@breakingbad.com>
+        (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
+        Thu, 20 Jun 2013 08:53:21 -0700 (PDT)
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+        d=google.com; s=20120113;
+        h=x-forwarded-to:x-forwarded-for:delivered-to:x-return-path
+         :content-type:mime-version:content-transfer-encoding:x-mailer
+         :message-id:date:subject:from:in-reply-to:to:resent-date:resent-from
+         :resent-to:resent-subject:resent-message-id:resent-user-agent
+         :x-scanned-by:x-gm-message-state;
+        bh=9O67r74ofh9WkEaKTRB/frQ3MKOtQlbCac2mz0/MiyY=;
+        b=YVAo2/JDMP53RxDmqDEKNcEMtggtfaVyq2DoseZ6vBAfB7G6NtHC9ZEkRs4oGhk6LU
+         fnyAPe0wnz5d9WINoMAuuTRIhplLxzcqysduSnAJAQ2qqR7mFBnlj9wJeVEKltNwmUME
+         nPwxsf8go20VBzrZCtECPedcLi60wbl32NCXVn0qwt2LvKiy6ktSS5Xgb4zY8i4dfXAP
+         6Y5gu32boooWIb9DkH1TJkn3C0RrEugNlw/DUnXrnkFefgxWF3pt/zcoW/wYRyikOdx+
+         smBClgR9my6QmsS2KsQrMvWJZUva7fddTiZ6FC22e4hW+8Wha0RaZOZu5O7hjg6G4/1g
+         IEyg==
+X-Received: by 10.112.55.9 with SMTP id n9mr5916187lbp.5.1371743600857;
+        Thu, 20 Jun 2013 08:53:20 -0700 (PDT)
+X-Forwarded-To: walter@breakingbad.com
+X-Forwarded-For: walter@breakingbad.com
+Delivered-To: walter@breakingbad.com
+Content-Type: text/html; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+X-Mailer: BlackBerry Email (10.1.0.1720)
+Message-ID: <20130619231548.6307981.74194.2379@breakingbad.com>
+Date: Wed, 19 Jun 2013 19:15:48 -0400
+Subject: Re: [Discourse Meta] [PM] re: Regarding your post in "Site
+ Customization not working"
+From: aaron@breakingbad.com
+In-Reply-To: <51c238655a394_5f4e3ce6690667bd@tiefighter2.mail>
+To: reply+20c1b0a8bd1a63c0163cc7e7641ca06b@appmail.adventuretime.ooo
+ReSent-Date: Thu, 20 Jun 2013 11:53:08 -0400 (EDT)
+ReSent-From: Aaron <aaron@breakingbad.com>
+ReSent-Subject: Re: [Discourse Meta] [PM] re: Regarding your post in "Site
+ Customization not working"
+X-Gm-Message-State: ALoCoQl1BtN83rAX7At808XAPv1yCqUK3Du2IvK7eCyY3jsI77u4e5cak28307pYYHAo1JlO/Eu9
+
+<html><head></head><body data-blackberry-caret-color=3D"#00a8df" style=3D"b=
+ackground-color: rgb(255, 255, 255); line-height: initial;"><div id=3D"BB10=
+_response_div" style=3D"width: 100%; font-size: initial; font-family: Calib=
+ri, 'Slate Pro', sans-serif; color: rgb(31, 73, 125); text-align: initial; =
+background-color: rgb(255, 255, 255);">The EC2 instance - I've seen that th=
+ere tends to be odd and unrecommended settings on the Bitnami installs that=
+ I've checked out.</div>                                                   =
+                                                                           =
+       <div id=3D"response_div_spacer" style=3D"width: 100%; font-size: ini=
+tial; font-family: Calibri, 'Slate Pro', sans-serif; color: rgb(31, 73, 125=
+); text-align: initial; background-color: rgb(255, 255, 255);"><br style=3D=
+"display:initial"></div>                                                   =
+                                                                           =
+       <div id=3D"_signaturePlaceholder" style=3D"font-size: initial; font-=
+family: Calibri, 'Slate Pro', sans-serif; color: rgb(31, 73, 125); text-ali=
+gn: initial; background-color: rgb(255, 255, 255);"></div>                 =
+                                                                           =
+                                                                           =
+                 <table width=3D"100%" style=3D"background-color:white;bord=
+er-spacing:0px;"> <tbody><tr><td id=3D"_persistentHeaderContainer" colspan=
+=3D"2" style=3D"font-size: initial; text-align: initial; background-color: =
+rgb(255, 255, 255);">                                              <div id=
+=3D"_persistentHeader" style=3D"border-style: solid none none; border-top-c=
+olor: rgb(181, 196, 223); border-top-width: 1pt; padding: 3pt 0in 0in; font=
+-family: Tahoma, 'BB Alpha Sans', 'Slate Pro'; font-size: 10pt;">  <div><b>=
+From: </b>Grizzly B  via Discourse Meta</div><div><b>Sent: </b>Wednesday, J=
+une 19, 2013 19:02</div><div><b>To: </b>aaron@breakingbad.com</div><div><b>=
+Reply To: </b>Grizzly B  via Discourse Meta</div><div><b>Subject: </b>[Disc=
+ourse Meta] [PM] re: Regarding your post in "Site Customization<br> not wor=
+king"</div></div></td></tr></tbody></table><div id=3D"_persistentHeaderEnd"=
+ style=3D"border-style: solid none none; border-top-color: rgb(186, 188, 20=
+9); border-top-width: 1pt; font-size: initial; text-align: initial; backgro=
+und-color: rgb(255, 255, 255);"></div><br><div id=3D"_originalContent" styl=
+e=3D""><p>Grizzly B just sent you a private message</p>
+
+<hr><p>Log in to our EC2 instance -or- log into a new Digital Ocean instanc=
+e?</p>
+
+<hr><p>Please visit this link to respond: <a href=3D"http://meta.discourse.=
+org/t/regarding-your-post-in-site-customization-not-working/7641/5">http://=
+meta.discourse.org/t/regarding-your-post-in-site-customization-not-working/=
+7641/5</a></p>
+
+<p>To unsubscribe from these emails, visit your <a href=3D"http://meta.disc=
+ourse.org/user_preferences">user preferences</a>.</p>
+<br><!--end of _originalContent --></div></body></html>
diff --git a/spec/fixtures/emails/html_paragraphs.eml b/spec/fixtures/emails/html_paragraphs.eml
new file mode 100644
index 0000000000..3fe37fb8b1
--- /dev/null
+++ b/spec/fixtures/emails/html_paragraphs.eml
@@ -0,0 +1,205 @@
+
+MIME-Version: 1.0
+Received: by 10.25.161.144 with HTTP; Tue, 7 Oct 2014 22:17:17 -0700 (PDT)
+X-Originating-IP: [117.207.85.84]
+In-Reply-To: <5434c8b52bb3a_623ff09fec70f049749@discourse-app.mail>
+References: <topic/35@discourse.techapj.com>
+  <5434c8b52bb3a_623ff09fec70f049749@discourse-app.mail>
+Date: Wed, 8 Oct 2014 10:47:17 +0530
+Delivered-To: arpit@techapj.com
+Message-ID: <CAOJeqne=SJ_LwN4sb-0Y95ejc2OpreVhdmcPn0TnmwSvTCYzzQ@mail.gmail.com>
+Subject: Re: [Discourse] [Meta] Welcome to techAPJ's Discourse!
+From: Arpit Jalan <arpit@techapj.com>
+To: Discourse <mail+e1c7f2a380e33840aeb654f075490bad@arpitjalan.com>
+Content-Type: multipart/alternative; boundary=001a114119d8f4e46e0504e26d5b
+
+--001a114119d8f4e46e0504e26d5b
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Awesome!
+
+Pleasure to have you here!
+
+:boom:
+
+On Wed, Oct 8, 2014 at 10:46 AM, ajalan <info@unconfigured.discourse.org>
+wrote:
+
+>     ajalan
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoiVXgxTTZ3eHpuRWF2QXVoZGRJZVN5MWI0WnhrIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3VzZXJzXFxcL2FqYWxhblwiLFwiaWRcIjpcIjgyNWI5MDYzZWNmMDRkMjk5OTE4Nzk1MmU=
+5YjY2YjE3XCIsXCJ1cmxfaWRzXCI6W1wiNzA3MTNjNTg4MDI3YWQyM2RiM2QwOTVhOGQwYmY4ZT=
+YyMzNjYThiMFwiXX0ifQ>
+> October 8
+>
+> Nice to be here! Thanks! [image: smile]
+>
+> To respond, reply to this email or visit
+> http://discourse.techapj.com/t/welcome-to-techapjs-discourse/35/2
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoid1IyWnVqVGRPU2RwLUlFR0Q5QnI1a203eVNjIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3RcXFwvd2VsY29tZS10by10ZWNoYXBqcy1kaXNjb3Vyc2VcXFwvMzVcXFwvMlwiLFwiaWR=
+cIjpcIjgyNWI5MDYzZWNmMDRkMjk5OTE4Nzk1MmU5YjY2YjE3XCIsXCJ1cmxfaWRzXCI6W1wiY2=
+RkYzFlZjc5OThhNzE1ODA4Yjg0MGFlNzVlZmNiYmYzYmViODk4Y1wiXX0ifQ>
+> in your browser.
+>  ------------------------------
+> Previous Replies    techAPJ
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoia2x3LUxac2RSX25uWEFYYWcwVDVha3pIY3RjIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3VzZXJzXFxcL3RlY2hhcGpcIixcImlkXCI6XCI4MjViOTA2M2VjZjA0ZDI5OTkxODc5NTJ=
+lOWI2NmIxN1wiLFwidXJsX2lkc1wiOltcIjk2ZjAyMzVhNmM2NzIyNmU1NjhhMzU1NDE1OTAxNz=
+AyYTkxNjM1NzJcIl19In0>
+> October 8
+>
+> Welcome to techAPJ's Discourse!
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> http://discourse.techapj.com/t/welcome-to-techapjs-discourse/35/2
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoid1IyWnVqVGRPU2RwLUlFR0Q5QnI1a203eVNjIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3RcXFwvd2VsY29tZS10by10ZWNoYXBqcy1kaXNjb3Vyc2VcXFwvMzVcXFwvMlwiLFwiaWR=
+cIjpcIjgyNWI5MDYzZWNmMDRkMjk5OTE4Nzk1MmU5YjY2YjE3XCIsXCJ1cmxfaWRzXCI6W1wiY2=
+RkYzFlZjc5OThhNzE1ODA4Yjg0MGFlNzVlZmNiYmYzYmViODk4Y1wiXX0ifQ>
+> in your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoiVTNudkpobl9lUUl0cmdsVVRrcm5iaHpyN0JZIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL215XFxcL3ByZWZlcmVuY2VzXCIsXCJpZFwiOlwiODI1YjkwNjNlY2YwNGQyOTk5MTg3OTU=
+yZTliNjZiMTdcIixcInVybF9pZHNcIjpbXCI0OTIyMmMyZDgyNzUwMmQyMGZjYzU4MTZkNjhmYT=
+k3NzFkY2YzZDllXCJdfSJ9>
+> .
+>
+
+--001a114119d8f4e46e0504e26d5b
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr">Awesome!<div><br></div><div>Pleasure to have you here!</di=
+v><div><br></div><div>:boom:</div></div><div class=3D"gmail_extra"><br><div=
+ class=3D"gmail_quote">On Wed, Oct 8, 2014 at 10:46 AM, ajalan <span dir=3D=
+"ltr">&lt;<a href=3D"mailto:info@unconfigured.discourse.org" target=3D"_bla=
+nk">info@unconfigured.discourse.org</a>&gt;</span> wrote:<br><blockquote cl=
+ass=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;p=
+adding-left:1ex"><div>
+
+<table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cellp=
+adding=3D"0" border=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"http://discourse.techapj.com/user_avatar/discourse.tech=
+apj.com/ajalan/45/35.png" title=3D"ajalan" style=3D"max-width:694px" width=
+=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"http://mandrillapp.com/track/click/30081177/discourse.te=
+chapj.com?p=3DeyJzIjoiVXgxTTZ3eHpuRWF2QXVoZGRJZVN5MWI0WnhrIiwidiI6MSwicCI6I=
+ntcInVcIjozMDA4MTE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNl=
+LnRlY2hhcGouY29tXFxcL3VzZXJzXFxcL2FqYWxhblwiLFwiaWRcIjpcIjgyNWI5MDYzZWNmMDR=
+kMjk5OTE4Nzk1MmU5YjY2YjE3XCIsXCJ1cmxfaWRzXCI6W1wiNzA3MTNjNTg4MDI3YWQyM2RiM2=
+QwOTVhOGQwYmY4ZTYyMzNjYThiMFwiXX0ifQ" style=3D"font-size:13px;font-family:&=
+#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;text-d=
+ecoration:none;font-weight:bold;text-decoration:none;font-weight:bold;color=
+:#006699" target=3D"_blank">ajalan</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">October 8</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2"><p style=3D"margin-top:0;=
+border:0">Nice to be here! Thanks! <img src=3D"http://discourse.techapj.com=
+/plugins/emoji/images/smile.png" title=3D":smile:" alt=3D"smile" width=3D"2=
+0" height=3D"20"></p></td>
+    </tr>
+  </tbody>
+</table>
+
+
+  <div style=3D"color:#666">
+    <p>To respond, reply to this email or visit <a href=3D"http://mandrilla=
+pp.com/track/click/30081177/discourse.techapj.com?p=3DeyJzIjoid1IyWnVqVGRPU=
+2RwLUlFR0Q5QnI1a203eVNjIiwidiI6MSwicCI6IntcInVcIjozMDA4MTE3NyxcInZcIjoxLFwi=
+dXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29tXFxcL3RcXFwvd2VsY29=
+tZS10by10ZWNoYXBqcy1kaXNjb3Vyc2VcXFwvMzVcXFwvMlwiLFwiaWRcIjpcIjgyNWI5MDYzZW=
+NmMDRkMjk5OTE4Nzk1MmU5YjY2YjE3XCIsXCJ1cmxfaWRzXCI6W1wiY2RkYzFlZjc5OThhNzE1O=
+DA4Yjg0MGFlNzVlZmNiYmYzYmViODk4Y1wiXX0ifQ" style=3D"color:#666;text-decorat=
+ion:none;font-weight:bold;color:#006699" target=3D"_blank">http://discourse=
+.techapj.com/t/welcome-to-techapjs-discourse/35/2</a> in your browser.</p>
+  </div>
+  <hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-c=
+olor:#ddd;min-height:1px;border:1px">
+  <h4>Previous Replies</h4>
+
+  <table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cel=
+lpadding=3D"0" border=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"http://discourse.techapj.com/user_avatar/discourse.tech=
+apj.com/techapj/45/34.png" title=3D"techAPJ" style=3D"max-width:694px" widt=
+h=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"http://mandrillapp.com/track/click/30081177/discourse.te=
+chapj.com?p=3DeyJzIjoia2x3LUxac2RSX25uWEFYYWcwVDVha3pIY3RjIiwidiI6MSwicCI6I=
+ntcInVcIjozMDA4MTE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNl=
+LnRlY2hhcGouY29tXFxcL3VzZXJzXFxcL3RlY2hhcGpcIixcImlkXCI6XCI4MjViOTA2M2VjZjA=
+0ZDI5OTkxODc5NTJlOWI2NmIxN1wiLFwidXJsX2lkc1wiOltcIjk2ZjAyMzVhNmM2NzIyNmU1Nj=
+hhMzU1NDE1OTAxNzAyYTkxNjM1NzJcIl19In0" style=3D"font-size:13px;font-family:=
+&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;text-=
+decoration:none;font-weight:bold;text-decoration:none;font-weight:bold;colo=
+r:#006699" target=3D"_blank">techAPJ</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">October 8</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2"><p style=3D"margin-top:0;=
+border:0">Welcome to techAPJ&#39;s Discourse!</p></td>
+    </tr>
+  </tbody>
+</table>
+
+
+<hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-col=
+or:#ddd;min-height:1px;border:1px">
+
+<div style=3D"color:#666">
+<p>To respond, reply to this email or visit <a href=3D"http://mandrillapp.c=
+om/track/click/30081177/discourse.techapj.com?p=3DeyJzIjoid1IyWnVqVGRPU2RwL=
+UlFR0Q5QnI1a203eVNjIiwidiI6MSwicCI6IntcInVcIjozMDA4MTE3NyxcInZcIjoxLFwidXJs=
+XCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29tXFxcL3RcXFwvd2VsY29tZS1=
+0by10ZWNoYXBqcy1kaXNjb3Vyc2VcXFwvMzVcXFwvMlwiLFwiaWRcIjpcIjgyNWI5MDYzZWNmMD=
+RkMjk5OTE4Nzk1MmU5YjY2YjE3XCIsXCJ1cmxfaWRzXCI6W1wiY2RkYzFlZjc5OThhNzE1ODA4Y=
+jg0MGFlNzVlZmNiYmYzYmViODk4Y1wiXX0ifQ" style=3D"color:#666;text-decoration:=
+none;font-weight:bold;color:#006699" target=3D"_blank">http://discourse.tec=
+hapj.com/t/welcome-to-techapjs-discourse/35/2</a> in your browser.</p>
+</div><span class=3D"">
+<div style=3D"color:#666">
+<p>To unsubscribe from these emails, visit your <a href=3D"http://mandrilla=
+pp.com/track/click/30081177/discourse.techapj.com?p=3DeyJzIjoiVTNudkpobl9lU=
+Ul0cmdsVVRrcm5iaHpyN0JZIiwidiI6MSwicCI6IntcInVcIjozMDA4MTE3NyxcInZcIjoxLFwi=
+dXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29tXFxcL215XFxcL3ByZWZ=
+lcmVuY2VzXCIsXCJpZFwiOlwiODI1YjkwNjNlY2YwNGQyOTk5MTg3OTUyZTliNjZiMTdcIixcIn=
+VybF9pZHNcIjpbXCI0OTIyMmMyZDgyNzUwMmQyMGZjYzU4MTZkNjhmYTk3NzFkY2YzZDllXCJdf=
+SJ9" style=3D"color:#666;text-decoration:none;font-weight:bold;color:#00669=
+9" target=3D"_blank">user preferences</a>.</p>
+</div>
+</span></div>
+
+<img src=3D"http://mandrillapp.com/track/open.php?u=3D30081177&amp;id=3D825=
+b9063ecf04d2999187952e9b66b17" height=3D"1" width=3D"1"></blockquote></div>=
+<br></div>
+
+--001a114119d8f4e46e0504e26d5b--
diff --git a/spec/fixtures/emails/inline_reply.eml b/spec/fixtures/emails/inline_reply.eml
new file mode 100644
index 0000000000..39625a225d
--- /dev/null
+++ b/spec/fixtures/emails/inline_reply.eml
@@ -0,0 +1,60 @@
+
+MIME-Version: 1.0
+In-Reply-To: <reply@discourse-app.mail>
+References: <topic/36@discourse.techapj.com>
+  <5434ced4ee0f9_663fb0b5f76070593b@discourse-app.mail>
+Date: Mon, 1 Dec 2014 20:48:40 +0530
+Delivered-To: someone@googlemail.com
+Subject: Re: [Discourse] [Meta] Testing reply via email
+From: Walter White <walter.white@googlemail.com>
+To: Discourse <reply@mail.com>
+Content-Type: multipart/alternative; boundary=20cf30363f8522466905092920a6
+
+--20cf30363f8522466905092920a6
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+On Wed, Oct 8, 2014 at 11:12 AM, techAPJ <info@unconfigured.discourse.org>
+wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog.
+
+--20cf30363f8522466905092920a6--
diff --git a/spec/fixtures/emails/ios_default.eml b/spec/fixtures/emails/ios_default.eml
new file mode 100644
index 0000000000..8d4d58feb1
--- /dev/null
+++ b/spec/fixtures/emails/ios_default.eml
@@ -0,0 +1,136 @@
+Delivered-To: reply@discourse.org
+Return-Path: <walter.white@googlemail.com>
+From: Walter White <walter.white@googlemail.com>
+Content-Type: multipart/alternative;
+  boundary=Apple-Mail-B41C7F8E-3639-49B0-A5D5-440E125A7105
+Content-Transfer-Encoding: 7bit
+Mime-Version: 1.0 (1.0)
+Subject: Re: [Discourse Meta] [Lounge] Testing default email replies
+Date: Fri, 28 Nov 2014 12:41:41 -0800
+References: <topic/22638@meta.discourse.org> <topic/22638/86406@meta.discourse.org>
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+To: Discourse Meta <reply@discourse.org>
+X-Mailer: iPhone Mail (12B436)
+
+
+--Apple-Mail-B41C7F8E-3639-49B0-A5D5-440E125A7105
+Content-Type: text/plain;
+  charset=us-ascii
+Content-Transfer-Encoding: quoted-printable
+
+### this is a reply from iOS default mail
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over t=
+he lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fo=
+x jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The q=
+uick brown fox jumps over the lazy dog. The quick brown fox jumps over the l=
+azy dog.=20
+
+Here's some **bold** markdown text.
+
+Here's a link http://example.com
+
+
+> On Nov 28, 2014, at 12:35 PM, Arpit Jalan <info@discourse.org> wrote:
+>=20
+>=20
+> 	techAPJ
+> November 28
+> Test reply.
+>=20
+> First paragraph.
+>=20
+> Second paragraph.
+>=20
+> To respond, reply to this email or visit https://meta.discourse.org/t/test=
+ing-default-email-replies/22638/3 in your browser.
+>=20
+> Previous Replies
+>=20
+> 	codinghorror
+> November 28
+> We're testing the latest GitHub email processing library which we are inte=
+grating now.
+>=20
+> https://github.com/github/email_reply_parser
+>=20
+> Go ahead and reply to this topic and I'll reply from various email clients=
+ for testing.
+>=20
+> To respond, reply to this email or visit https://meta.discourse.org/t/test=
+ing-default-email-replies/22638/3 in your browser.
+>=20
+> To unsubscribe from these emails, visit your user preferences.
+
+--Apple-Mail-B41C7F8E-3639-49B0-A5D5-440E125A7105
+Content-Type: text/html;
+  charset=utf-8
+Content-Transfer-Encoding: 7bit
+
+<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body dir="auto"><div>### this is a reply from iOS default mail</div><div><br></div><div>The quick brown fox jumps over the lazy dog.&nbsp;<span style="background-color: rgba(255, 255, 255, 0);">The quick brown fox jumps over the lazy dog.&nbsp;The quick brown fox jumps over the lazy dog.&nbsp;The quick brown fox jumps over the lazy dog.&nbsp;The quick brown fox jumps over the lazy dog.&nbsp;The quick brown fox jumps over the lazy dog.&nbsp;The quick brown fox jumps over the lazy dog.&nbsp;</span></div><div><br></div><div>Here's some **bold** markdown text.</div><div><br></div><div>Here's a link <a href="http://example.com">http://example.com</a><br><br></div><div><br>On Nov 28, 2014, at 12:35 PM, Arpit Jalan &lt;<a href="mailto:info@discourse.org">info@discourse.org</a>&gt; wrote:<br><br></div><blockquote type="cite"><div><div>
+
+<table style="margin-bottom:25px;" cellspacing="0" cellpadding="0" border="0">
+  <tbody>
+    <tr>
+      <td style="vertical-align:top;width:55px;">
+        <img src="https://meta-discourse.global.ssl.fastly.net/user_avatar/meta.discourse.org/techapj/45/3281.png" title="techAPJ" style="max-width:100%;" width="45" height="45">
+      </td>
+      <td>
+        <a href="https://meta.discourse.org/users/techapj" target="_blank" style="text-decoration: none; font-weight: bold; color: #006699;; font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#3b5998;text-decoration:none;font-weight:bold">techAPJ</a><br>
+        <span style="text-align:right;color:#999999;padding-right:5px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;font-size:11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style="padding-top:5px;" colspan="2">
+<p style="margin-top:0; border: 0;">Test reply.</p>
+
+<p style="margin-top:0; border: 0;">First paragraph.</p>
+
+<p style="margin-top:0; border: 0;">Second paragraph.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+  <div style="color:#666;">
+    <p>To respond, reply to this email or visit <a href="https://meta.discourse.org/t/testing-default-email-replies/22638/3" style="text-decoration: none; font-weight: bold; color: #006699;; color:#666;">https://meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser.</p>
+  </div>
+  <hr style="background-color: #ddd; height: 1px; border: 1px;; background-color: #ddd; height: 1px; border: 1px;">
+  <h4>Previous Replies</h4>
+
+  <table style="margin-bottom:25px;" cellspacing="0" cellpadding="0" border="0">
+  <tbody>
+    <tr>
+      <td style="vertical-align:top;width:55px;">
+        <img src="https://meta-discourse.global.ssl.fastly.net/user_avatar/meta.discourse.org/codinghorror/45/5297.png" title="codinghorror" style="max-width:100%;" width="45" height="45">
+      </td>
+      <td>
+        <a href="https://meta.discourse.org/users/codinghorror" target="_blank" style="text-decoration: none; font-weight: bold; color: #006699;; font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#3b5998;text-decoration:none;font-weight:bold">codinghorror</a><br>
+        <span style="text-align:right;color:#999999;padding-right:5px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;font-size:11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style="padding-top:5px;" colspan="2">
+<p style="margin-top:0; border: 0;">We're testing the latest GitHub email processing library which we are integrating now.</p>
+
+<p style="margin-top:0; border: 0;"><a href="https://github.com/github/email_reply_parser" target="_blank" style="text-decoration: none; font-weight: bold; color: #006699;">https://github.com/github/email_reply_parser</a></p>
+
+<p style="margin-top:0; border: 0;">Go ahead and reply to this topic and I'll reply from various email clients for testing.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<hr style="background-color: #ddd; height: 1px; border: 1px;; background-color: #ddd; height: 1px; border: 1px;">
+
+<div style="color:#666;">
+<p>To respond, reply to this email or visit <a href="https://meta.discourse.org/t/testing-default-email-replies/22638/3" style="text-decoration: none; font-weight: bold; color: #006699;; color:#666;">https://meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser.</p>
+</div>
+<div style="color:#666;">
+<p>To unsubscribe from these emails, visit your <a href="https://meta.discourse.org/my/preferences" style="text-decoration: none; font-weight: bold; color: #006699;; color:#666;">user preferences</a>.</p>
+</div>
+</div>
+</div></blockquote></body></html>
+--Apple-Mail-B41C7F8E-3639-49B0-A5D5-440E125A7105--
diff --git a/spec/fixtures/emails/iphone_signature.eml b/spec/fixtures/emails/iphone_signature.eml
new file mode 100644
index 0000000000..d314ad1f1e
--- /dev/null
+++ b/spec/fixtures/emails/iphone_signature.eml
@@ -0,0 +1,29 @@
+Delivered-To: test@mail.com
+Return-Path: <walter.white@googlemail.com>
+From: Walter White <walter.white@googlemail.com>
+Content-Type: multipart/alternative;
+  boundary=Apple-Mail-8E182EEF-9DBC-41DE-A593-DF2E5EBD3975
+Content-Transfer-Encoding: 7bit
+Mime-Version: 1.0 (1.0)
+Subject: Re: Signature in email replies!
+Date: Thu, 23 Oct 2014 14:43:49 +0530
+References: <1234@mail.gmail.com>
+In-Reply-To: <1234@mail.gmail.com>
+To: Arpit Jalan <test@mail.com>
+X-Mailer: iPhone Mail (12A405)
+
+
+--Apple-Mail-8E182EEF-9DBC-41DE-A593-DF2E5EBD3975
+Content-Type: text/plain;
+  charset=us-ascii
+Content-Transfer-Encoding: 7bit
+
+This post should not include signature.
+
+Sent from my iPhone
+
+> On 23-Oct-2014, at 9:45 am, Arpit Jalan <test@mail.com> wrote:
+>
+> Signature in email replies!
+
+--Apple-Mail-8E182EEF-9DBC-41DE-A593-DF2E5EBD3975
diff --git a/spec/fixtures/emails/multiple_destinations.eml b/spec/fixtures/emails/multiple_destinations.eml
new file mode 100644
index 0000000000..6d31bbf197
--- /dev/null
+++ b/spec/fixtures/emails/multiple_destinations.eml
@@ -0,0 +1,40 @@
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <jake@adventuretime.ooo>
+To: finn@adventuretime.ooo, reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+I could not disagree more. I am obviously biased but adventure time is the
+greatest show ever created. Everyone should watch it.
+
+- Jake out
+
+
+On Sun, Jun 9, 2013 at 1:39 PM, eviltrout via Discourse Meta
+<reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo> wrote:
+>
+>
+>
+> eviltrout posted in 'Adventure Time Sux' on Discourse Meta:
+>
+> ---
+> hey guys everyone knows adventure time sucks!
+>
+> ---
+> Please visit this link to respond: http://localhost:3000/t/adventure-time-sux/1234/3
+>
+> To unsubscribe from these emails, visit your [user preferences](http://localhost:3000/user_preferences).
+>
\ No newline at end of file
diff --git a/spec/fixtures/emails/newlines.eml b/spec/fixtures/emails/newlines.eml
new file mode 100644
index 0000000000..cf03b9d18b
--- /dev/null
+++ b/spec/fixtures/emails/newlines.eml
@@ -0,0 +1,84 @@
+In-Reply-To: <test@discourse-app.mail>
+Date: Wed, 8 Oct 2014 10:36:19 +0530
+Delivered-To: walter.white@googlemail.com
+Subject: Re: [Discourse] Welcome to Discourse
+From: Walter White <walter.white@googlemail.com>
+To: Discourse <mail@arpitjalan.com>
+Content-Type: multipart/alternative; boundary=bcaec554078cc3d0c10504e24661
+
+--bcaec554078cc3d0c10504e24661
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+This is my reply.
+It is my best reply.
+It will also be my *only* reply.
+
+On Wed, Oct 8, 2014 at 10:33 AM, ajalan <info@unconfigured.discourse.org>
+wrote:
+
+>     ajalan
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoiMGM3a1pGT250VG5sb242RVNTdFdjS1FUSHdzIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3VzZXJzXFxcL2FqYWxhblwiLFwiaWRcIjpcImQxOWYxYjQ5NTdkODRkMGNhZWY1NDEzZGN=
+hODA4YTRhXCIsXCJ1cmxfaWRzXCI6W1wiNzA3MTNjNTg4MDI3YWQyM2RiM2QwOTVhOGQwYmY4ZT=
+YyMzNjYThiMFwiXX0ifQ>
+> October 8
+>
+> Awesome! Thank You! [image: +1]
+>
+> To respond, reply to this email or visit
+> http://discourse.techapj.com/t/welcome-to-discourse/8/2
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoibzNWaXFDRDdxSFNCbVRkUmdONlRJVW1ENU8wIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3RcXFwvd2VsY29tZS10by1kaXNjb3Vyc2VcXFwvOFxcXC8yXCIsXCJpZFwiOlwiZDE5ZjF=
+iNDk1N2Q4NGQwY2FlZjU0MTNkY2E4MDhhNGFcIixcInVybF9pZHNcIjpbXCIwYmFkNjE2NDJkNm=
+M2NzJhNGU0ZjYzMGU2ZDA5M2I3MzU3NzQ4MzYxXCJdfSJ9>
+> in your browser.
+>  ------------------------------
+> Previous Replies    system
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoicjFZQm8ySTJjUEtNclpvekZ5ZmFqYmdpTVFNIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3VzZXJzXFxcL3N5c3RlbVwiLFwiaWRcIjpcImQxOWYxYjQ5NTdkODRkMGNhZWY1NDEzZGN=
+hODA4YTRhXCIsXCJ1cmxfaWRzXCI6W1wiMTcxNWU2OTE1M2UzMjk4YmM2Y2NhMWEyM2E5N2ViMW=
+U5N2IwMWYyNFwiXX0ifQ>
+> October 8
+>
+> The first paragraph of this pinned topic will be visible as a welcome
+> message to all new visitors on your homepage. It's important!
+>
+> *Edit this* into a brief description of your community:
+>
+>    - Who is it for?
+>    - What can they find here?
+>    - Why should they come here?
+>    - Where can they read more (links, resources, etc)?
+>
+> You may want to close this topic via the wrench icon at the upper right,
+> so that replies don't pile up on an announcement.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> http://discourse.techapj.com/t/welcome-to-discourse/8/2
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoibzNWaXFDRDdxSFNCbVRkUmdONlRJVW1ENU8wIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3RcXFwvd2VsY29tZS10by1kaXNjb3Vyc2VcXFwvOFxcXC8yXCIsXCJpZFwiOlwiZDE5ZjF=
+iNDk1N2Q4NGQwY2FlZjU0MTNkY2E4MDhhNGFcIixcInVybF9pZHNcIjpbXCIwYmFkNjE2NDJkNm=
+M2NzJhNGU0ZjYzMGU2ZDA5M2I3MzU3NzQ4MzYxXCJdfSJ9>
+> in your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoiaFdWSWtiRGIybjJOeWc0VHRrenAzbnhraU93IiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL215XFxcL3ByZWZlcmVuY2VzXCIsXCJpZFwiOlwiZDE5ZjFiNDk1N2Q4NGQwY2FlZjU0MTN=
+kY2E4MDhhNGFcIixcInVybF9pZHNcIjpbXCI0OTIyMmMyZDgyNzUwMmQyMGZjYzU4MTZkNjhmYT=
+k3NzFkY2YzZDllXCJdfSJ9>
+> .
+>
+
+--bcaec554078cc3d0c10504e24661
diff --git a/spec/fixtures/emails/no_content_reply.eml b/spec/fixtures/emails/no_content_reply.eml
new file mode 100644
index 0000000000..95eb2055ce
--- /dev/null
+++ b/spec/fixtures/emails/no_content_reply.eml
@@ -0,0 +1,34 @@
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <jake@adventuretime.ooo>
+To: reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+On Sun, Jun 9, 2013 at 1:39 PM, eviltrout via Discourse Meta
+<reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo> wrote:
+>
+>
+>
+> eviltrout posted in 'Adventure Time Sux' on Discourse Meta:
+>
+> ---
+> hey guys everyone knows adventure time sucks!
+>
+> ---
+> Please visit this link to respond: http://localhost:3000/t/adventure-time-sux/1234/3
+>
+> To unsubscribe from these emails, visit your [user preferences](http://localhost:3000/user_preferences).
+>
\ No newline at end of file
diff --git a/spec/fixtures/emails/on_wrote.eml b/spec/fixtures/emails/on_wrote.eml
new file mode 100644
index 0000000000..feb59bd27b
--- /dev/null
+++ b/spec/fixtures/emails/on_wrote.eml
@@ -0,0 +1,277 @@
+
+MIME-Version: 1.0
+Received: by 10.107.9.17 with HTTP; Tue, 9 Sep 2014 16:18:19 -0700 (PDT)
+In-Reply-To: <540f16d4c08d9_4a3f9ff6d61890391c@tiefighter4-meta.mail>
+References: <topic/18058@meta.discourse.org>
+	<540f16d4c08d9_4a3f9ff6d61890391c@tiefighter4-meta.mail>
+Date: Tue, 9 Sep 2014 16:18:19 -0700
+Delivered-To: kanepyork@gmail.com
+Message-ID: <CABeNrKXxfb8YJUWxO5L_oPTGrFsiZfQOpWudk+44Mh=yuUEHNQ@mail.gmail.com>
+Subject: Re: [Discourse Meta] Badge icons - where to find them?
+From: Kane York <jake@adventuretime.ooo>
+To: Discourse Meta <reply+8305e3604ae4d1485dc12b6af6a8446c@appmail.adventuretime.ooo>
+Content-Type: multipart/alternative; boundary=001a11c34c389e728f0502aa26a0
+
+--001a11c34c389e728f0502aa26a0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+Sure, all you need to do is frobnicate the foobar and you'll be all set!
+
+On Tue, Sep 9, 2014 at 8:03 AM, gordon_ryan <info@discourse.org> wrote:
+
+>     gordon_ryan <https://meta.discourse.org/users/gordon_ryan>
+> September 9
+>
+> @riking <https://meta.discourse.org/users/riking>- willing to step by
+> step of the custom icon method for an admittedly ignorant admin? Seriousl=
+y
+> confused.
+>
+> Or anyone else who knows how to do this [image: smiley]
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/badge-icons-where-to-find-them/18058/9 in
+> your browser.
+>  ------------------------------
+> Previous Replies    riking <https://meta.discourse.org/users/riking>
+> July 25
+>
+> Check out the "HTML Head" section in the "Content" tab of the admin panel=
+.
+>      meglio <https://meta.discourse.org/users/meglio>
+> July 25
+>
+> How will it load the related custom font?
+>      riking <https://meta.discourse.org/users/riking>
+> July 25
+>
+> Here's an example of the styles that FA applies. I'll use <i class=3D"fa
+> fa-heart"></i> as the example.
+>
+> .fa {
+>   display: inline-block;
+>   font-family: FontAwesome;
+>   font-style: normal;
+>   font-weight: normal;
+>   line-height: 1;
+>   -webkit-font-smoothing: antialiased;
+>   -moz-osx-font-smoothing: grayscale;
+> }
+> .fa-heart:before {
+>   content: "\f004";
+> }
+>
+> So you could do this in your site stylesheet:
+>
+> .fa-custom-burger:before {
+>   content: "\01f354";
+>   font-family: inherit;
+> }
+>
+> And get =F0=9F=8D=94 as your badge icon when you enter custom-burger.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/badge-icons-where-to-find-them/18058/9 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+--001a11c34c389e728f0502aa26a0
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr"><span style=3D"font-family:arial,sans-serif;font-size:13px=
+">Sure, all you need to do is frobnicate the foobar and you&#39;ll be all s=
+et!</span><br><div class=3D"gmail_extra"><br clear=3D"all"><div><br>=
+<br><div class=3D"gmail_quote">On Tue, Sep 9, 2014 at 8:03 AM, gordon_ryan =
+<span dir=3D"ltr">&lt;<a href=3D"mailto:info@discourse.org" target=3D"_blan=
+k">info@discourse.org</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_q=
+uote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1e=
+x"><div>
+
+
+<table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cellp=
+adding=3D"0" border=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/gordon_ryan/45/34017.png" title=3D"gordon_ryan" style=
+=3D"max-width:694px" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/gordon_ryan" style=3D"f=
+ont-size:13px;font-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans=
+-serif;color:#3b5998;text-decoration:none;font-weight:bold;text-decoration:=
+none;font-weight:bold;color:#006699" target=3D"_blank">gordon_ryan</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">September 9</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0"><a href=3D"https://meta.discourse.org/us=
+ers/riking" style=3D"text-decoration:none;font-weight:bold;color:#006699" t=
+arget=3D"_blank">@riking</a>- willing to step by step of the custom icon me=
+thod for an admittedly ignorant admin? Seriously confused.</p>
+
+<p style=3D"margin-top:0;border:0">Or anyone else who knows how to do this =
+<img src=3D"https://meta-discourse.global.ssl.fastly.net/plugins/emoji/imag=
+es/smiley.png" title=3D":smiley:" alt=3D"smiley" width=3D"20" height=3D"20"=
+></p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+  <div style=3D"color:#666">
+    <p>To respond, reply to this email or visit <a href=3D"https://meta.dis=
+course.org/t/badge-icons-where-to-find-them/18058/9" style=3D"color:#666;te=
+xt-decoration:none;font-weight:bold;color:#006699" target=3D"_blank">https:=
+//meta.discourse.org/t/badge-icons-where-to-find-them/18058/9</a> in your b=
+rowser.</p>
+  </div>
+  <hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-c=
+olor:#ddd;min-height:1px;border:1px">
+  <h4>Previous Replies</h4>
+
+  <table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cel=
+lpadding=3D"0" border=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/riking/45/9779.png" title=3D"riking" style=3D"max-widt=
+h:694px" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/riking" style=3D"font-s=
+ize:13px;font-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-seri=
+f;color:#3b5998;text-decoration:none;font-weight:bold;text-decoration:none;=
+font-weight:bold;color:#006699" target=3D"_blank">riking</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">July 25</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2"><p style=3D"margin-top:0;=
+border:0">Check out the &quot;HTML Head&quot; section in the &quot;Content&=
+quot; tab of the admin panel.</p></td>
+    </tr>
+  </tbody>
+</table>
+
+  <table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cel=
+lpadding=3D"0" border=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/meglio/45/33480.png" title=3D"meglio" style=3D"max-wid=
+th:694px" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/meglio" style=3D"font-s=
+ize:13px;font-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-seri=
+f;color:#3b5998;text-decoration:none;font-weight:bold;text-decoration:none;=
+font-weight:bold;color:#006699" target=3D"_blank">meglio</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">July 25</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2"><p style=3D"margin-top:0;=
+border:0">How will it load the related custom font?</p></td>
+    </tr>
+  </tbody>
+</table>
+
+  <table style=3D"margin-bottom:25px;max-width:761px" cellspacing=3D"0" cel=
+lpadding=3D"0" border=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/riking/45/9779.png" title=3D"riking" style=3D"max-widt=
+h:694px" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/riking" style=3D"font-s=
+ize:13px;font-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-seri=
+f;color:#3b5998;text-decoration:none;font-weight:bold;text-decoration:none;=
+font-weight:bold;color:#006699" target=3D"_blank">riking</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">July 25</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">Here&#39;s an example of the styles that=
+ FA applies. I&#39;ll use <code style=3D"background-color:#f1f1ff;padding:2=
+px 5px">&lt;i class=3D&quot;fa fa-heart&quot;&gt;&lt;/i&gt;</code> as the e=
+xample.</p>
+
+<p style=3D"margin-top:0;border:0"></p>
+<pre style=3D"word-wrap:break-word;max-width:694px"><code style=3D"backgrou=
+nd-color:#f1f1ff;padding:2px 5px;display:block;background-color:#f1f1ff;pad=
+ding:5px">.fa {
+  display: inline-block;
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.fa-heart:before {
+  content: &quot;\f004&quot;;
+}</code></pre>
+
+<p style=3D"margin-top:0;border:0">So you could do this in your site styles=
+heet:</p>
+
+<p style=3D"margin-top:0;border:0"></p>
+<pre style=3D"word-wrap:break-word;max-width:694px"><code style=3D"backgrou=
+nd-color:#f1f1ff;padding:2px 5px;display:block;background-color:#f1f1ff;pad=
+ding:5px">.fa-custom-burger:before {
+  content: &quot;\01f354&quot;;
+  font-family: inherit;
+}</code></pre>
+
+<p style=3D"margin-top:0;border:0">And get =F0=9F=8D=94 as your badge icon =
+when you enter <code style=3D"background-color:#f1f1ff;padding:2px 5px">cus=
+tom-burger</code>.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-col=
+or:#ddd;min-height:1px;border:1px">
+
+<div style=3D"color:#666">
+<p>To respond, reply to this email or visit <a href=3D"https://meta.discour=
+se.org/t/badge-icons-where-to-find-them/18058/9" style=3D"color:#666;text-d=
+ecoration:none;font-weight:bold;color:#006699" target=3D"_blank">https://me=
+ta.discourse.org/t/badge-icons-where-to-find-them/18058/9</a> in your brows=
+er.</p>
+</div>
+<div style=3D"color:#666">
+<p>To unsubscribe from these emails, visit your <a href=3D"https://meta.dis=
+course.org/my/preferences" style=3D"color:#666;text-decoration:none;font-we=
+ight:bold;color:#006699" target=3D"_blank">user preferences</a>.</p>
+</div>
+</div>
+</blockquote></div><br></div></div>
+
+--001a11c34c389e728f0502aa26a0--
\ No newline at end of file
diff --git a/spec/fixtures/emails/outlook.eml b/spec/fixtures/emails/outlook.eml
new file mode 100644
index 0000000000..fb1f590a30
--- /dev/null
+++ b/spec/fixtures/emails/outlook.eml
@@ -0,0 +1,188 @@
+
+MIME-Version: 1.0
+Received: by 10.25.161.144 with HTTP; Tue, 7 Oct 2014 22:17:17 -0700 (PDT)
+X-Originating-IP: [117.207.85.84]
+In-Reply-To: <5434c8b52bb3a_623ff09fec70f049749@discourse-app.mail>
+References: <topic/35@discourse.techapj.com>
+  <5434c8b52bb3a_623ff09fec70f049749@discourse-app.mail>
+Date: Wed, 8 Oct 2014 10:47:17 +0530
+Delivered-To: arpit@techapj.com
+Message-ID: <CAOJeqne=SJ_LwN4sb-0Y95ejc2OpreVhdmcPn0TnmwSvTCYzzQ@mail.gmail.com>
+Subject: Re: [Discourse] [Meta] Welcome to techAPJ's Discourse!
+From: Arpit Jalan <arpit@techapj.com>
+To: Discourse <mail+e1c7f2a380e33840aeb654f075490bad@arpitjalan.com>Accept-Language: en-US
+Content-Language: en-US
+X-MS-Has-Attach:
+X-MS-TNEF-Correlator:
+x-originating-ip: [134.68.31.227]
+Content-Type: multipart/alternative;
+        boundary="_000_B0DFE1BEB3739743BC9B639D0E6BC8FF217A6341IUMSSGMBX104ads_"
+MIME-Version: 1.0
+
+--_000_B0DFE1BEB3739743BC9B639D0E6BC8FF217A6341IUMSSGMBX104ads_
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: base64
+
+TWljcm9zb2Z0IE91dGxvb2sgMjAxMA0KDQpGcm9tOiBtaWNoYWVsIFttYWlsdG86dGFsa0BvcGVu
+bXJzLm9yZ10NClNlbnQ6IE1vbmRheSwgT2N0b2JlciAxMywgMjAxNCA5OjM4IEFNDQpUbzogUG93
+ZXIsIENocmlzDQpTdWJqZWN0OiBbUE1dIFlvdXIgcG9zdCBpbiAiQnVyZ2VyaGF1czogTmV3IHJl
+c3RhdXJhbnQgLyBsdW5jaCB2ZW51ZSINCg0KDQptaWNoYWVsPGh0dHA6Ly9jbC5vcGVubXJzLm9y
+Zy90cmFjay9jbGljay8zMDAzOTkwNS90YWxrLm9wZW5tcnMub3JnP3A9ZXlKeklqb2liR2xaYTFW
+MGVYaENZMDFNUlRGc1VESm1ZelZRTTBabGVqRTRJaXdpZGlJNk1Td2ljQ0k2SW50Y0luVmNJam96
+TURBek9Ua3dOU3hjSW5aY0lqb3hMRndpZFhKc1hDSTZYQ0pvZEhSd2N6cGNYRnd2WEZ4Y0wzUmhi
+R3N1YjNCbGJtMXljeTV2Y21kY1hGd3ZkWE5sY25OY1hGd3ZiV2xqYUdGbGJGd2lMRndpYVdSY0lq
+cGNJbVExWW1Nd04yTmtORFJqWkRRNE1HTTRZVGcyTXpsalpXSTFOemd6WW1ZMlhDSXNYQ0oxY214
+ZmFXUnpYQ0k2VzF3aVlqaGtPRGcxTWprNU56ZG1aalkxWldZeU5URTNPV1JpTkdZeU1XSTNOekZq
+TnpoalpqaGtPRndpWFgwaWZRPg0KT2N0b2JlciAxMw0KDQpodHRwczovL3RhbGsub3Blbm1ycy5v
+cmcvdC9idXJnZXJoYXVzLW5ldy1yZXN0YXVyYW50LWx1bmNoLXZlbnVlLzY3Mi8zPGh0dHA6Ly9j
+bC5vcGVubXJzLm9yZy90cmFjay9jbGljay8zMDAzOTkwNS90YWxrLm9wZW5tcnMub3JnP3A9ZXlK
+eklqb2lVRVJJU1VOeVIzbFZNRGRCVlZocFduUjNXV3g0TVdOc1RXNVpJaXdpZGlJNk1Td2ljQ0k2
+SW50Y0luVmNJam96TURBek9Ua3dOU3hjSW5aY0lqb3hMRndpZFhKc1hDSTZYQ0pvZEhSd2N6cGNY
+Rnd2WEZ4Y0wzUmhiR3N1YjNCbGJtMXljeTV2Y21kY1hGd3ZkRnhjWEM5aWRYSm5aWEpvWVhWekxX
+NWxkeTF5WlhOMFlYVnlZVzUwTFd4MWJtTm9MWFpsYm5WbFhGeGNMelkzTWx4Y1hDOHpYQ0lzWENK
+cFpGd2lPbHdpWkRWaVl6QTNZMlEwTkdOa05EZ3dZemhoT0RZek9XTmxZalUzT0ROaVpqWmNJaXhj
+SW5WeWJGOXBaSE5jSWpwYlhDSmlOelppWWprMFpURmlOekk1WlRrMlpUUmxaV000TkdSbU1qUTRN
+RE13WWpZeVlXWXlNR00wWENKZGZTSjk+DQoNCkxvb2tzIGxpa2UgeW91ciByZXBseS1ieS1lbWFp
+bCB3YXNuJ3QgcHJvY2Vzc2VkIGNvcnJlY3RseSBieSBvdXIgc29mdHdhcmUuIENhbiB5b3UgbGV0
+IG1lIGtub3cgd2hhdCB2ZXJzaW9uL09TIG9mIHdoYXQgZW1haWwgcHJvZ3JhbSB5b3UncmUgdXNp
+bmc/IFdlIHdpbGwgd2FudCB0byB0cnkgdG8gZml4IHRoZSBidWcuIDpzbWlsZToNCg0KVGhhbmtz
+IQ0KDQoNCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fDQoNClRvIHJlc3BvbmQsIHJl
+cGx5IHRvIHRoaXMgZW1haWwgb3IgdmlzaXQgaHR0cHM6Ly90YWxrLm9wZW5tcnMub3JnL3QveW91
+ci1wb3N0LWluLWJ1cmdlcmhhdXMtbmV3LXJlc3RhdXJhbnQtbHVuY2gtdmVudWUvNjc0LzE8aHR0
+cDovL2NsLm9wZW5tcnMub3JnL3RyYWNrL2NsaWNrLzMwMDM5OTA1L3RhbGsub3Blbm1ycy5vcmc/
+cD1leUp6SWpvaWVYaDJWbnBGTUhSMU1uRm5aRWR1TlhFd01GcFFPVlp0VFZvNElpd2lkaUk2TVN3
+aWNDSTZJbnRjSW5WY0lqb3pNREF6T1Rrd05TeGNJblpjSWpveExGd2lkWEpzWENJNlhDSm9kSFJ3
+Y3pwY1hGd3ZYRnhjTDNSaGJHc3ViM0JsYm0xeWN5NXZjbWRjWEZ3dmRGeGNYQzk1YjNWeUxYQnZj
+M1F0YVc0dFluVnlaMlZ5YUdGMWN5MXVaWGN0Y21WemRHRjFjbUZ1ZEMxc2RXNWphQzEyWlc1MVpW
+eGNYQzgyTnpSY1hGd3ZNVndpTEZ3aWFXUmNJanBjSW1RMVltTXdOMk5rTkRSalpEUTRNR000WVRn
+Mk16bGpaV0kxTnpnelltWTJYQ0lzWENKMWNteGZhV1J6WENJNlcxd2lZamMyWW1JNU5HVXhZamN5
+T1dVNU5tVTBaV1ZqT0RSa1pqSTBPREF6TUdJMk1tRm1NakJqTkZ3aVhYMGlmUT4gaW4geW91ciBi
+cm93c2VyLg0KDQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoZXNlIGVtYWlscywgdmlzaXQgeW91ciB1
+c2VyIHByZWZlcmVuY2VzPGh0dHA6Ly9jbC5vcGVubXJzLm9yZy90cmFjay9jbGljay8zMDAzOTkw
+NS90YWxrLm9wZW5tcnMub3JnP3A9ZXlKeklqb2lkVXh1V2xnNVZGYzBPV1pXUzBZNGJGZExkbWx5
+V0dzeFRWOXpJaXdpZGlJNk1Td2ljQ0k2SW50Y0luVmNJam96TURBek9Ua3dOU3hjSW5aY0lqb3hM
+RndpZFhKc1hDSTZYQ0pvZEhSd2N6cGNYRnd2WEZ4Y0wzUmhiR3N1YjNCbGJtMXljeTV2Y21kY1hG
+d3ZiWGxjWEZ3dmNISmxabVZ5Wlc1alpYTmNJaXhjSW1sa1hDSTZYQ0prTldKak1EZGpaRFEwWTJR
+ME9EQmpPR0U0TmpNNVkyVmlOVGM0TTJKbU5sd2lMRndpZFhKc1gybGtjMXdpT2x0Y0ltSTRNV1V3
+WmpBMU5EWTVORE0wTnpneU0yRm1NakEyTmpGalpqYzNaR05pTjJOaFl6ZG1NakpjSWwxOUluMD4u
+DQoNCg==
+
+--_000_B0DFE1BEB3739743BC9B639D0E6BC8FF217A6341IUMSSGMBX104ads_
+Content-Type: text/html; charset="utf-8"
+Content-Transfer-Encoding: base64
+
+PGh0bWwgeG1sbnM6dj0idXJuOnNjaGVtYXMtbWljcm9zb2Z0LWNvbTp2bWwiIHhtbG5zOm89InVy
+bjpzY2hlbWFzLW1pY3Jvc29mdC1jb206b2ZmaWNlOm9mZmljZSIgeG1sbnM6dz0idXJuOnNjaGVt
+YXMtbWljcm9zb2Z0LWNvbTpvZmZpY2U6d29yZCIgeG1sbnM6bT0iaHR0cDovL3NjaGVtYXMubWlj
+cm9zb2Z0LmNvbS9vZmZpY2UvMjAwNC8xMi9vbW1sIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+VFIvUkVDLWh0bWw0MCI+DQo8aGVhZD4NCjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIg
+Y29udGVudD0idGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4NCjxtZXRhIG5hbWU9IkdlbmVyYXRv
+ciIgY29udGVudD0iTWljcm9zb2Z0IFdvcmQgMTQgKGZpbHRlcmVkIG1lZGl1bSkiPg0KPCEtLVtp
+ZiAhbXNvXT48c3R5bGU+dlw6KiB7YmVoYXZpb3I6dXJsKCNkZWZhdWx0I1ZNTCk7fQ0Kb1w6KiB7
+YmVoYXZpb3I6dXJsKCNkZWZhdWx0I1ZNTCk7fQ0Kd1w6KiB7YmVoYXZpb3I6dXJsKCNkZWZhdWx0
+I1ZNTCk7fQ0KLnNoYXBlIHtiZWhhdmlvcjp1cmwoI2RlZmF1bHQjVk1MKTt9DQo8L3N0eWxlPjwh
+W2VuZGlmXS0tPjxzdHlsZT48IS0tDQovKiBGb250IERlZmluaXRpb25zICovDQpAZm9udC1mYWNl
+DQoJe2ZvbnQtZmFtaWx5OkNhbGlicmk7DQoJcGFub3NlLTE6MiAxNSA1IDIgMiAyIDQgMyAyIDQ7
+fQ0KQGZvbnQtZmFjZQ0KCXtmb250LWZhbWlseTpUYWhvbWE7DQoJcGFub3NlLTE6MiAxMSA2IDQg
+MyA1IDQgNCAyIDQ7fQ0KLyogU3R5bGUgRGVmaW5pdGlvbnMgKi8NCnAuTXNvTm9ybWFsLCBsaS5N
+c29Ob3JtYWwsIGRpdi5Nc29Ob3JtYWwNCgl7bWFyZ2luOjBpbjsNCgltYXJnaW4tYm90dG9tOi4w
+MDAxcHQ7DQoJZm9udC1zaXplOjEyLjBwdDsNCglmb250LWZhbWlseToiVGltZXMgTmV3IFJvbWFu
+Iiwic2VyaWYiO30NCmE6bGluaywgc3Bhbi5Nc29IeXBlcmxpbmsNCgl7bXNvLXN0eWxlLXByaW9y
+aXR5Ojk5Ow0KCWNvbG9yOmJsdWU7DQoJdGV4dC1kZWNvcmF0aW9uOnVuZGVybGluZTt9DQphOnZp
+c2l0ZWQsIHNwYW4uTXNvSHlwZXJsaW5rRm9sbG93ZWQNCgl7bXNvLXN0eWxlLXByaW9yaXR5Ojk5
+Ow0KCWNvbG9yOnB1cnBsZTsNCgl0ZXh0LWRlY29yYXRpb246dW5kZXJsaW5lO30NCnANCgl7bXNv
+LXN0eWxlLXByaW9yaXR5Ojk5Ow0KCW1zby1tYXJnaW4tdG9wLWFsdDphdXRvOw0KCW1hcmdpbi1y
+aWdodDowaW47DQoJbXNvLW1hcmdpbi1ib3R0b20tYWx0OmF1dG87DQoJbWFyZ2luLWxlZnQ6MGlu
+Ow0KCWZvbnQtc2l6ZToxMi4wcHQ7DQoJZm9udC1mYW1pbHk6IlRpbWVzIE5ldyBSb21hbiIsInNl
+cmlmIjt9DQpzcGFuLkVtYWlsU3R5bGUxOA0KCXttc28tc3R5bGUtdHlwZTpwZXJzb25hbC1yZXBs
+eTsNCglmb250LWZhbWlseToiQ2FsaWJyaSIsInNhbnMtc2VyaWYiOw0KCWNvbG9yOiMxRjQ5N0Q7
+fQ0KLk1zb0NocERlZmF1bHQNCgl7bXNvLXN0eWxlLXR5cGU6ZXhwb3J0LW9ubHk7DQoJZm9udC1m
+YW1pbHk6IkNhbGlicmkiLCJzYW5zLXNlcmlmIjt9DQpAcGFnZSBXb3JkU2VjdGlvbjENCgl7c2l6
+ZTo4LjVpbiAxMS4waW47DQoJbWFyZ2luOjEuMGluIDEuMGluIDEuMGluIDEuMGluO30NCmRpdi5X
+b3JkU2VjdGlvbjENCgl7cGFnZTpXb3JkU2VjdGlvbjE7fQ0KLS0+PC9zdHlsZT48IS0tW2lmIGd0
+ZSBtc28gOV0+PHhtbD4NCjxvOnNoYXBlZGVmYXVsdHMgdjpleHQ9ImVkaXQiIHNwaWRtYXg9IjEw
+MjYiIC8+DQo8L3htbD48IVtlbmRpZl0tLT48IS0tW2lmIGd0ZSBtc28gOV0+PHhtbD4NCjxvOnNo
+YXBlbGF5b3V0IHY6ZXh0PSJlZGl0Ij4NCjxvOmlkbWFwIHY6ZXh0PSJlZGl0IiBkYXRhPSIxIiAv
+Pg0KPC9vOnNoYXBlbGF5b3V0PjwveG1sPjwhW2VuZGlmXS0tPg0KPC9oZWFkPg0KPGJvZHkgbGFu
+Zz0iRU4tVVMiIGxpbms9ImJsdWUiIHZsaW5rPSJwdXJwbGUiPg0KPGRpdiBjbGFzcz0iV29yZFNl
+Y3Rpb24xIj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTEu
+MHB0O2ZvbnQtZmFtaWx5OiZxdW90O0NhbGlicmkmcXVvdDssJnF1b3Q7c2Fucy1zZXJpZiZxdW90
+Oztjb2xvcjojMUY0OTdEIj5NaWNyb3NvZnQgT3V0bG9vayAyMDEwPG86cD48L286cD48L3NwYW4+
+PC9wPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PHNwYW4gc3R5bGU9ImZvbnQtc2l6ZToxMS4wcHQ7
+Zm9udC1mYW1pbHk6JnF1b3Q7Q2FsaWJyaSZxdW90OywmcXVvdDtzYW5zLXNlcmlmJnF1b3Q7O2Nv
+bG9yOiMxRjQ5N0QiPjxvOnA+Jm5ic3A7PC9vOnA+PC9zcGFuPjwvcD4NCjxwIGNsYXNzPSJNc29O
+b3JtYWwiPjxiPjxzcGFuIHN0eWxlPSJmb250LXNpemU6MTAuMHB0O2ZvbnQtZmFtaWx5OiZxdW90
+O1RhaG9tYSZxdW90OywmcXVvdDtzYW5zLXNlcmlmJnF1b3Q7Ij5Gcm9tOjwvc3Bhbj48L2I+PHNw
+YW4gc3R5bGU9ImZvbnQtc2l6ZToxMC4wcHQ7Zm9udC1mYW1pbHk6JnF1b3Q7VGFob21hJnF1b3Q7
+LCZxdW90O3NhbnMtc2VyaWYmcXVvdDsiPiBtaWNoYWVsIFttYWlsdG86dGFsa0BvcGVubXJzLm9y
+Z10NCjxicj4NCjxiPlNlbnQ6PC9iPiBNb25kYXksIE9jdG9iZXIgMTMsIDIwMTQgOTozOCBBTTxi
+cj4NCjxiPlRvOjwvYj4gUG93ZXIsIENocmlzPGJyPg0KPGI+U3ViamVjdDo8L2I+IFtQTV0gWW91
+ciBwb3N0IGluICZxdW90O0J1cmdlcmhhdXM6IE5ldyByZXN0YXVyYW50IC8gbHVuY2ggdmVudWUm
+cXVvdDs8bzpwPjwvbzpwPjwvc3Bhbj48L3A+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48bzpwPiZu
+YnNwOzwvbzpwPjwvcD4NCjxkaXY+DQo8dGFibGUgY2xhc3M9Ik1zb05vcm1hbFRhYmxlIiBib3Jk
+ZXI9IjAiIGNlbGxzcGFjaW5nPSIwIiBjZWxscGFkZGluZz0iMCI+DQo8dGJvZHk+DQo8dHI+DQo8
+dGQgdmFsaWduPSJ0b3AiIHN0eWxlPSJwYWRkaW5nOjBpbiAwaW4gMGluIDBpbiI+PC90ZD4NCjx0
+ZCBzdHlsZT0icGFkZGluZzowaW4gMGluIDBpbiAwaW4iPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCIg
+c3R5bGU9Im1hcmdpbi1ib3R0b206MTguNzVwdCI+PGEgaHJlZj0iaHR0cDovL2NsLm9wZW5tcnMu
+b3JnL3RyYWNrL2NsaWNrLzMwMDM5OTA1L3RhbGsub3Blbm1ycy5vcmc/cD1leUp6SWpvaWJHbFph
+MVYwZVhoQ1kwMU1SVEZzVURKbVl6VlFNMFpsZWpFNElpd2lkaUk2TVN3aWNDSTZJbnRjSW5WY0lq
+b3pNREF6T1Rrd05TeGNJblpjSWpveExGd2lkWEpzWENJNlhDSm9kSFJ3Y3pwY1hGd3ZYRnhjTDNS
+aGJHc3ViM0JsYm0xeWN5NXZjbWRjWEZ3dmRYTmxjbk5jWEZ3dmJXbGphR0ZsYkZ3aUxGd2lhV1Jj
+SWpwY0ltUTFZbU13TjJOa05EUmpaRFE0TUdNNFlUZzJNemxqWldJMU56Z3pZbVkyWENJc1hDSjFj
+bXhmYVdSelhDSTZXMXdpWWpoa09EZzFNams1TnpkbVpqWTFaV1l5TlRFM09XUmlOR1l5TVdJM056
+RmpOemhqWmpoa09Gd2lYWDBpZlEiIHRhcmdldD0iX2JsYW5rIj48Yj48c3BhbiBzdHlsZT0iZm9u
+dC1zaXplOjEwLjBwdDtmb250LWZhbWlseTomcXVvdDtUYWhvbWEmcXVvdDssJnF1b3Q7c2Fucy1z
+ZXJpZiZxdW90Oztjb2xvcjojMDA2Njk5O3RleHQtZGVjb3JhdGlvbjpub25lIj5taWNoYWVsPC9z
+cGFuPjwvYj48L2E+PGJyPg0KPHNwYW4gc3R5bGU9ImZvbnQtc2l6ZTo4LjVwdDtmb250LWZhbWls
+eTomcXVvdDtUYWhvbWEmcXVvdDssJnF1b3Q7c2Fucy1zZXJpZiZxdW90Oztjb2xvcjojOTk5OTk5
+Ij5PY3RvYmVyIDEzPC9zcGFuPg0KPG86cD48L286cD48L3A+DQo8L3RkPg0KPC90cj4NCjx0cj4N
+Cjx0ZCBjb2xzcGFuPSIyIiBzdHlsZT0icGFkZGluZzozLjc1cHQgMGluIDBpbiAwaW4iPg0KPHAg
+Y2xhc3M9Ik1zb05vcm1hbCIgc3R5bGU9Im1hcmdpbi1ib3R0b206MTguNzVwdCI+PGEgaHJlZj0i
+aHR0cDovL2NsLm9wZW5tcnMub3JnL3RyYWNrL2NsaWNrLzMwMDM5OTA1L3RhbGsub3Blbm1ycy5v
+cmc/cD1leUp6SWpvaVVFUklTVU55UjNsVk1EZEJWVmhwV25SM1dXeDRNV05zVFc1Wklpd2lkaUk2
+TVN3aWNDSTZJbnRjSW5WY0lqb3pNREF6T1Rrd05TeGNJblpjSWpveExGd2lkWEpzWENJNlhDSm9k
+SFJ3Y3pwY1hGd3ZYRnhjTDNSaGJHc3ViM0JsYm0xeWN5NXZjbWRjWEZ3dmRGeGNYQzlpZFhKblpY
+Sm9ZWFZ6TFc1bGR5MXlaWE4wWVhWeVlXNTBMV3gxYm1Ob0xYWmxiblZsWEZ4Y0x6WTNNbHhjWEM4
+elhDSXNYQ0pwWkZ3aU9sd2laRFZpWXpBM1kyUTBOR05rTkRnd1l6aGhPRFl6T1dObFlqVTNPRE5p
+WmpaY0lpeGNJblZ5YkY5cFpITmNJanBiWENKaU56WmlZamswWlRGaU56STVaVGsyWlRSbFpXTTRO
+R1JtTWpRNE1ETXdZall5WVdZeU1HTTBYQ0pkZlNKOSI+PGI+PHNwYW4gc3R5bGU9ImNvbG9yOiMw
+MDY2OTk7dGV4dC1kZWNvcmF0aW9uOm5vbmUiPmh0dHBzOi8vdGFsay5vcGVubXJzLm9yZy90L2J1
+cmdlcmhhdXMtbmV3LXJlc3RhdXJhbnQtbHVuY2gtdmVudWUvNjcyLzM8L3NwYW4+PC9iPjwvYT4N
+CjxvOnA+PC9vOnA+PC9wPg0KPHAgc3R5bGU9Im1hcmdpbi10b3A6MGluIj5Mb29rcyBsaWtlIHlv
+dXIgcmVwbHktYnktZW1haWwgd2Fzbid0IHByb2Nlc3NlZCBjb3JyZWN0bHkgYnkgb3VyIHNvZnR3
+YXJlLiBDYW4geW91IGxldCBtZSBrbm93IHdoYXQgdmVyc2lvbi9PUyBvZiB3aGF0IGVtYWlsIHBy
+b2dyYW0geW91J3JlIHVzaW5nPyBXZSB3aWxsIHdhbnQgdG8gdHJ5IHRvIGZpeCB0aGUgYnVnLiA6
+c21pbGU6PG86cD48L286cD48L3A+DQo8cCBzdHlsZT0ibWFyZ2luLXRvcDowaW4iPlRoYW5rcyE8
+bzpwPjwvbzpwPjwvcD4NCjwvdGQ+DQo8L3RyPg0KPC90Ym9keT4NCjwvdGFibGU+DQo8ZGl2IGNs
+YXNzPSJNc29Ob3JtYWwiIGFsaWduPSJjZW50ZXIiIHN0eWxlPSJ0ZXh0LWFsaWduOmNlbnRlciI+
+DQo8aHIgc2l6ZT0iMSIgd2lkdGg9IjEwMCUiIGFsaWduPSJjZW50ZXIiPg0KPC9kaXY+DQo8ZGl2
+Pg0KPHA+PHNwYW4gc3R5bGU9ImNvbG9yOiM2NjY2NjYiPlRvIHJlc3BvbmQsIHJlcGx5IHRvIHRo
+aXMgZW1haWwgb3IgdmlzaXQgPGEgaHJlZj0iaHR0cDovL2NsLm9wZW5tcnMub3JnL3RyYWNrL2Ns
+aWNrLzMwMDM5OTA1L3RhbGsub3Blbm1ycy5vcmc/cD1leUp6SWpvaWVYaDJWbnBGTUhSMU1uRm5a
+RWR1TlhFd01GcFFPVlp0VFZvNElpd2lkaUk2TVN3aWNDSTZJbnRjSW5WY0lqb3pNREF6T1Rrd05T
+eGNJblpjSWpveExGd2lkWEpzWENJNlhDSm9kSFJ3Y3pwY1hGd3ZYRnhjTDNSaGJHc3ViM0JsYm0x
+eWN5NXZjbWRjWEZ3dmRGeGNYQzk1YjNWeUxYQnZjM1F0YVc0dFluVnlaMlZ5YUdGMWN5MXVaWGN0
+Y21WemRHRjFjbUZ1ZEMxc2RXNWphQzEyWlc1MVpWeGNYQzgyTnpSY1hGd3ZNVndpTEZ3aWFXUmNJ
+anBjSW1RMVltTXdOMk5rTkRSalpEUTRNR000WVRnMk16bGpaV0kxTnpnelltWTJYQ0lzWENKMWNt
+eGZhV1J6WENJNlcxd2lZamMyWW1JNU5HVXhZamN5T1dVNU5tVTBaV1ZqT0RSa1pqSTBPREF6TUdJ
+Mk1tRm1NakJqTkZ3aVhYMGlmUSI+DQo8Yj48c3BhbiBzdHlsZT0iY29sb3I6IzAwNjY5OTt0ZXh0
+LWRlY29yYXRpb246bm9uZSI+aHR0cHM6Ly90YWxrLm9wZW5tcnMub3JnL3QveW91ci1wb3N0LWlu
+LWJ1cmdlcmhhdXMtbmV3LXJlc3RhdXJhbnQtbHVuY2gtdmVudWUvNjc0LzE8L3NwYW4+PC9iPjwv
+YT4gaW4geW91ciBicm93c2VyLjxvOnA+PC9vOnA+PC9zcGFuPjwvcD4NCjwvZGl2Pg0KPGRpdj4N
+CjxwPjxzcGFuIHN0eWxlPSJjb2xvcjojNjY2NjY2Ij5UbyB1bnN1YnNjcmliZSBmcm9tIHRoZXNl
+IGVtYWlscywgdmlzaXQgeW91ciA8YSBocmVmPSJodHRwOi8vY2wub3Blbm1ycy5vcmcvdHJhY2sv
+Y2xpY2svMzAwMzk5MDUvdGFsay5vcGVubXJzLm9yZz9wPWV5SnpJam9pZFV4dVdsZzVWRmMwT1da
+V1MwWTRiRmRMZG1seVdHc3hUVjl6SWl3aWRpSTZNU3dpY0NJNkludGNJblZjSWpvek1EQXpPVGt3
+TlN4Y0luWmNJam94TEZ3aWRYSnNYQ0k2WENKb2RIUndjenBjWEZ3dlhGeGNMM1JoYkdzdWIzQmxi
+bTF5Y3k1dmNtZGNYRnd2YlhsY1hGd3ZjSEpsWm1WeVpXNWpaWE5jSWl4Y0ltbGtYQ0k2WENKa05X
+SmpNRGRqWkRRMFkyUTBPREJqT0dFNE5qTTVZMlZpTlRjNE0ySm1ObHdpTEZ3aWRYSnNYMmxrYzF3
+aU9sdGNJbUk0TVdVd1pqQTFORFk1TkRNME56Z3lNMkZtTWpBMk5qRmpaamMzWkdOaU4yTmhZemRt
+TWpKY0lsMTlJbjAiPg0KPGI+PHNwYW4gc3R5bGU9ImNvbG9yOiMwMDY2OTk7dGV4dC1kZWNvcmF0
+aW9uOm5vbmUiPnVzZXIgcHJlZmVyZW5jZXM8L3NwYW4+PC9iPjwvYT4uPG86cD48L286cD48L3Nw
+YW4+PC9wPg0KPC9kaXY+DQo8L2Rpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxpbWcgYm9yZGVy
+PSIwIiB3aWR0aD0iMSIgaGVpZ2h0PSIxIiBpZD0iX3gwMDAwX2kxMDI2IiBzcmM9Imh0dHA6Ly9j
+bC5vcGVubXJzLm9yZy90cmFjay9vcGVuLnBocD91PTMwMDM5OTA1JmFtcDtpZD1kNWJjMDdjZDQ0
+Y2Q0ODBjOGE4NjM5Y2ViNTc4M2JmNiI+PG86cD48L286cD48L3A+DQo8L2Rpdj4NCjwvYm9keT4N
+CjwvaHRtbD4NCg==
+
+--_000_B0DFE1BEB3739743BC9B639D0E6BC8FF217A6341IUMSSGMBX104ads_--
diff --git a/spec/fixtures/emails/paragraphs.cooked b/spec/fixtures/emails/paragraphs.cooked
new file mode 100644
index 0000000000..da83260e09
--- /dev/null
+++ b/spec/fixtures/emails/paragraphs.cooked
@@ -0,0 +1,7 @@
+<p>Is there any reason the <em>old</em> candy can't be be kept in silos while the new candy
+is imported into <em>new</em> silos?</p>
+
+<p>The thing about candy is it stays delicious for a long time -- we can just keep
+it there without worrying about it too much, imo.</p>
+
+<p>Thanks for listening.</p>
\ No newline at end of file
diff --git a/spec/fixtures/emails/paragraphs.eml b/spec/fixtures/emails/paragraphs.eml
new file mode 100644
index 0000000000..2d5b5283f7
--- /dev/null
+++ b/spec/fixtures/emails/paragraphs.eml
@@ -0,0 +1,42 @@
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <jake@adventuretime.ooo>
+To: reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+Is there any reason the *old* candy can't be be kept in silos while the new candy
+is imported into *new* silos?
+
+The thing about candy is it stays delicious for a long time -- we can just keep
+it there without worrying about it too much, imo.
+
+Thanks for listening.
+
+On Sun, Jun 9, 2013 at 1:39 PM, eviltrout via Discourse Meta
+<reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo> wrote:
+>
+>
+>
+> eviltrout posted in 'Adventure Time Sux' on Discourse Meta:
+>
+> ---
+> hey guys everyone knows adventure time sucks!
+>
+> ---
+> Please visit this link to respond: http://localhost:3000/t/adventure-time-sux/1234/3
+>
+> To unsubscribe from these emails, visit your [user preferences](http://localhost:3000/user_preferences).
+>
diff --git a/spec/fixtures/emails/previous.eml b/spec/fixtures/emails/previous.eml
new file mode 100644
index 0000000000..24ac5a63de
--- /dev/null
+++ b/spec/fixtures/emails/previous.eml
@@ -0,0 +1,38 @@
+
+Delivered-To: discourse-reply+cd480e301683c9902891f15968bf07a5@discourse.org
+Received: by 10.194.216.104 with SMTP id op8csp80593wjc;
+        Wed, 24 Jul 2013 07:59:14 -0700 (PDT)
+Return-Path: <walter.white@googlemail.com>
+References: <topic/5043@discourse.org> <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
+From: Walter White <walter.white@googlemail.com>
+In-Reply-To: <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
+Mime-Version: 1.0 (1.0)
+Date: Wed, 24 Jul 2013 15:59:10 +0100
+Message-ID: <4597127794206131679@unknownmsgid>
+Subject: Re: [Discourse] new reply to your post in 'Crystal Blue'
+To: walter via Discourse <reply+cd480e301683c9902891f15968bf07a5@appmail.adventuretime.ooo>
+Content-Type: multipart/alternative; boundary=001a11c20edc15a39304e2432790
+
+This will not include the previous discussion that is present in this email.
+ ------------------------------
+Previous discussion
+skylerwhite<http://discourse.org/users/skylerwhite> July 24
+
+This is a reply.
+    fring <http://discourse.org/users/fring>  July 24
+
+This is an older reply.
+    hank_schrader <http://discourse.org/users/hank_schrader>  July 24
+
+Of course another reply here.
+    walterwhite <http://discourse.org/users/walterwhite>  July 24
+
+ ------------------------------
+
+To respond, reply to this email or visit
+http://discourse.org/t/crystal-blue/5043/10in
+your browser.
+
+To unsubscribe from these emails, visit your user
+preferences<http://discourse.org/user_preferences>
+.
diff --git a/spec/fixtures/emails/previous_replies.eml b/spec/fixtures/emails/previous_replies.eml
new file mode 100644
index 0000000000..3fd74482c0
--- /dev/null
+++ b/spec/fixtures/emails/previous_replies.eml
@@ -0,0 +1,180 @@
+Delivered-To: reply@discourse.org
+MIME-Version: 1.0
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+References: <topic/22638@meta.discourse.org>
+  <topic/22638/86406@meta.discourse.org>
+Date: Fri, 28 Nov 2014 12:55:32 -0800
+Subject: Re: [Discourse Meta] [Lounge] Testing default email replies
+From: Walter White <walter.white@googlemail.com>
+To: Discourse Meta <reply@discourse.org>
+Content-Type: multipart/alternative; boundary=001a1137c9285318bb0508f17bc5
+
+--001a1137c9285318bb0508f17bc5
+Content-Type: text/plain; charset=UTF-8
+
+### this is a reply from iOS Gmail app
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy
+dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps
+over the lazy dog.
+
+This is **bold** text in Markdown.
+
+This is a link to http://example.com
+
+On Friday, November 28, 2014, Arpit Jalan <info@discourse.org> wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+--001a1137c9285318bb0508f17bc5
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+### this is a reply from iOS Gmail app<div><br></div><div>The quick brown f=
+ox jumps over the lazy dog.=C2=A0<font><span style=3D"background-color:rgba=
+(255,255,255,0)">The quick brown fox jumps over the lazy dog.=C2=A0The quic=
+k brown fox jumps over the lazy dog.=C2=A0The quick brown fox jumps over th=
+e lazy dog.=C2=A0The quick brown fox jumps over the lazy dog.=C2=A0The quic=
+k brown fox jumps over the lazy dog.=C2=A0The quick brown fox jumps over th=
+e lazy dog.=C2=A0</span></font></div><div><font><span style><br></span></fo=
+nt></div><div><font><span style>This is **bold** text in Markdown.</span></=
+font></div><div><font><span style><br></span></font></div><div><font><span =
+style>This is a link to <a href=3D"http://example.com">http://example.com</=
+a><br></span></font><br>On Friday, November 28, 2014, Arpit Jalan &lt;<a hr=
+ef=3D"mailto:info@discourse.org">info@discourse.org</a>&gt; wrote:<br><bloc=
+kquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #cc=
+c solid;padding-left:1ex"><div>
+
+<table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" bor=
+der=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/techapj/45/3281.png" title=3D"techAPJ" style=3D"max-wi=
+dth:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/techapj" style=3D"text-=
+decoration:none;font-weight:bold;color:#006699;font-size:13px;font-family:&=
+#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;text-d=
+ecoration:none;font-weight:bold" target=3D"_blank">techAPJ</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">Test reply.</p>
+
+<p style=3D"margin-top:0;border:0">First paragraph.</p>
+
+<p style=3D"margin-top:0;border:0">Second paragraph.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+  <div style=3D"color:#666">
+    <p>To respond, reply to this email or visit <a href=3D"https://meta.dis=
+course.org/t/testing-default-email-replies/22638/3" style=3D"text-decoratio=
+n:none;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https:/=
+/meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your bro=
+wser.</p>
+  </div>
+  <hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-c=
+olor:#ddd;min-height:1px;border:1px">
+  <h4>Previous Replies</h4>
+
+  <table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" b=
+order=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/codinghorror/45/5297.png" title=3D"codinghorror" style=
+=3D"max-width:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/codinghorror" style=3D"=
+text-decoration:none;font-weight:bold;color:#006699;font-size:13px;font-fam=
+ily:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;t=
+ext-decoration:none;font-weight:bold" target=3D"_blank">codinghorror</a><br=
+>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">We&#39;re testing the latest GitHub emai=
+l processing library which we are integrating now.</p>
+
+<p style=3D"margin-top:0;border:0"><a href=3D"https://github.com/github/ema=
+il_reply_parser" style=3D"text-decoration:none;font-weight:bold;color:#0066=
+99" target=3D"_blank">https://github.com/github/email_reply_parser</a></p>
+
+<p style=3D"margin-top:0;border:0">Go ahead and reply to this topic and I&#=
+39;ll reply from various email clients for testing.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-col=
+or:#ddd;min-height:1px;border:1px">
+
+<div style=3D"color:#666">
+<p>To respond, reply to this email or visit <a href=3D"https://meta.discour=
+se.org/t/testing-default-email-replies/22638/3" style=3D"text-decoration:no=
+ne;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https://met=
+a.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser=
+.</p>
+</div>
+<div style=3D"color:#666">
+<p>To unsubscribe from these emails, visit your <a href=3D"https://meta.dis=
+course.org/my/preferences" style=3D"text-decoration:none;font-weight:bold;c=
+olor:#006699;color:#666" target=3D"_blank">user preferences</a>.</p>
+</div>
+</div>
+</blockquote></div>
+
+--001a1137c9285318bb0508f17bc5--
diff --git a/spec/fixtures/emails/too_many_mentions.eml b/spec/fixtures/emails/too_many_mentions.eml
new file mode 100644
index 0000000000..9cc7b75c94
--- /dev/null
+++ b/spec/fixtures/emails/too_many_mentions.eml
@@ -0,0 +1,31 @@
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <jake@adventuretime.ooo>
+To: reply+636ca428858779856c226bb145ef4fad@appmail.adventuretime.ooo
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+
+@user1
+@user2
+@user3
+@user4
+@user5
+@user6
+@user7
+@user8
+@user9
+@user10
+@user11
\ No newline at end of file
diff --git a/spec/fixtures/emails/too_short.eml b/spec/fixtures/emails/too_short.eml
new file mode 100644
index 0000000000..54fed0f98c
--- /dev/null
+++ b/spec/fixtures/emails/too_short.eml
@@ -0,0 +1,21 @@
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <FROM>
+To: TO
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: SUBJECT
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+
++1
\ No newline at end of file
diff --git a/spec/fixtures/emails/valid_incoming.cooked b/spec/fixtures/emails/valid_incoming.cooked
new file mode 100644
index 0000000000..2bf3582537
--- /dev/null
+++ b/spec/fixtures/emails/valid_incoming.cooked
@@ -0,0 +1,5 @@
+<p>Hey folks,</p>
+
+<p>I was thinking. Wouldn't it be great if we could post topics via email? Yes it would!</p>
+
+<p>Jakie</p>
diff --git a/spec/fixtures/emails/valid_incoming.eml b/spec/fixtures/emails/valid_incoming.eml
new file mode 100644
index 0000000000..5e8db53319
--- /dev/null
+++ b/spec/fixtures/emails/valid_incoming.eml
@@ -0,0 +1,25 @@
+Return-Path: <FROM>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <TO>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <TO>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <FROM>
+To: <TO>
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: We should have a post-by-email-feature.
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+Hey folks,
+
+I was thinking. Wouldn't it be great if we could post topics via email? Yes it would!
+
+Jakie
+
diff --git a/spec/fixtures/emails/valid_reply.cooked b/spec/fixtures/emails/valid_reply.cooked
new file mode 100644
index 0000000000..4bce79ad12
--- /dev/null
+++ b/spec/fixtures/emails/valid_reply.cooked
@@ -0,0 +1,4 @@
+<p>I could not disagree more. I am obviously biased but adventure time is the
+greatest show ever created. Everyone should watch it.</p>
+
+<ul><li>Jake out</li></ul>
diff --git a/spec/fixtures/emails/valid_reply.eml b/spec/fixtures/emails/valid_reply.eml
new file mode 100644
index 0000000000..1e69638995
--- /dev/null
+++ b/spec/fixtures/emails/valid_reply.eml
@@ -0,0 +1,40 @@
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <jake@adventuretime.ooo>
+To: reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+I could not disagree more. I am obviously biased but adventure time is the
+greatest show ever created. Everyone should watch it.
+
+- Jake out
+
+
+On Sun, Jun 9, 2013 at 1:39 PM, eviltrout via Discourse Meta
+<reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo> wrote:
+>
+>
+>
+> eviltrout posted in 'Adventure Time Sux' on Discourse Meta:
+>
+> ---
+> hey guys everyone knows adventure time sucks!
+>
+> ---
+> Please visit this link to respond: http://localhost:3000/t/adventure-time-sux/1234/3
+>
+> To unsubscribe from these emails, visit your [user preferences](http://localhost:3000/user_preferences).
+>
\ No newline at end of file
diff --git a/spec/fixtures/emails/via_line.eml b/spec/fixtures/emails/via_line.eml
new file mode 100644
index 0000000000..0b2947ff95
--- /dev/null
+++ b/spec/fixtures/emails/via_line.eml
@@ -0,0 +1,25 @@
+
+Delivered-To: discourse-reply+cd480e301683c9902891f15968bf07a5@discourse.org
+Received: by 10.194.216.104 with SMTP id op8csp80593wjc;
+        Wed, 24 Jul 2013 07:59:14 -0700 (PDT)
+Return-Path: <walter.white@googlemail.com>
+References: <topic/5043@discourse.org> <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
+From: Walter White <walter.white@googlemail.com>
+In-Reply-To: <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
+Mime-Version: 1.0 (1.0)
+Date: Wed, 24 Jul 2013 15:59:10 +0100
+Message-ID: <4597127794206131679@unknownmsgid>
+Subject: Re: [Discourse] new reply to your post in 'Crystal Blue'
+To: walter via Discourse <reply+cd480e301683c9902891f15968bf07a5@appmail.adventuretime.ooo>
+Content-Type: multipart/alternative; boundary=001a11c20edc15a39304e2432790
+
+Hello this email has content!
+
+codinghorror via Discourse wrote:
+> [codinghorror]  codinghorror
+> <http://meta.discourse.org/users/codinghorror>
+> August 7
+>
+> It wouldn't be great at the moment for 100% email, since there's no
+> way to be notified of new topics via email. (you can get notified of
+> new replies to your posts and topics via email, and reply to them.)
diff --git a/spec/fixtures/emails/windows_8_metro.eml b/spec/fixtures/emails/windows_8_metro.eml
new file mode 100644
index 0000000000..67d204af56
--- /dev/null
+++ b/spec/fixtures/emails/windows_8_metro.eml
@@ -0,0 +1,173 @@
+Delivered-To: reply@discourse.org
+Return-Path: <walter.white@googlemail.com>
+MIME-Version: 1.0
+From: <walter.white@googlemail.com>
+To:
+  =?utf-8?Q?Discourse_Meta?=
+   <reply@discourse.org>
+Subject:
+ =?utf-8?Q?Re:_[Discourse_Meta]_[Lounge]_Testing_default_email_replies?=
+Importance: Normal
+Date: Fri, 28 Nov 2014 21:29:10 +0000
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+References:
+ <topic/22638@meta.discourse.org>,<topic/22638/86406@meta.discourse.org>
+Content-Type: multipart/alternative;
+  boundary="_866E2678-BB4F-4DD8-BE18-81B04AD8D1BC_"
+
+--_866E2678-BB4F-4DD8-BE18-81B04AD8D1BC_
+Content-Transfer-Encoding: base64
+Content-Type: text/plain; charset="utf-8"
+
+IyMjIHJlcGx5IGZyb20gZGVmYXVsdCBtYWlsIGNsaWVudCBpbiBXaW5kb3dzIDguMSBNZXRybw0K
+DQoNClRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWlj
+ayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gg
+anVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0
+aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cu
+IFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBi
+cm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVt
+cHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUg
+bGF6eSBkb2cuDQoNCg0KVGhpcyBpcyBhICoqYm9sZCoqIHdvcmQgaW4gTWFya2Rvd24NCg0KDQpU
+aGlzIGlzIGEgbGluayBodHRwOi8vZXhhbXBsZS5jb20NCiANCg0KDQoNCg0KDQpGcm9tOiBBcnBp
+dCBKYWxhbg0KU2VudDog4oCORnJpZGF54oCOLCDigI5Ob3ZlbWJlcuKAjiDigI4yOOKAjiwg4oCO
+MjAxNCDigI4xMuKAjjrigI4zNeKAjiDigI5QTQ0KVG86IGplZmYgYXR3b29kDQoNCg0KDQoNCg0K
+DQogdGVjaEFQSg0KTm92ZW1iZXIgMjggDQoNClRlc3QgcmVwbHkuDQoNCkZpcnN0IHBhcmFncmFw
+aC4NCg0KU2Vjb25kIHBhcmFncmFwaC4NCg0KDQoNClRvIHJlc3BvbmQsIHJlcGx5IHRvIHRoaXMg
+ZW1haWwgb3IgdmlzaXQgaHR0cHM6Ly9tZXRhLmRpc2NvdXJzZS5vcmcvdC90ZXN0aW5nLWRlZmF1
+bHQtZW1haWwtcmVwbGllcy8yMjYzOC8zIGluIHlvdXIgYnJvd3Nlci4NCg0KDQoNClByZXZpb3Vz
+IFJlcGxpZXMNCg0KIGNvZGluZ2hvcnJvcg0KTm92ZW1iZXIgMjggDQoNCldlJ3JlIHRlc3Rpbmcg
+dGhlIGxhdGVzdCBHaXRIdWIgZW1haWwgcHJvY2Vzc2luZyBsaWJyYXJ5IHdoaWNoIHdlIGFyZSBp
+bnRlZ3JhdGluZyBub3cuDQoNCmh0dHBzOi8vZ2l0aHViLmNvbS9naXRodWIvZW1haWxfcmVwbHlf
+cGFyc2VyDQoNCkdvIGFoZWFkIGFuZCByZXBseSB0byB0aGlzIHRvcGljIGFuZCBJJ2xsIHJlcGx5
+IGZyb20gdmFyaW91cyBlbWFpbCBjbGllbnRzIGZvciB0ZXN0aW5nLg0KDQoNCg0KDQoNClRvIHJl
+c3BvbmQsIHJlcGx5IHRvIHRoaXMgZW1haWwgb3IgdmlzaXQgaHR0cHM6Ly9tZXRhLmRpc2NvdXJz
+ZS5vcmcvdC90ZXN0aW5nLWRlZmF1bHQtZW1haWwtcmVwbGllcy8yMjYzOC8zIGluIHlvdXIgYnJv
+d3Nlci4NCg0KDQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoZXNlIGVtYWlscywgdmlzaXQgeW91ciB1
+c2VyIHByZWZlcmVuY2VzLg==
+
+--_866E2678-BB4F-4DD8-BE18-81B04AD8D1BC_
+Content-Transfer-Encoding: base64
+Content-Type: text/html; charset="utf-8"
+
+CjxodG1sPgo8aGVhZD4KPG1ldGEgbmFtZT0iZ2VuZXJhdG9yIiBjb250ZW50PSJXaW5kb3dzIE1h
+aWwgMTcuNS45NjAwLjIwNjA1Ij4KPHN0eWxlIGRhdGEtZXh0ZXJuYWxzdHlsZT0idHJ1ZSI+PCEt
+LQpwLk1zb0xpc3RQYXJhZ3JhcGgsIGxpLk1zb0xpc3RQYXJhZ3JhcGgsIGRpdi5Nc29MaXN0UGFy
+YWdyYXBoIHsKbWFyZ2luLXRvcDowaW47Cm1hcmdpbi1yaWdodDowaW47Cm1hcmdpbi1ib3R0b206
+MGluOwptYXJnaW4tbGVmdDouNWluOwptYXJnaW4tYm90dG9tOi4wMDAxcHQ7Cn0KcC5Nc29Ob3Jt
+YWwsIGxpLk1zb05vcm1hbCwgZGl2Lk1zb05vcm1hbCB7Cm1hcmdpbjowaW47Cm1hcmdpbi1ib3R0
+b206LjAwMDFwdDsKfQpwLk1zb0xpc3RQYXJhZ3JhcGhDeFNwRmlyc3QsIGxpLk1zb0xpc3RQYXJh
+Z3JhcGhDeFNwRmlyc3QsIGRpdi5Nc29MaXN0UGFyYWdyYXBoQ3hTcEZpcnN0LCAKcC5Nc29MaXN0
+UGFyYWdyYXBoQ3hTcE1pZGRsZSwgbGkuTXNvTGlzdFBhcmFncmFwaEN4U3BNaWRkbGUsIGRpdi5N
+c29MaXN0UGFyYWdyYXBoQ3hTcE1pZGRsZSwgCnAuTXNvTGlzdFBhcmFncmFwaEN4U3BMYXN0LCBs
+aS5Nc29MaXN0UGFyYWdyYXBoQ3hTcExhc3QsIGRpdi5Nc29MaXN0UGFyYWdyYXBoQ3hTcExhc3Qg
+ewptYXJnaW4tdG9wOjBpbjsKbWFyZ2luLXJpZ2h0OjBpbjsKbWFyZ2luLWJvdHRvbTowaW47Cm1h
+cmdpbi1sZWZ0Oi41aW47Cm1hcmdpbi1ib3R0b206LjAwMDFwdDsKbGluZS1oZWlnaHQ6MTE1JTsK
+fQotLT48L3N0eWxlPjwvaGVhZD4KPGJvZHkgZGlyPSJsdHIiPgo8ZGl2IGRhdGEtZXh0ZXJuYWxz
+dHlsZT0iZmFsc2UiIGRpcj0ibHRyIiBzdHlsZT0iZm9udC1mYW1pbHk6ICdDYWxpYnJpJywgJ1Nl
+Z29lIFVJJywgJ01laXJ5bycsICdNaWNyb3NvZnQgWWFIZWkgVUknLCAnTWljcm9zb2Z0IEpoZW5n
+SGVpIFVJJywgJ01hbGd1biBHb3RoaWMnLCAnc2Fucy1zZXJpZic7Zm9udC1zaXplOjEycHQ7Ij48
+ZGl2IHN0eWxlPSJmb250LXNpemU6IDE0cHQ7Ij4jIyMgcmVwbHkgZnJvbSBkZWZhdWx0IG1haWwg
+Y2xpZW50IGluIFdpbmRvd3MgOC4xIE1ldHJvPC9kaXY+PGRpdiBzdHlsZT0iZm9udC1zaXplOiAx
+NHB0OyI+PGJyPjwvZGl2PjxkaXYgc3R5bGU9ImZvbnQtc2l6ZTogMTRwdDsiPlRoZSBxdWljayBi
+cm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVt
+cHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUg
+bGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRo
+ZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93
+biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMg
+b3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6
+eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuPC9kaXY+
+PGRpdiBzdHlsZT0iZm9udC1zaXplOiAxNHB0OyI+PGJyPjwvZGl2PjxkaXYgc3R5bGU9ImZvbnQt
+c2l6ZTogMTRwdDsiPlRoaXMgaXMgYSAqKmJvbGQqKiB3b3JkIGluIE1hcmtkb3duPC9kaXY+PGRp
+diBzdHlsZT0iZm9udC1zaXplOiAxNHB0OyI+PGJyPjwvZGl2PjxkaXYgc3R5bGU9ImZvbnQtc2l6
+ZTogMTRwdDsiPlRoaXMgaXMgYSBsaW5rIDxhIGhyZWY9Imh0dHA6Ly9leGFtcGxlLmNvbSI+aHR0
+cDovL2V4YW1wbGUuY29tPC9hPjxicj4mbmJzcDs8L2Rpdj48ZGl2IHN0eWxlPSJmb250LXNpemU6
+IDE0cHQ7Ij48YnI+PC9kaXY+PGRpdiBzdHlsZT0icGFkZGluZy10b3A6IDVweDsgYm9yZGVyLXRv
+cC1jb2xvcjogcmdiKDIyOSwgMjI5LCAyMjkpOyBib3JkZXItdG9wLXdpZHRoOiAxcHg7IGJvcmRl
+ci10b3Atc3R5bGU6IHNvbGlkOyI+PGRpdj48Zm9udCBmYWNlPSIgJ0NhbGlicmknLCAnU2Vnb2Ug
+VUknLCAnTWVpcnlvJywgJ01pY3Jvc29mdCBZYUhlaSBVSScsICdNaWNyb3NvZnQgSmhlbmdIZWkg
+VUknLCAnTWFsZ3VuIEdvdGhpYycsICdzYW5zLXNlcmlmJyIgc3R5bGU9J2xpbmUtaGVpZ2h0OiAx
+NXB0OyBsZXR0ZXItc3BhY2luZzogMC4wMmVtOyBmb250LWZhbWlseTogIkNhbGlicmkiLCAiU2Vn
+b2UgVUkiLCAiTWVpcnlvIiwgIk1pY3Jvc29mdCBZYUhlaSBVSSIsICJNaWNyb3NvZnQgSmhlbmdI
+ZWkgVUkiLCAiTWFsZ3VuIEdvdGhpYyIsICJzYW5zLXNlcmlmIjsgZm9udC1zaXplOiAxMnB0Oyc+
+PGI+RnJvbTo8L2I+Jm5ic3A7PGEgaHJlZj0ibWFpbHRvOmluZm9AZGlzY291cnNlLm9yZyIgdGFy
+Z2V0PSJfcGFyZW50Ij5BcnBpdCBKYWxhbjwvYT48YnI+PGI+U2VudDo8L2I+Jm5ic3A74oCORnJp
+ZGF54oCOLCDigI5Ob3ZlbWJlcuKAjiDigI4yOOKAjiwg4oCOMjAxNCDigI4xMuKAjjrigI4zNeKA
+jiDigI5QTTxicj48Yj5Ubzo8L2I+Jm5ic3A7PGEgaHJlZj0ibWFpbHRvOmphdHdvb2RAY29kaW5n
+aG9ycm9yLmNvbSIgdGFyZ2V0PSJfcGFyZW50Ij5qZWZmIGF0d29vZDwvYT48L2ZvbnQ+PC9kaXY+
+PC9kaXY+PGRpdj48YnI+PC9kaXY+PGRpdiBkaXI9IiI+PGRpdj4KCjx0YWJsZSB0YWJpbmRleD0i
+LTEiIHN0eWxlPSJtYXJnaW4tYm90dG9tOiAyNXB4OyIgYm9yZGVyPSIwIiBjZWxsc3BhY2luZz0i
+MCIgY2VsbHBhZGRpbmc9IjAiPgogIDx0Ym9keT4KICAgIDx0cj4KICAgICAgPHRkIHN0eWxlPSJ3
+aWR0aDogNTVweDsgdmVydGljYWwtYWxpZ246IHRvcDsiPgogICAgICAgIDxpbWcgd2lkdGg9IjQ1
+IiBoZWlnaHQ9IjQ1IiB0YWJpbmRleD0iLTEiIHN0eWxlPSJtYXgtd2lkdGg6IDEwMCU7IiBzcmM9
+Imh0dHBzOi8vbWV0YS1kaXNjb3Vyc2UuZ2xvYmFsLnNzbC5mYXN0bHkubmV0L3VzZXJfYXZhdGFy
+L21ldGEuZGlzY291cnNlLm9yZy90ZWNoYXBqLzQ1LzMyODEucG5nIiBkYXRhLW1zLWltZ3NyYz0i
+aHR0cHM6Ly9tZXRhLWRpc2NvdXJzZS5nbG9iYWwuc3NsLmZhc3RseS5uZXQvdXNlcl9hdmF0YXIv
+bWV0YS5kaXNjb3Vyc2Uub3JnL3RlY2hhcGovNDUvMzI4MS5wbmciPgogICAgICA8L3RkPgogICAg
+ICA8dGQ+CiAgICAgICAgPGEgc3R5bGU9J2NvbG9yOiByZ2IoNTksIDg5LCAxNTIpOyBmb250LWZh
+bWlseTogImx1Y2lkYSBncmFuZGUiLHRhaG9tYSx2ZXJkYW5hLGFyaWFsLHNhbnMtc2VyaWY7IGZv
+bnQtc2l6ZTogMTNweDsgZm9udC13ZWlnaHQ6IGJvbGQ7IHRleHQtZGVjb3JhdGlvbjogbm9uZTsn
+IGhyZWY9Imh0dHBzOi8vbWV0YS5kaXNjb3Vyc2Uub3JnL3VzZXJzL3RlY2hhcGoiIHRhcmdldD0i
+X3BhcmVudCI+dGVjaEFQSjwvYT48YnI+CiAgICAgICAgPHNwYW4gc3R5bGU9J3RleHQtYWxpZ246
+IHJpZ2h0OyBjb2xvcjogcmdiKDE1MywgMTUzLCAxNTMpOyBwYWRkaW5nLXJpZ2h0OiA1cHg7IGZv
+bnQtZmFtaWx5OiAibHVjaWRhIGdyYW5kZSIsdGFob21hLHZlcmRhbmEsYXJpYWwsc2Fucy1zZXJp
+ZjsgZm9udC1zaXplOiAxMXB4Oyc+Tm92ZW1iZXIgMjg8L3NwYW4+CiAgICAgIDwvdGQ+CiAgICA8
+L3RyPgogICAgPHRyPgogICAgICA8dGQgc3R5bGU9InBhZGRpbmctdG9wOiA1cHg7IiBjb2xzcGFu
+PSIyIj4KPHAgc3R5bGU9ImJvcmRlcjogMHB4IGJsYWNrOyBib3JkZXItaW1hZ2U6IG5vbmU7IG1h
+cmdpbi10b3A6IDBweDsiPlRlc3QgcmVwbHkuPC9wPgoKPHAgc3R5bGU9ImJvcmRlcjogMHB4IGJs
+YWNrOyBib3JkZXItaW1hZ2U6IG5vbmU7IG1hcmdpbi10b3A6IDBweDsiPkZpcnN0IHBhcmFncmFw
+aC48L3A+Cgo8cCBzdHlsZT0iYm9yZGVyOiAwcHggYmxhY2s7IGJvcmRlci1pbWFnZTogbm9uZTsg
+bWFyZ2luLXRvcDogMHB4OyI+U2Vjb25kIHBhcmFncmFwaC48L3A+CjwvdGQ+CiAgICA8L3RyPgog
+IDwvdGJvZHk+CjwvdGFibGU+CgoKICA8ZGl2IHN0eWxlPSJjb2xvcjogcmdiKDEwMiwgMTAyLCAx
+MDIpOyI+CiAgICA8cD5UbyByZXNwb25kLCByZXBseSB0byB0aGlzIGVtYWlsIG9yIHZpc2l0IDxh
+IHN0eWxlPSJjb2xvcjogcmdiKDEwMiwgMTAyLCAxMDIpOyBmb250LXdlaWdodDogYm9sZDsgdGV4
+dC1kZWNvcmF0aW9uOiBub25lOyIgaHJlZj0iaHR0cHM6Ly9tZXRhLmRpc2NvdXJzZS5vcmcvdC90
+ZXN0aW5nLWRlZmF1bHQtZW1haWwtcmVwbGllcy8yMjYzOC8zIiB0YXJnZXQ9Il9wYXJlbnQiPmh0
+dHBzOi8vbWV0YS5kaXNjb3Vyc2Uub3JnL3QvdGVzdGluZy1kZWZhdWx0LWVtYWlsLXJlcGxpZXMv
+MjI2MzgvMzwvYT4gaW4geW91ciBicm93c2VyLjwvcD4KICA8L2Rpdj4KICA8aHIgc3R5bGU9ImJv
+cmRlcjogMXB4IGJsYWNrOyBib3JkZXItaW1hZ2U6IG5vbmU7IGhlaWdodDogMXB4OyBiYWNrZ3Jv
+dW5kLWNvbG9yOiByZ2IoMjIxLCAyMjEsIDIyMSk7Ij4KICA8aDQ+UHJldmlvdXMgUmVwbGllczwv
+aDQ+CgogIDx0YWJsZSB0YWJpbmRleD0iLTEiIHN0eWxlPSJtYXJnaW4tYm90dG9tOiAyNXB4OyIg
+Ym9yZGVyPSIwIiBjZWxsc3BhY2luZz0iMCIgY2VsbHBhZGRpbmc9IjAiPgogIDx0Ym9keT4KICAg
+IDx0cj4KICAgICAgPHRkIHN0eWxlPSJ3aWR0aDogNTVweDsgdmVydGljYWwtYWxpZ246IHRvcDsi
+PgogICAgICAgIDxpbWcgd2lkdGg9IjQ1IiBoZWlnaHQ9IjQ1IiB0YWJpbmRleD0iLTEiIHN0eWxl
+PSJtYXgtd2lkdGg6IDEwMCU7IiBzcmM9Imh0dHBzOi8vbWV0YS1kaXNjb3Vyc2UuZ2xvYmFsLnNz
+bC5mYXN0bHkubmV0L3VzZXJfYXZhdGFyL21ldGEuZGlzY291cnNlLm9yZy9jb2Rpbmdob3Jyb3Iv
+NDUvNTI5Ny5wbmciIGRhdGEtbXMtaW1nc3JjPSJodHRwczovL21ldGEtZGlzY291cnNlLmdsb2Jh
+bC5zc2wuZmFzdGx5Lm5ldC91c2VyX2F2YXRhci9tZXRhLmRpc2NvdXJzZS5vcmcvY29kaW5naG9y
+cm9yLzQ1LzUyOTcucG5nIj4KICAgICAgPC90ZD4KICAgICAgPHRkPgogICAgICAgIDxhIHN0eWxl
+PSdjb2xvcjogcmdiKDU5LCA4OSwgMTUyKTsgZm9udC1mYW1pbHk6ICJsdWNpZGEgZ3JhbmRlIix0
+YWhvbWEsdmVyZGFuYSxhcmlhbCxzYW5zLXNlcmlmOyBmb250LXNpemU6IDEzcHg7IGZvbnQtd2Vp
+Z2h0OiBib2xkOyB0ZXh0LWRlY29yYXRpb246IG5vbmU7JyBocmVmPSJodHRwczovL21ldGEuZGlz
+Y291cnNlLm9yZy91c2Vycy9jb2Rpbmdob3Jyb3IiIHRhcmdldD0iX3BhcmVudCI+Y29kaW5naG9y
+cm9yPC9hPjxicj4KICAgICAgICA8c3BhbiBzdHlsZT0ndGV4dC1hbGlnbjogcmlnaHQ7IGNvbG9y
+OiByZ2IoMTUzLCAxNTMsIDE1Myk7IHBhZGRpbmctcmlnaHQ6IDVweDsgZm9udC1mYW1pbHk6ICJs
+dWNpZGEgZ3JhbmRlIix0YWhvbWEsdmVyZGFuYSxhcmlhbCxzYW5zLXNlcmlmOyBmb250LXNpemU6
+IDExcHg7Jz5Ob3ZlbWJlciAyODwvc3Bhbj4KICAgICAgPC90ZD4KICAgIDwvdHI+CiAgICA8dHI+
+CiAgICAgIDx0ZCBzdHlsZT0icGFkZGluZy10b3A6IDVweDsiIGNvbHNwYW49IjIiPgo8cCBzdHls
+ZT0iYm9yZGVyOiAwcHggYmxhY2s7IGJvcmRlci1pbWFnZTogbm9uZTsgbWFyZ2luLXRvcDogMHB4
+OyI+V2UncmUgdGVzdGluZyB0aGUgbGF0ZXN0IEdpdEh1YiBlbWFpbCBwcm9jZXNzaW5nIGxpYnJh
+cnkgd2hpY2ggd2UgYXJlIGludGVncmF0aW5nIG5vdy48L3A+Cgo8cCBzdHlsZT0iYm9yZGVyOiAw
+cHggYmxhY2s7IGJvcmRlci1pbWFnZTogbm9uZTsgbWFyZ2luLXRvcDogMHB4OyI+PGEgc3R5bGU9
+ImNvbG9yOiByZ2IoMCwgMTAyLCAxNTMpOyBmb250LXdlaWdodDogYm9sZDsgdGV4dC1kZWNvcmF0
+aW9uOiBub25lOyIgaHJlZj0iaHR0cHM6Ly9naXRodWIuY29tL2dpdGh1Yi9lbWFpbF9yZXBseV9w
+YXJzZXIiIHRhcmdldD0iX3BhcmVudCI+aHR0cHM6Ly9naXRodWIuY29tL2dpdGh1Yi9lbWFpbF9y
+ZXBseV9wYXJzZXI8L2E+PC9wPgoKPHAgc3R5bGU9ImJvcmRlcjogMHB4IGJsYWNrOyBib3JkZXIt
+aW1hZ2U6IG5vbmU7IG1hcmdpbi10b3A6IDBweDsiPkdvIGFoZWFkIGFuZCByZXBseSB0byB0aGlz
+IHRvcGljIGFuZCBJJ2xsIHJlcGx5IGZyb20gdmFyaW91cyBlbWFpbCBjbGllbnRzIGZvciB0ZXN0
+aW5nLjwvcD4KPC90ZD4KICAgIDwvdHI+CiAgPC90Ym9keT4KPC90YWJsZT4KCgo8aHIgc3R5bGU9
+ImJvcmRlcjogMXB4IGJsYWNrOyBib3JkZXItaW1hZ2U6IG5vbmU7IGhlaWdodDogMXB4OyBiYWNr
+Z3JvdW5kLWNvbG9yOiByZ2IoMjIxLCAyMjEsIDIyMSk7Ij4KCjxkaXYgc3R5bGU9ImNvbG9yOiBy
+Z2IoMTAyLCAxMDIsIDEwMik7Ij4KPHA+VG8gcmVzcG9uZCwgcmVwbHkgdG8gdGhpcyBlbWFpbCBv
+ciB2aXNpdCA8YSBzdHlsZT0iY29sb3I6IHJnYigxMDIsIDEwMiwgMTAyKTsgZm9udC13ZWlnaHQ6
+IGJvbGQ7IHRleHQtZGVjb3JhdGlvbjogbm9uZTsiIGhyZWY9Imh0dHBzOi8vbWV0YS5kaXNjb3Vy
+c2Uub3JnL3QvdGVzdGluZy1kZWZhdWx0LWVtYWlsLXJlcGxpZXMvMjI2MzgvMyIgdGFyZ2V0PSJf
+cGFyZW50Ij5odHRwczovL21ldGEuZGlzY291cnNlLm9yZy90L3Rlc3RpbmctZGVmYXVsdC1lbWFp
+bC1yZXBsaWVzLzIyNjM4LzM8L2E+IGluIHlvdXIgYnJvd3Nlci48L3A+CjwvZGl2Pgo8ZGl2IHN0
+eWxlPSJjb2xvcjogcmdiKDEwMiwgMTAyLCAxMDIpOyI+CjxwPlRvIHVuc3Vic2NyaWJlIGZyb20g
+dGhlc2UgZW1haWxzLCB2aXNpdCB5b3VyIDxhIHN0eWxlPSJjb2xvcjogcmdiKDEwMiwgMTAyLCAx
+MDIpOyBmb250LXdlaWdodDogYm9sZDsgdGV4dC1kZWNvcmF0aW9uOiBub25lOyIgaHJlZj0iaHR0
+cHM6Ly9tZXRhLmRpc2NvdXJzZS5vcmcvbXkvcHJlZmVyZW5jZXMiIHRhcmdldD0iX3BhcmVudCI+
+dXNlciBwcmVmZXJlbmNlczwvYT4uPC9wPgo8L2Rpdj4KPC9kaXY+CjwvZGl2PjxkaXYgc3R5bGU9
+ImZvbnQtc2l6ZTogMTRwdDsiPjxicj48L2Rpdj48L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+Cg==
+
+--_866E2678-BB4F-4DD8-BE18-81B04AD8D1BC_--
diff --git a/spec/fixtures/emails/wrong_reply_key.eml b/spec/fixtures/emails/wrong_reply_key.eml
new file mode 100644
index 0000000000..491e078fb5
--- /dev/null
+++ b/spec/fixtures/emails/wrong_reply_key.eml
@@ -0,0 +1,40 @@
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <jake@adventuretime.ooo>
+To: reply+QQd8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+I could not disagree more. I am obviously biased but adventure time is the
+greatest show ever created. Everyone should watch it.
+
+- Jake out
+
+
+On Sun, Jun 9, 2013 at 1:39 PM, eviltrout via Discourse Meta
+<reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com> wrote:
+>
+>
+>
+> eviltrout posted in 'Adventure Time Sux' on Discourse Meta:
+>
+> ---
+> hey guys everyone knows adventure time sucks!
+>
+> ---
+> Please visit this link to respond: http://localhost:3000/t/adventure-time-sux/1234/3
+>
+> To unsubscribe from these emails, visit your [user preferences](http://localhost:3000/user_preferences).
+>
\ No newline at end of file
diff --git a/spec/lib/gitlab/email_receiver_spec.rb b/spec/lib/gitlab/email_receiver_spec.rb
new file mode 100644
index 0000000000..d6302eac13
--- /dev/null
+++ b/spec/lib/gitlab/email_receiver_spec.rb
@@ -0,0 +1,481 @@
+require "spec_helper"
+
+# Inspired in great part by Discourse's Email::Receiver
+describe Gitlab::EmailReceiver do
+  def fixture_file(filename)
+    return '' if filename.blank?
+    file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
+    File.read(file_path)
+  end
+
+  before do
+    allow(Gitlab.config.reply_by_email).to receive(:enabled).and_return(true)
+    allow(Gitlab.config.reply_by_email).to receive(:address).and_return("reply+%{reply_key}@appmail.adventuretime.ooo")
+  end
+
+  describe 'parse_body' do
+    def test_parse_body(mail_string)
+      Gitlab::EmailReceiver.new(nil).parse_body(Mail::Message.new(mail_string))
+    end
+
+    it "raises EmptyEmailError if the message is blank" do
+      expect { test_parse_body("") }.to raise_error(Gitlab::EmailReceiver::EmptyEmailError)
+    end
+
+    it "raises EmptyEmailError if the message is not an email" do
+      expect { test_parse_body("asdf" * 30) }.to raise_error(Gitlab::EmailReceiver::EmptyEmailError)
+    end
+
+    it "raises EmptyEmailError if there is no reply content" do
+      expect { test_parse_body(fixture_file("emails/no_content_reply.eml")) }.to raise_error(Gitlab::EmailReceiver::EmptyEmailError)
+    end
+
+    it "can parse the html section" do
+      expect(test_parse_body(fixture_file("emails/html_only.eml"))).to eq("The EC2 instance - I've seen that there tends to be odd and " +
+          "unrecommended settings on the Bitnami installs that I've checked out.")
+    end
+
+    it "supports a Dutch reply" do
+      expect(test_parse_body(fixture_file("emails/dutch.eml"))).to eq("Dit is een antwoord in het Nederlands.")
+    end
+
+    it "removes an 'on date wrote' quoting line" do
+      expect(test_parse_body(fixture_file("emails/on_wrote.eml"))).to eq("Sure, all you need to do is frobnicate the foobar and you'll be all set!")
+    end
+
+    it "handles multiple paragraphs" do
+      expect(test_parse_body(fixture_file("emails/paragraphs.eml"))).
+          to eq(
+"Is there any reason the *old* candy can't be be kept in silos while the new candy
+is imported into *new* silos?
+
+The thing about candy is it stays delicious for a long time -- we can just keep
+it there without worrying about it too much, imo.
+
+Thanks for listening."
+      )
+    end
+
+    it "handles multiple paragraphs when parsing html" do
+      expect(test_parse_body(fixture_file("emails/html_paragraphs.eml"))).
+          to eq(
+"Awesome!
+
+Pleasure to have you here!
+
+:boom:"
+      )
+    end
+
+    it "handles newlines" do
+      expect(test_parse_body(fixture_file("emails/newlines.eml"))).
+          to eq(
+"This is my reply.
+It is my best reply.
+It will also be my *only* reply."
+      )
+    end
+
+    it "handles inline reply" do
+      expect(test_parse_body(fixture_file("emails/inline_reply.eml"))).
+          to eq(
+"On Wed, Oct 8, 2014 at 11:12 AM, techAPJ <info@unconfigured.discourse.org> wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog."
+      )
+    end
+
+    it "strips iPhone signature" do
+      expect(test_parse_body(fixture_file("emails/iphone_signature.eml"))).not_to match /Sent from my iPhone/
+    end
+
+    it "properly renders email reply from gmail web client" do
+      expect(test_parse_body(fixture_file("emails/gmail_web.eml"))).
+          to eq(
+"### This is a reply from standard GMail in Google Chrome.
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog.
+
+Here's some **bold** text in Markdown.
+
+Here's a link http://example.com"
+      )
+    end
+
+    it "properly renders email reply from iOS default mail client" do
+      expect(test_parse_body(fixture_file("emails/ios_default.eml"))).
+          to eq(
+"### this is a reply from iOS default mail
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+
+Here's some **bold** markdown text.
+
+Here's a link http://example.com"
+      )
+    end
+
+    it "properly renders email reply from Android 5 gmail client" do
+      expect(test_parse_body(fixture_file("emails/android_gmail.eml"))).
+          to eq(
+"### this is a reply from Android 5 gmail
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+
+This is **bold** in Markdown.
+
+This is a link to http://example.com"
+      )
+    end
+
+    it "properly renders email reply from Windows 8.1 Metro default mail client" do
+      expect(test_parse_body(fixture_file("emails/windows_8_metro.eml"))).
+          to eq(
+"### reply from default mail client in Windows 8.1 Metro
+
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+
+
+This is a **bold** word in Markdown
+
+
+This is a link http://example.com"
+      )
+    end
+
+    it "properly renders email reply from MS Outlook client" do
+      expect(test_parse_body(fixture_file("emails/outlook.eml"))).to eq("Microsoft Outlook 2010")
+    end
+  end
+
+#   describe "posting replies" do
+#     let(:reply_key) { raise "Override this in a lower describe block" }
+#     let(:email_raw) { raise "Override this in a lower describe block" }
+#     # ----
+#     let(:receiver) { Gitlab::EmailReceiver.new(email_raw) }
+#     let(:post) { create_post }
+#     let(:topic) { post.topic }
+#     let(:posting_user) { post.user }
+#     let(:replying_user_email) { 'jake@adventuretime.ooo' }
+#     let(:replying_user) { Fabricate(:user, email: replying_user_email, trust_level: 2)}
+#     let(:email_log) { EmailLog.new(reply_key: reply_key,
+#                                    post: post,
+#                                    post_id: post.id,
+#                                    topic_id: post.topic_id,
+#                                    email_type: 'user_posted',
+#                                    user: replying_user,
+#                                    user_id: replying_user.id,
+#                                    to_address: replying_user_email
+#     ) }
+
+#     before do
+#       email_log.save
+#     end
+
+#     # === Success Posting ===
+
+#     describe "valid_reply.eml" do
+#       let!(:reply_key) { '59d8df8370b7e95c5a49fbf86aeb2c93' }
+#       let!(:email_raw) { fixture_file("emails/valid_reply.eml") }
+
+#       it "creates a post with the correct content" do
+#         start_count = topic.posts.count
+
+#         receiver.process
+
+#         expect(topic.posts.count).to eq(start_count + 1)
+#         created_post = topic.posts.last
+#         expect(created_post.via_email).to eq(true)
+#         expect(created_post.raw_email).to eq(fixture_file("emails/valid_reply.eml"))
+#         expect(created_post.cooked.strip).to eq(fixture_file("emails/valid_reply.cooked").strip)
+#       end
+#     end
+
+#     describe "paragraphs.eml" do
+#       let!(:reply_key) { '59d8df8370b7e95c5a49fbf86aeb2c93' }
+#       let!(:email_raw) { fixture_file("emails/paragraphs.eml") }
+
+#       it "cooks multiple paragraphs with traditional Markdown linebreaks" do
+#         start_count = topic.posts.count
+
+#         receiver.process
+
+#         expect(topic.posts.count).to eq(start_count + 1)
+#         expect(topic.posts.last.cooked.strip).to eq(fixture_file("emails/paragraphs.cooked").strip)
+#         expect(topic.posts.last.cooked).not_to match /<br/
+#       end
+#     end
+
+#     describe "attachment.eml" do
+#       let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
+#       let!(:email_raw) {
+#         fixture_file("emails/attachment.eml")
+#         .gsub("TO", "reply+#{reply_key}@appmail.adventuretime.ooo")
+#         .gsub("FROM", replying_user_email)
+#       }
+
+#       let(:upload_sha) { '04df605be528d03876685c52166d4b063aabb78a' }
+
+#       it "creates a post with an attachment" do
+#         Upload.stubs(:fix_image_orientation)
+#         ImageOptim.any_instance.stubs(:optimize_image!)
+
+#         start_count = topic.posts.count
+#         Upload.find_by(sha1: upload_sha).try(:destroy)
+
+#         receiver.process
+
+#         expect(topic.posts.count).to eq(start_count + 1)
+#         expect(topic.posts.last.cooked).to match /<img src=['"](\/uploads\/default\/original\/.+\.png)['"] width=['"]289['"] height=['"]126['"]>/
+#         expect(Upload.find_by(sha1: upload_sha)).not_to eq(nil)
+#       end
+
+#     end
+
+#     # === Failure Conditions ===
+
+#     describe "too_short.eml" do
+#       let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
+#       let!(:email_raw) {
+#         fixture_file("emails/too_short.eml")
+#         .gsub("TO", "reply+#{reply_key}@appmail.adventuretime.ooo")
+#         .gsub("FROM", replying_user_email)
+#         .gsub("SUBJECT", "re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'")
+#       }
+
+#       it "raises an InvalidPost error" do
+#         SiteSetting.min_post_length = 5
+#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::InvalidPost)
+#       end
+#     end
+
+#     describe "too_many_mentions.eml" do
+#       let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
+#       let!(:email_raw) { fixture_file("emails/too_many_mentions.eml") }
+
+#       it "raises an InvalidPost error" do
+#         SiteSetting.max_mentions_per_post = 10
+#         (1..11).each do |i|
+#           Fabricate(:user, username: "user#{i}").save
+#         end
+
+#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::InvalidPost)
+#       end
+#     end
+
+#     describe "auto response email replies should not be accepted" do
+#       let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
+#       let!(:email_raw) { fixture_file("emails/auto_reply.eml") }
+#       it "raises a AutoGeneratedEmailError" do
+#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::AutoGeneratedEmailError)
+#       end
+#     end
+
+#   end
+
+#   describe "posting reply to a closed topic" do
+#     let(:reply_key) { raise "Override this in a lower describe block" }
+#     let(:email_raw) { raise "Override this in a lower describe block" }
+#     let(:receiver) { Gitlab::EmailReceiver.new(email_raw) }
+#     let(:topic) { Fabricate(:topic, closed: true) }
+#     let(:post) { Fabricate(:post, topic: topic, post_number: 1) }
+#     let(:replying_user_email) { 'jake@adventuretime.ooo' }
+#     let(:replying_user) { Fabricate(:user, email: replying_user_email, trust_level: 2) }
+#     let(:email_log) { EmailLog.new(reply_key: reply_key,
+#                                    post: post,
+#                                    post_id: post.id,
+#                                    topic_id: topic.id,
+#                                    email_type: 'user_posted',
+#                                    user: replying_user,
+#                                    user_id: replying_user.id,
+#                                    to_address: replying_user_email
+#     ) }
+
+#     before do
+#       email_log.save
+#     end
+
+#     describe "should not create post" do
+#       let!(:reply_key) { '59d8df8370b7e95c5a49fbf86aeb2c93' }
+#       let!(:email_raw) { fixture_file("emails/valid_reply.eml") }
+#       it "raises a TopicClosedError" do
+#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::TopicClosedError)
+#       end
+#     end
+#   end
+
+#   describe "posting reply to a deleted topic" do
+#     let(:reply_key) { raise "Override this in a lower describe block" }
+#     let(:email_raw) { raise "Override this in a lower describe block" }
+#     let(:receiver) { Gitlab::EmailReceiver.new(email_raw) }
+#     let(:deleted_topic) { Fabricate(:deleted_topic) }
+#     let(:post) { Fabricate(:post, topic: deleted_topic, post_number: 1) }
+#     let(:replying_user_email) { 'jake@adventuretime.ooo' }
+#     let(:replying_user) { Fabricate(:user, email: replying_user_email, trust_level: 2) }
+#     let(:email_log) { EmailLog.new(reply_key: reply_key,
+#                                    post: post,
+#                                    post_id: post.id,
+#                                    topic_id: deleted_topic.id,
+#                                    email_type: 'user_posted',
+#                                    user: replying_user,
+#                                    user_id: replying_user.id,
+#                                    to_address: replying_user_email
+#     ) }
+
+#     before do
+#       email_log.save
+#     end
+
+#     describe "should not create post" do
+#       let!(:reply_key) { '59d8df8370b7e95c5a49fbf86aeb2c93' }
+#       let!(:email_raw) { fixture_file("emails/valid_reply.eml") }
+#       it "raises a TopicNotFoundError" do
+#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::TopicNotFoundError)
+#       end
+#     end
+#   end
+
+#   describe "posting a new topic" do
+#     let(:category_destination) { raise "Override this in a lower describe block" }
+#     let(:email_raw) { raise "Override this in a lower describe block" }
+#     let(:allow_strangers) { false }
+#     # ----
+#     let(:receiver) { Gitlab::EmailReceiver.new(email_raw) }
+#     let(:user_email) { 'jake@adventuretime.ooo' }
+#     let(:user) { Fabricate(:user, email: user_email, trust_level: 2)}
+#     let(:category) { Fabricate(:category, email_in: category_destination, email_in_allow_strangers: allow_strangers) }
+
+#     before do
+#       SiteSetting.email_in = true
+#       user.save
+#       category.save
+#     end
+
+#     describe "too_short.eml" do
+#       let!(:category_destination) { 'incoming+amazing@appmail.adventuretime.ooo' }
+#       let(:email_raw) {
+#         fixture_file("emails/too_short.eml")
+#         .gsub("TO", category_destination)
+#         .gsub("FROM", user_email)
+#         .gsub("SUBJECT", "A long subject that passes the checks")
+#       }
+
+#       it "does not create a topic if the post fails" do
+#         before_topic_count = Topic.count
+
+#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::InvalidPost)
+
+#         expect(Topic.count).to eq(before_topic_count)
+#       end
+
+#     end
+
+#   end
+
+#   def fill_email(mail, from, to, body = nil, subject = nil)
+#     result = mail.gsub("FROM", from).gsub("TO", to)
+#     if body
+#       result.gsub!(/Hey.*/m, body)
+#     end
+#     if subject
+#       result.sub!(/We .*/, subject)
+#     end
+#     result
+#   end
+
+#   def process_email(opts)
+#     incoming_email = fixture_file("emails/valid_incoming.eml")
+#     email = fill_email(incoming_email, opts[:from],  opts[:to], opts[:body], opts[:subject])
+#     Gitlab::EmailReceiver.new(email).process
+#   end
+
+#   describe "with a valid email" do
+#     let(:reply_key) { "59d8df8370b7e95c5a49fbf86aeb2c93" }
+#     let(:to) { SiteSetting.reply_by_email_address.gsub("%{reply_key}", reply_key) }
+
+#     let(:valid_reply) {
+#       reply = fixture_file("emails/valid_reply.eml")
+#       to = SiteSetting.reply_by_email_address.gsub("%{reply_key}", reply_key)
+#       fill_email(reply, "test@test.com", to)
+#     }
+
+#     let(:receiver) { Gitlab::EmailReceiver.new(valid_reply) }
+#     let(:post) { create_post }
+#     let(:user) { post.user }
+#     let(:email_log) { EmailLog.new(reply_key: reply_key,
+#                                    post_id: post.id,
+#                                    topic_id: post.topic_id,
+#                                    user_id: post.user_id,
+#                                    post: post,
+#                                    user: user,
+#                                    email_type: 'test',
+#                                    to_address: 'test@test.com'
+#                                    ) }
+#     let(:reply_body) {
+# "I could not disagree more. I am obviously biased but adventure time is the
+# greatest show ever created. Everyone should watch it.
+
+# - Jake out" }
+
+#     describe "with an email log" do
+
+#       it "extracts data" do
+#         expect{ receiver.process }.to raise_error(Gitlab::EmailReceiver::EmailLogNotFound)
+
+#         email_log.save!
+#         receiver.process
+
+#         expect(receiver.body).to eq(reply_body)
+#         expect(receiver.email_log).to eq(email_log)
+#       end
+
+#     end
+
+#   end
+end

From 001c8cd0ee6e70cc96727cc37eedf263b916d24b Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 14 Aug 2015 22:21:22 -0700
Subject: [PATCH 038/111] Gracefully handle SMTP user input errors (e.g.
 incorrect email addresses) to prevent Sidekiq retries

Closes https://github.com/gitlabhq/gitlabhq/issues/9560
---
 CHANGELOG                                  |  1 +
 app/workers/emails_on_push_worker.rb       | 33 ++++++++++++---------
 spec/workers/emails_on_push_worker_spec.rb | 34 ++++++++++++++++++++++
 3 files changed, 54 insertions(+), 14 deletions(-)
 create mode 100644 spec/workers/emails_on_push_worker_spec.rb

diff --git a/CHANGELOG b/CHANGELOG
index 8214e57aaa..6872ec16aa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.0.0 (unreleased)
   - Faster merge
   - Ability to fetch merge requests from refs/merge-requests/:id
   - Allow displaying of archived projects in the admin interface (Artem Sidorenko)
+  - Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries (Stan Hu)
 
 v 7.14.0 (unreleased)
   - Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller)
diff --git a/app/workers/emails_on_push_worker.rb b/app/workers/emails_on_push_worker.rb
index 1d21addece..916a99bb27 100644
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
@@ -4,7 +4,7 @@ class EmailsOnPushWorker
   def perform(project_id, recipients, push_data, options = {})
     options.symbolize_keys!
     options.reverse_merge!(
-      send_from_committer_email:  false, 
+      send_from_committer_email:  false,
       disable_diffs:              false
     )
     send_from_committer_email = options[:send_from_committer_email]
@@ -16,9 +16,9 @@ class EmailsOnPushWorker
     ref = push_data["ref"]
     author_id = push_data["user_id"]
 
-    action = 
+    action =
       if Gitlab::Git.blank_ref?(before_sha)
-        :create 
+        :create
       elsif Gitlab::Git.blank_ref?(after_sha)
         :delete
       else
@@ -42,17 +42,22 @@ class EmailsOnPushWorker
     end
 
     recipients.split(" ").each do |recipient|
-      Notify.repository_push_email(
-        project_id, 
-        recipient, 
-        author_id:                  author_id, 
-        ref:                        ref, 
-        action:                     action,
-        compare:                    compare, 
-        reverse_compare:            reverse_compare,
-        send_from_committer_email:  send_from_committer_email,
-        disable_diffs:              disable_diffs
-      ).deliver
+      begin
+        Notify.repository_push_email(
+          project_id,
+          recipient,
+          author_id:                  author_id,
+          ref:                        ref,
+          action:                     action,
+          compare:                    compare,
+          reverse_compare:            reverse_compare,
+          send_from_committer_email:  send_from_committer_email,
+          disable_diffs:              disable_diffs
+        ).deliver
+      # These are input errors and won't be corrected even if Sidekiq retries
+      rescue Net::SMTPFatalError, Net::SMTPSyntaxError => e
+        logger.info("Failed to send e-mail for project '#{project.name_with_namespace}' to #{recipient}: #{e}")
+      end
     end
   ensure
     compare = nil
diff --git a/spec/workers/emails_on_push_worker_spec.rb b/spec/workers/emails_on_push_worker_spec.rb
new file mode 100644
index 0000000000..3600c77107
--- /dev/null
+++ b/spec/workers/emails_on_push_worker_spec.rb
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe EmailsOnPushWorker do
+  include RepoHelpers
+
+  let(:project) { create(:project) }
+  let(:user) { create(:user) }
+  let(:data) { Gitlab::PushDataBuilder.build_sample(project, user) }
+
+  subject { EmailsOnPushWorker.new }
+
+  before do
+    allow(Project).to receive(:find).and_return(project)
+  end
+
+  describe "#perform" do
+    it "sends mail" do
+      subject.perform(project.id, user.email, data.stringify_keys)
+
+      email = ActionMailer::Base.deliveries.last
+      expect(email.subject).to include('Change some files')
+      expect(email.to).to eq([user.email])
+    end
+
+    it "gracefully handles an input SMTP error" do
+      ActionMailer::Base.deliveries.clear
+      allow(Notify).to receive(:repository_push_email).and_raise(Net::SMTPFatalError)
+
+      subject.perform(project.id, user.email, data.stringify_keys)
+
+      expect(ActionMailer::Base.deliveries.count).to eq(0)
+    end
+  end
+end

From 0a5b005da170fe81afea012b56f4810125b13ead Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 20 Aug 2015 01:02:12 -0700
Subject: [PATCH 039/111] Fix blame view line groupings

Closes #2305
---
 app/controllers/projects/blame_controller.rb | 24 ++++++++++-
 app/views/projects/blame/show.html.haml      | 38 +++++++++--------
 spec/controllers/blame_controller_spec.rb    | 43 ++++++++++++++++++++
 3 files changed, 86 insertions(+), 19 deletions(-)
 create mode 100644 spec/controllers/blame_controller_spec.rb

diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb
index 45e157c90c..9ea518e6c8 100644
--- a/app/controllers/projects/blame_controller.rb
+++ b/app/controllers/projects/blame_controller.rb
@@ -8,6 +8,28 @@ class Projects::BlameController < Projects::ApplicationController
 
   def show
     @blob = @repository.blob_at(@commit.id, @path)
-    @blame = Gitlab::Git::Blame.new(@repository, @commit.id, @path)
+    @blame = group_blame_lines
+  end
+
+  def group_blame_lines
+    blame = Gitlab::Git::Blame.new(@repository, @commit.id, @path)
+
+    prev_sha = nil
+    groups = []
+    current_group = nil
+
+    blame.each do |commit, line|
+      if prev_sha && prev_sha == commit.sha
+        current_group[:lines] << line
+      else
+        groups << current_group if current_group.present?
+        current_group = { commit: commit, lines: [line] }
+      end
+
+      prev_sha = commit.sha
+    end
+
+    groups << current_group if current_group.present?
+    groups
   end
 end
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index 05d5db5d3f..a3ff7ce2f1 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -13,30 +13,32 @@
     .file-content.blame.highlight
       %table
         - current_line = 1
-        - @blame.each do |raw_commit, line|
+        - @blame.each do |blame_group|
           %tr
             %td.blame-commit
               .commit
-                - unless @prev_commit && @prev_commit.sha == raw_commit.sha
-                  - commit = Commit.new(raw_commit, @project)
-                  .commit-row-title
-                    %strong
-                      = link_to_gfm truncate(commit.title, length: 35), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "cdark"
-                    .pull-right
-                      = link_to commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit), class: "monospace"
-                    &nbsp;
-                  .light
-                    = commit_author_link(commit, avatar: false)
-                    authored
-                    #{time_ago_with_tooltip(commit.committed_date)}
-                - @prev_commit = raw_commit
+                - commit = Commit.new(blame_group[:commit], @project)
+                .commit-row-title
+                  %strong
+                    = link_to_gfm truncate(commit.title, length: 35), namespace_project_commit_path(@project.namespace, @project, commit.id), class: "cdark"
+                  .pull-right
+                    = link_to commit.short_id, namespace_project_commit_path(@project.namespace, @project, commit), class: "monospace"
+                  &nbsp;
+                .light
+                  = commit_author_link(commit, avatar: false)
+                  authored
+                  #{time_ago_with_tooltip(commit.committed_date)}
             %td.lines.blame-numbers
               %pre
-                = current_line
-                - current_line += 1
+                - line_count = blame_group[:lines].count
+                - (current_line...(current_line + line_count)).each do |i|
+                  = i
+                  \
+                - current_line += line_count
             %td.lines
               %pre{class: 'code highlight white'}
                 %code
-                  :erb
-                    <%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %>
+                  - blame_group[:lines].each do |line|
+                    :erb
+                      <%= highlight(@blob.name, line, nowrap: true, continue: true).html_safe %>
 
diff --git a/spec/controllers/blame_controller_spec.rb b/spec/controllers/blame_controller_spec.rb
new file mode 100644
index 0000000000..3ad4d5fc0a
--- /dev/null
+++ b/spec/controllers/blame_controller_spec.rb
@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Projects::BlameController do
+  let(:project) { create(:project) }
+  let(:user)    { create(:user) }
+
+  before do
+    sign_in(user)
+
+    project.team << [user, :master]
+    controller.instance_variable_set(:@project, project)
+  end
+
+  describe "GET show" do
+    render_views
+
+    before do
+      get(:show,
+          namespace_id: project.namespace.to_param,
+          project_id: project.to_param,
+          id: id)
+    end
+
+    context "valid file" do
+      let(:id) { 'master/files/ruby/popen.rb' }
+      it { is_expected.to respond_with(:success) }
+
+      it 'groups blames properly' do
+        blame = assigns(:blame)
+        # Sanity check a few items
+        expect(blame.count).to eq(18)
+        expect(blame[0][:commit].sha).to eq('913c66a37b4a45b9769037c55c2d238bd0942d2e')
+        expect(blame[0][:lines]).to eq(["require 'fileutils'", "require 'open3'", ""])
+
+        expect(blame[1][:commit].sha).to eq('874797c3a73b60d2187ed6e2fcabd289ff75171e')
+        expect(blame[1][:lines]).to eq(["module Popen", "  extend self"])
+
+        expect(blame[-1][:commit].sha).to eq('913c66a37b4a45b9769037c55c2d238bd0942d2e')
+        expect(blame[-1][:lines]).to eq(["  end", "end"])
+      end
+    end
+  end
+end

From 98eb89be5d2df31c31812e670f058afc0454c865 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 16 Aug 2015 18:05:53 -0700
Subject: [PATCH 040/111] Only show recent push event if the branch still
 exists or a recent merge request has not been created

Closes #2277
---
 CHANGELOG                |  1 +
 app/models/user.rb       | 15 +++++++++++++--
 spec/models/user_spec.rb | 29 +++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8214e57aaa..927f547bda 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
+  - Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
   - Remove satellites
   - Better performance for web editor (switched from satellites to rugged)
   - Faster merge
diff --git a/app/models/user.rb b/app/models/user.rb
index 57145cc6b6..f70761074c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -471,8 +471,19 @@ class User < ActiveRecord::Base
     events = recent_events.code_push.where("created_at > ?", Time.now - 2.hours)
     events = events.where(project_id: project_id) if project_id
 
-    # Take only latest one
-    events = events.recent.limit(1).first
+    # Use the latest event that has not been pushed or merged recently
+    events.recent.find do |event|
+      project = Project.find_by_id(event.project_id)
+      next unless project
+      repo = project.repository
+
+      if repo.branch_names.include?(event.branch_name)
+        merge_requests = MergeRequest.where("created_at >= ?", event.created_at).
+            where(source_project_id: project.id,
+                  source_branch: event.branch_name)
+        merge_requests.empty?
+      end
+    end
   end
 
   def projects_sorted_by_activity
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 876cfb1204..a46e789eab 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -710,4 +710,33 @@ describe User do
       it { expect(subject.can_be_removed?).to be_falsey }
     end
   end
+
+  describe "#recent_push" do
+    subject { create(:user) }
+    let!(:project1) { create(:project) }
+    let!(:project2) { create(:project, forked_from_project: project1) }
+    let!(:push_data) { Gitlab::PushDataBuilder.build_sample(project2, subject) }
+    let!(:push_event) { create(:event, action: Event::PUSHED, project: project2, target: project1, author: subject, data: push_data) }
+
+    before do
+      project1.team << [subject, :master]
+      project2.team << [subject, :master]
+    end
+
+    it "includes push event" do
+      expect(subject.recent_push).to eq(push_event)
+    end
+
+    it "excludes push event if branch has been deleted" do
+      allow_any_instance_of(Repository).to receive(:branch_names).and_return(['foo'])
+
+      expect(subject.recent_push).to eq(nil)
+    end
+
+    it "excludes push event if MR is opened for it" do
+      create(:merge_request, source_project: project2, target_project: project1, source_branch: project2.default_branch, target_branch: 'fix', author: subject)
+
+      expect(subject.recent_push).to eq(nil)
+    end
+  end
 end

From b1c1a3d3cc90de98f03482a4b41b39fe9a992cc6 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 20 Aug 2015 10:59:05 +0200
Subject: [PATCH 041/111] Refactor sidebar navigation for dashboard

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/generic/common.scss    | 20 ++++++++++++++
 app/controllers/snippets_controller.rb        |  2 +-
 app/helpers/tab_helper.rb                     |  2 ++
 app/views/dashboard/_projects_head.html.haml  | 10 +++++++
 .../dashboard/projects/starred.html.haml      |  2 ++
 app/views/dashboard/show.html.haml            |  2 ++
 app/views/layouts/header/_default.html.haml   |  8 +++---
 app/views/layouts/nav/_dashboard.html.haml    | 26 +++++++++++++------
 app/views/snippets/_head.html.haml            |  7 +++++
 .../snippets/current_user_index.html.haml     |  1 +
 app/views/snippets/index.html.haml            |  3 +--
 11 files changed, 68 insertions(+), 15 deletions(-)
 create mode 100644 app/views/dashboard/_projects_head.html.haml
 create mode 100644 app/views/snippets/_head.html.haml

diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index d36530169a..081c8e2dd3 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -373,3 +373,23 @@ table {
     border-color: #EEE !important;
   }
 }
+
+.center-top-menu {
+  border-bottom: 1px solid #EEE;
+  list-style: none;
+  text-align: center;
+  padding-bottom: 15px;
+  margin-bottom: 10px;
+
+  li {
+    display: inline-block;
+
+    a {
+      padding: 10px;
+    }
+
+    &.active a {
+      color: #666;
+    }
+  }
+}
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index 8e7e45c781..e6ef636c4f 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -9,7 +9,7 @@ class SnippetsController < ApplicationController
 
   skip_before_action :authenticate_user!, only: [:index, :user_index, :show, :raw]
 
-  layout 'snippets'
+  layout 'dashboard'
   respond_to :html
 
   def index
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 77727337f0..9c99de1c3f 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -67,6 +67,8 @@ module TabHelper
       path.any? do |single_path|
         current_path?(single_path)
       end
+    elsif page = options.delete(:page)
+      current_page?(page)
     else
       c = options.delete(:controller)
       a = options.delete(:action)
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
new file mode 100644
index 0000000000..7de9480fd8
--- /dev/null
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -0,0 +1,10 @@
+%ul.center-top-menu
+  = nav_link(path: ['dashboard#show', 'root#show'], html_options: {class: 'home'}) do
+    = link_to dashboard_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
+      Your Projects
+  = nav_link(path: 'projects#starred') do
+    = link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
+      Starred Projects
+  = nav_link(controller: :explore) do
+    = link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
+      Explore Projects
diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml
index 8aaa0a7f07..98b8cde476 100644
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
@@ -1,4 +1,6 @@
 - page_title "Starred Projects"
+= render 'dashboard/projects_head'
+
 - if @projects.any?
   = render 'shared/show_aside'
 
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index 5001c2101e..a3a32b6932 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -2,6 +2,8 @@
   - if current_user
     = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
 
+= render 'dashboard/projects_head'
+
 - if @projects.any?
   = render 'shared/show_aside'
 
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index b3cd7b0e37..12ddbe6f1b 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -17,13 +17,13 @@
           %li.visible-sm.visible-xs
             = link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom'} do
               = icon('search')
-          %li.hidden-xs
+          -#%li.hidden-xs
             = link_to help_path, title: 'Help', data: {toggle: 'tooltip', placement: 'bottom'} do
               = icon('question-circle fw')
-          %li
+          -#%li
             = link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
               = icon('globe fw')
-          %li
+          -#%li
             = link_to user_snippets_path(current_user), title: 'Your snippets', data: {toggle: 'tooltip', placement: 'bottom'} do
               = icon('clipboard fw')
           - if current_user.is_admin?
@@ -34,7 +34,7 @@
             %li.hidden-xs
               = link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do
                 = icon('plus fw')
-          %li
+          -#%li
             = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
               = icon('cog fw')
           %li
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 687c1fc3dd..a77d39acb8 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,14 +1,14 @@
 %ul.nav.nav-sidebar
-  = nav_link(path: ['dashboard#show', 'root#show'], html_options: {class: 'home'}) do
-    = link_to dashboard_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
+  = nav_link(path: ['dashboard#show', 'root#show', 'projects#starred'], html_options: {class: 'home'}) do
+    = link_to root_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
       = icon('dashboard fw')
       %span
-        Your Projects
-  = nav_link(path: 'projects#starred') do
-    = link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
-      = icon('star fw')
-      %span
-        Starred Projects
+        Projects
+  -#= nav_link(path: 'projects#starred') do
+    -#= link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
+      -#= icon('star fw')
+      -#%span
+        -#Starred Projects
   = nav_link(controller: :groups) do
     = link_to dashboard_groups_path, title: 'Groups', data: {placement: 'right'} do
       = icon('group fw')
@@ -31,6 +31,16 @@
       %span
         Merge Requests
         %span.count= current_user.assigned_merge_requests.opened.count
+  = nav_link(controller: :snippets) do
+    = link_to user_snippets_path(current_user), title: 'Your snippets', data: {placement: 'right'} do
+      = icon('dashboard fw')
+      %span
+        Snippets
+  = nav_link(controller: :profile) do
+    = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
+      = icon('user fw')
+      %span
+        Profile
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help', data: {placement: 'right'} do
       = icon('question-circle fw')
diff --git a/app/views/snippets/_head.html.haml b/app/views/snippets/_head.html.haml
new file mode 100644
index 0000000000..0adf6b91f2
--- /dev/null
+++ b/app/views/snippets/_head.html.haml
@@ -0,0 +1,7 @@
+%ul.center-top-menu
+  = nav_link(page: user_snippets_path(current_user), html_options: {class: 'home'}) do
+    = link_to user_snippets_path(current_user), title: 'Your snippets', data: {placement: 'right'} do
+      Your Snippets
+  = nav_link(page: snippets_path) do
+    = link_to snippets_path, title: 'Explore snippets', data: {placement: 'right'} do
+      Explore Snippets
diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index 0718f74382..a10069478f 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,4 +1,5 @@
 - page_title "Your Snippets"
+= render 'head'
 %h3.page-title
   Your Snippets
   .pull-right
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index e9bb6a908d..dc45cfacd8 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,4 +1,5 @@
 - page_title "Public Snippets"
+= render 'head'
 %h3.page-title
   Public snippets
 
@@ -6,8 +7,6 @@
     - if current_user
       = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
         Add new snippet
-      = link_to user_snippets_path(current_user), class: "btn btn-grouped"  do
-        Your snippets
 
 %p.light
   Public snippets created by you and other users are listed here

From 55dca86b983496a26a3913aead77439edf96afe9 Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem.sidorenko@telekom.de>
Date: Wed, 12 Aug 2015 08:13:20 +0200
Subject: [PATCH 042/111] Import sources: settings in the admin interface

---
 .../admin/application_settings_controller.rb  | 10 +++++++
 app/helpers/application_settings_helper.rb    | 17 +++++++++++
 app/models/application_setting.rb             | 15 +++++++++-
 .../application_settings/_form.html.haml      | 14 +++++++++
 config/initializers/1_settings.rb             |  1 +
 ...50812080800_add_settings_import_sources.rb | 11 +++++++
 db/schema.rb                                  |  3 +-
 lib/gitlab/current_settings.rb                |  3 +-
 lib/gitlab/import_sources.rb                  | 29 +++++++++++++++++++
 9 files changed, 100 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20150812080800_add_settings_import_sources.rb
 create mode 100644 lib/gitlab/import_sources.rb

diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index c7c643db40..f38e07af84 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -29,6 +29,15 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       end
     end
 
+    import_sources = params[:application_setting][:import_sources]
+    if import_sources.nil?
+      params[:application_setting][:import_sources] = []
+    else
+      import_sources.map! do |source|
+        source.to_str
+      end
+    end
+
     params.require(:application_setting).permit(
       :default_projects_limit,
       :default_branch_protection,
@@ -47,6 +56,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :version_check_enabled,
       :user_oauth_applications,
       restricted_visibility_levels: [],
+      import_sources: []
     )
   end
 end
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb
index 61d1438394..7d6b58ee21 100644
--- a/app/helpers/application_settings_helper.rb
+++ b/app/helpers/application_settings_helper.rb
@@ -39,4 +39,21 @@ module ApplicationSettingsHelper
       end
     end
   end
+
+  # Return a group of checkboxes that use Bootstrap's button plugin for a
+  # toggle button effect.
+  def import_sources_checkboxes(help_block_id)
+    Gitlab::ImportSources.options.map do |name, source|
+      checked = current_application_settings.import_sources.include?(source)
+      css_class = 'btn'
+      css_class += ' active' if checked
+      checkbox_name = 'application_setting[import_sources][]'
+
+      label_tag(checkbox_name, class: css_class) do
+        check_box_tag(checkbox_name, source, checked,
+                      autocomplete: 'off',
+                      'aria-describedby' => help_block_id) + name
+      end
+    end
+  end
 end
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 6d1ad82a26..8f27e35d72 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -22,10 +22,12 @@
 #  user_oauth_applications      :boolean          default(TRUE)
 #  after_sign_out_path          :string(255)
 #  session_expire_delay         :integer          default(10080), not null
+#  import_sources               :text
 #
 
 class ApplicationSetting < ActiveRecord::Base
   serialize :restricted_visibility_levels
+  serialize :import_sources
   serialize :restricted_signup_domains, Array
   attr_accessor :restricted_signup_domains_raw
 
@@ -52,6 +54,16 @@ class ApplicationSetting < ActiveRecord::Base
     end
   end
 
+  validates_each :import_sources do |record, attr, value|
+    unless value.nil?
+      value.each do |source|
+        unless Gitlab::ImportSources.options.has_value?(source)
+          record.errors.add(attr, "'#{source}' is not a import source")
+        end
+      end
+    end
+  end
+
   def self.current
     ApplicationSetting.last
   end
@@ -70,7 +82,8 @@ class ApplicationSetting < ActiveRecord::Base
       session_expire_delay: Settings.gitlab['session_expire_delay'],
       default_project_visibility: Settings.gitlab.default_projects_features['visibility_level'],
       default_snippet_visibility: Settings.gitlab.default_projects_features['visibility_level'],
-      restricted_signup_domains: Settings.gitlab['restricted_signup_domains']
+      restricted_signup_domains: Settings.gitlab['restricted_signup_domains'],
+      import_sources: ['github','bitbucket','gitlab','gitorious','google_code','git']
     )
   end
 
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index b67d2116fa..330b8bbf9d 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -27,6 +27,20 @@
           - restricted_level_checkboxes('restricted-visibility-help').each do |level|
             = level
         %span.help-block#restricted-visibility-help Selected levels cannot be used by non-admin users for projects or snippets
+    .form-group
+      = f.label :import_sources, class: 'control-label col-sm-2'
+      .col-sm-10
+        - data_attrs = { toggle: 'buttons' }
+        .btn-group{ data: data_attrs }
+          - import_sources_checkboxes('import-sources-help').each do |source|
+            = source
+        %span.help-block#import-sources-help
+          Enabled sources for code import during project creation. OmniAuth must be configured for GitHub
+          = link_to "(?)", help_page_path("integration", "github")
+          , Bitbucket
+          = link_to "(?)", help_page_path("integration", "bitbucket")
+          and GitLab.com
+          = link_to "(?)", help_page_path("integration", "gitlab")
     .form-group
       .col-sm-offset-2.col-sm-10
         .checkbox
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 026c1a5792..ef6e074c10 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -148,6 +148,7 @@ Settings.gitlab.default_projects_features['snippets']       = false if Settings.
 Settings.gitlab.default_projects_features['visibility_level']    = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE)
 Settings.gitlab['repository_downloads_path'] = File.absolute_path(Settings.gitlab['repository_downloads_path'] || 'tmp/repositories', Rails.root)
 Settings.gitlab['restricted_signup_domains'] ||= []
+Settings.gitlab['import_sources'] ||= ['github','bitbucket','gitlab','gitorious','google_code','git']
 
 #
 # Gravatar
diff --git a/db/migrate/20150812080800_add_settings_import_sources.rb b/db/migrate/20150812080800_add_settings_import_sources.rb
new file mode 100644
index 0000000000..276d2fdb2b
--- /dev/null
+++ b/db/migrate/20150812080800_add_settings_import_sources.rb
@@ -0,0 +1,11 @@
+require 'yaml'
+
+class AddSettingsImportSources < ActiveRecord::Migration
+  def change
+    unless column_exists?(:application_settings, :import_sources)
+      add_column :application_settings, :import_sources, :text
+      import_sources = YAML::dump(Settings.gitlab['import_sources'])
+      execute("update application_settings set import_sources = '#{import_sources}'")
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 6e919f2883..fdf09b3afd 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150806104937) do
+ActiveRecord::Schema.define(version: 20150812080800) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -44,6 +44,7 @@ ActiveRecord::Schema.define(version: 20150806104937) do
     t.boolean  "user_oauth_applications",      default: true
     t.string   "after_sign_out_path"
     t.integer  "session_expire_delay",         default: 10080, null: false
+    t.text     "import_sources"
   end
 
   create_table "audit_events", force: true do |t|
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index 931d51c55d..1a2a50a14d 100644
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -22,7 +22,8 @@ module Gitlab
         sign_in_text: Settings.extra['sign_in_text'],
         restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'],
         max_attachment_size: Settings.gitlab['max_attachment_size'],
-        session_expire_delay: Settings.gitlab['session_expire_delay']
+        session_expire_delay: Settings.gitlab['session_expire_delay'],
+        import_sources: Settings.gitlab['import_sources']
       )
     end
   end
diff --git a/lib/gitlab/import_sources.rb b/lib/gitlab/import_sources.rb
new file mode 100644
index 0000000000..991b70aab6
--- /dev/null
+++ b/lib/gitlab/import_sources.rb
@@ -0,0 +1,29 @@
+# Gitlab::ImportSources module
+#
+# Define import sources that can be used
+# during the creation of new project
+#
+module Gitlab
+  module ImportSources
+    extend CurrentSettings
+
+    class << self
+      def values
+        options.values
+      end
+
+      def options
+        {
+          'GitHub'          => 'github',
+          'Bitbucket'       => 'bitbucket',
+          'GitLab.com'      => 'gitlab',
+          'Gitorious.org'   => 'gitorious',
+          'Google Code'     => 'google_code',
+          'Any repo by URL' => 'git',
+        }
+      end
+
+    end
+
+  end
+end

From f82c14259b81d692b7f922b40895b60b2b240361 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 20 Aug 2015 11:59:14 +0200
Subject: [PATCH 043/111] Rebuild navigation for dashboard

* projects from explore page are available from dashboard
* use dashboard sidebar for both logged in and not users
* move explroe projects under projects tab
* move explore groups under groups tab
* move public snippets under snippets tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/pages/explore.scss     |  8 +++
 app/controllers/snippets_controller.rb        |  2 +-
 app/helpers/explore_helper.rb                 |  2 +-
 app/helpers/tab_helper.rb                     |  8 ++-
 app/views/dashboard/_groups_head.html.haml    |  7 +++
 app/views/dashboard/_projects_head.html.haml  |  6 +-
 app/views/dashboard/groups/index.html.haml    |  2 +
 app/views/explore/groups/index.html.haml      |  2 +
 .../explore/projects/_dropdown.html.haml      | 27 +++++++++
 app/views/explore/projects/_filter.html.haml  | 20 +------
 app/views/explore/projects/index.html.haml    |  5 +-
 app/views/explore/projects/starred.html.haml  |  7 ++-
 app/views/explore/projects/trending.html.haml |  7 ++-
 app/views/layouts/explore.html.haml           |  7 ++-
 app/views/layouts/nav/_dashboard.html.haml    | 59 +++++++++----------
 app/views/layouts/nav/_explore.html.haml      | 18 ------
 app/views/layouts/nav/_snippets.html.haml     | 12 ----
 app/views/layouts/snippets.html.haml          |  7 ++-
 app/views/snippets/index.html.haml            |  3 +-
 19 files changed, 112 insertions(+), 97 deletions(-)
 create mode 100644 app/views/dashboard/_groups_head.html.haml
 create mode 100644 app/views/explore/projects/_dropdown.html.haml
 delete mode 100644 app/views/layouts/nav/_explore.html.haml
 delete mode 100644 app/views/layouts/nav/_snippets.html.haml

diff --git a/app/assets/stylesheets/pages/explore.scss b/app/assets/stylesheets/pages/explore.scss
index 9b92128624..da06fe9954 100644
--- a/app/assets/stylesheets/pages/explore.scss
+++ b/app/assets/stylesheets/pages/explore.scss
@@ -6,3 +6,11 @@
     font-size: 30px;
   }
 }
+
+.explore-trending-block {
+  .lead {
+    line-height: 32px;
+    font-size: 18px;
+    margin-top: 10px;
+  }
+}
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb
index e6ef636c4f..8e7e45c781 100644
--- a/app/controllers/snippets_controller.rb
+++ b/app/controllers/snippets_controller.rb
@@ -9,7 +9,7 @@ class SnippetsController < ApplicationController
 
   skip_before_action :authenticate_user!, only: [:index, :user_index, :show, :raw]
 
-  layout 'dashboard'
+  layout 'snippets'
   respond_to :html
 
   def index
diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb
index 7616fe6bad..0d291f9a87 100644
--- a/app/helpers/explore_helper.rb
+++ b/app/helpers/explore_helper.rb
@@ -10,7 +10,7 @@ module ExploreHelper
 
     options = exist_opts.merge(options)
 
-    path = request.path
+    path = explore_projects_path
     path << "?#{options.to_param}"
     path
   end
diff --git a/app/helpers/tab_helper.rb b/app/helpers/tab_helper.rb
index 9c99de1c3f..0e7d8065ac 100644
--- a/app/helpers/tab_helper.rb
+++ b/app/helpers/tab_helper.rb
@@ -68,7 +68,13 @@ module TabHelper
         current_path?(single_path)
       end
     elsif page = options.delete(:page)
-      current_page?(page)
+      unless page.respond_to?(:each)
+        page = [page]
+      end
+
+      page.any? do |single_page|
+        current_page?(single_page)
+      end
     else
       c = options.delete(:controller)
       a = options.delete(:action)
diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml
new file mode 100644
index 0000000000..8a397a84e0
--- /dev/null
+++ b/app/views/dashboard/_groups_head.html.haml
@@ -0,0 +1,7 @@
+%ul.center-top-menu
+  = nav_link(page: [dashboard_groups_path]) do
+    = link_to dashboard_groups_path, title: 'Your groups', data: {placement: 'right'} do
+      Your Groups
+  = nav_link(page: [explore_groups_path]) do
+    = link_to explore_groups_path, title: 'Explore groups', data: {toggle: 'tooltip', placement: 'bottom'} do
+      Explore Groups
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index 7de9480fd8..f7be194c69 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -1,10 +1,10 @@
 %ul.center-top-menu
-  = nav_link(path: ['dashboard#show', 'root#show'], html_options: {class: 'home'}) do
+  = nav_link(path: ['dashboard#show', 'root#show']) do
     = link_to dashboard_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
       Your Projects
-  = nav_link(path: 'projects#starred') do
+  = nav_link(page: starred_dashboard_projects_path) do
     = link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
       Starred Projects
-  = nav_link(controller: :explore) do
+  = nav_link(page: [explore_root_path, trending_explore_projects_path, starred_explore_projects_path, explore_projects_path]) do
     = link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
       Explore Projects
diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml
index 0a354373b9..37315070ea 100644
--- a/app/views/dashboard/groups/index.html.haml
+++ b/app/views/dashboard/groups/index.html.haml
@@ -1,4 +1,6 @@
 - page_title "Groups"
+= render 'dashboard/groups_head'
+
 %h3.page-title
   Group Membership
   - if current_user.can_create_group?
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index f3f0b77853..c34493d0c2 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -1,4 +1,6 @@
 - page_title "Groups"
+- if current_user
+  = render 'dashboard/groups_head'
 .clearfix
   .pull-left
     = form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
diff --git a/app/views/explore/projects/_dropdown.html.haml b/app/views/explore/projects/_dropdown.html.haml
new file mode 100644
index 0000000000..b23a3c1e5c
--- /dev/null
+++ b/app/views/explore/projects/_dropdown.html.haml
@@ -0,0 +1,27 @@
+.dropdown.inline
+  %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
+    %span.light sort:
+    - if @sort.present?
+      = sort_options_hash[@sort]
+    - elsif current_page?(trending_explore_projects_path) || current_page?(explore_root_path)
+      Trending projects
+    - elsif current_page?(starred_explore_projects_path)
+      Most stars
+    - else
+      = sort_title_recently_created
+    %b.caret
+  %ul.dropdown-menu
+    %li
+      = link_to trending_explore_projects_path do
+        Trending projects
+      = link_to starred_explore_projects_path do
+        Most stars
+      = link_to explore_projects_filter_path(sort: sort_value_recently_created) do
+        = sort_title_recently_created
+      = link_to explore_projects_filter_path(sort: sort_value_oldest_created) do
+        = sort_title_oldest_created
+      = link_to explore_projects_filter_path(sort: sort_value_recently_updated) do
+        = sort_title_recently_updated
+      = link_to explore_projects_filter_path(sort: sort_value_oldest_updated) do
+        = sort_title_oldest_updated
+
diff --git a/app/views/explore/projects/_filter.html.haml b/app/views/explore/projects/_filter.html.haml
index 82622a58ed..4b91291caf 100644
--- a/app/views/explore/projects/_filter.html.haml
+++ b/app/views/explore/projects/_filter.html.haml
@@ -46,22 +46,4 @@
             = link_to explore_projects_filter_path(tag: tag.name) do
               %i.fa.fa-tag
               = tag.name
-
-  .dropdown.inline
-    %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
-      %span.light sort:
-      - if @sort.present?
-        = sort_options_hash[@sort]
-      - else
-        = sort_title_recently_created
-      %b.caret
-    %ul.dropdown-menu
-      %li
-        = link_to explore_projects_filter_path(sort: sort_value_recently_created) do
-          = sort_title_recently_created
-        = link_to explore_projects_filter_path(sort: sort_value_oldest_created) do
-          = sort_title_oldest_created
-        = link_to explore_projects_filter_path(sort: sort_value_recently_updated) do
-          = sort_title_recently_updated
-        = link_to explore_projects_filter_path(sort: sort_value_oldest_updated) do
-          = sort_title_oldest_updated
+  = render 'explore/projects/dropdown'
diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml
index ba2276f51c..4956081e1e 100644
--- a/app/views/explore/projects/index.html.haml
+++ b/app/views/explore/projects/index.html.haml
@@ -1,8 +1,9 @@
 - page_title "Projects"
+- if current_user
+  = render 'dashboard/projects_head'
 .clearfix
   = render 'filter'
-
-%hr
+%br
 .public-projects
   %ul.bordered-list.top-list
     = render @projects
diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml
index b5d146b1f2..fdccbe5692 100644
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
@@ -1,9 +1,12 @@
 - page_title "Starred Projects"
+- if current_user
+  = render 'dashboard/projects_head'
 .explore-trending-block
-  %p.lead
+  .lead
     %i.fa.fa-star
     See most starred projects
-  %hr
+    .pull-right
+      = render 'explore/projects/dropdown'
   .public-projects
     %ul.bordered-list
       = render @starred_projects
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index 5e24df76a6..98a4174b42 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -1,4 +1,6 @@
 - page_title "Trending Projects"
+- if current_user
+  = render 'dashboard/projects_head'
 .explore-title
   %h3
     Explore GitLab
@@ -6,10 +8,11 @@
     Discover projects and groups. Share your projects with others
 %hr
 .explore-trending-block
-  %p.lead
+  .lead
     %i.fa.fa-comments-o
     See most discussed projects for last month
-  %hr
+    .pull-right
+      = render 'explore/projects/dropdown'
   .public-projects
     %ul.bordered-list
       = render @trending_projects
diff --git a/app/views/layouts/explore.html.haml b/app/views/layouts/explore.html.haml
index 56bb92a536..17fee9c510 100644
--- a/app/views/layouts/explore.html.haml
+++ b/app/views/layouts/explore.html.haml
@@ -1,5 +1,8 @@
 - page_title    "Explore"
-- header_title  "Explore GitLab", explore_root_path
-- sidebar       "explore"
+- if current_user
+  - header_title  "Dashboard", root_path
+- else
+  - header_title  "Explore GitLab", explore_root_path
+- sidebar       "dashboard"
 
 = render template: "layouts/application"
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index a77d39acb8..8f010196d1 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,46 +1,43 @@
 %ul.nav.nav-sidebar
-  = nav_link(path: ['dashboard#show', 'root#show', 'projects#starred'], html_options: {class: 'home'}) do
-    = link_to root_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
+  = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
+    = link_to (current_user ? root_path : explore_root_path), title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
       = icon('dashboard fw')
       %span
         Projects
-  -#= nav_link(path: 'projects#starred') do
-    -#= link_to starred_dashboard_projects_path, title: 'Starred Projects', data: {placement: 'right'} do
-      -#= icon('star fw')
-      -#%span
-        -#Starred Projects
   = nav_link(controller: :groups) do
-    = link_to dashboard_groups_path, title: 'Groups', data: {placement: 'right'} do
+    = link_to (current_user ? dashboard_groups_path : explore_groups_path), title: 'Groups', data: {placement: 'right'} do
       = icon('group fw')
       %span
         Groups
-  = nav_link(controller: :milestones) do
-    = link_to dashboard_milestones_path, title: 'Milestones', data: {placement: 'right'} do
-      = icon('clock-o fw')
-      %span
-        Milestones
-  = nav_link(path: 'dashboard#issues') do
-    = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'shortcuts-issues', data: {placement: 'right'} do
-      = icon('exclamation-circle fw')
-      %span
-        Issues
-        %span.count= current_user.assigned_issues.opened.count
-  = nav_link(path: 'dashboard#merge_requests') do
-    = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'shortcuts-merge_requests', data: {placement: 'right'} do
-      = icon('tasks fw')
-      %span
-        Merge Requests
-        %span.count= current_user.assigned_merge_requests.opened.count
+  - if current_user
+    = nav_link(controller: :milestones) do
+      = link_to dashboard_milestones_path, title: 'Milestones', data: {placement: 'right'} do
+        = icon('clock-o fw')
+        %span
+          Milestones
+    = nav_link(path: 'dashboard#issues') do
+      = link_to assigned_issues_dashboard_path, title: 'Issues', class: 'shortcuts-issues', data: {placement: 'right'} do
+        = icon('exclamation-circle fw')
+        %span
+          Issues
+          %span.count= current_user.assigned_issues.opened.count
+    = nav_link(path: 'dashboard#merge_requests') do
+      = link_to assigned_mrs_dashboard_path, title: 'Merge Requests', class: 'shortcuts-merge_requests', data: {placement: 'right'} do
+        = icon('tasks fw')
+        %span
+          Merge Requests
+          %span.count= current_user.assigned_merge_requests.opened.count
   = nav_link(controller: :snippets) do
-    = link_to user_snippets_path(current_user), title: 'Your snippets', data: {placement: 'right'} do
+    = link_to (current_user ? user_snippets_path(current_user) : snippets_path), title: 'Your snippets', data: {placement: 'right'} do
       = icon('dashboard fw')
       %span
         Snippets
-  = nav_link(controller: :profile) do
-    = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
-      = icon('user fw')
-      %span
-        Profile
+  - if current_user
+    = nav_link(controller: :profile) do
+      = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
+        = icon('user fw')
+        %span
+          Profile
   = nav_link(controller: :help) do
     = link_to help_path, title: 'Help', data: {placement: 'right'} do
       = icon('question-circle fw')
diff --git a/app/views/layouts/nav/_explore.html.haml b/app/views/layouts/nav/_explore.html.haml
deleted file mode 100644
index 66870e84ce..0000000000
--- a/app/views/layouts/nav/_explore.html.haml
+++ /dev/null
@@ -1,18 +0,0 @@
-%ul.nav.nav-sidebar
-  = nav_link(path: 'projects#trending') do
-    = link_to explore_root_path, title: 'Trending Projects', data: {placement: 'right'} do
-      = icon('comments fw')
-      %span Trending Projects
-  = nav_link(path: 'projects#starred') do
-    = link_to starred_explore_projects_path, title: 'Most-starred Projects', data: {placement: 'right'} do
-      = icon('star fw')
-      %span Most-starred Projects
-  = nav_link(path: 'projects#index') do
-    = link_to explore_projects_path, title: 'All Projects', data: {placement: 'right'} do
-      = icon('bookmark fw')
-      %span All Projects
-  = nav_link(controller: :groups) do
-    = link_to explore_groups_path, title: 'All Groups', data: {placement: 'right'} do
-      = icon('group fw')
-      %span All Groups
-
diff --git a/app/views/layouts/nav/_snippets.html.haml b/app/views/layouts/nav/_snippets.html.haml
deleted file mode 100644
index 458b76a2c9..0000000000
--- a/app/views/layouts/nav/_snippets.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-%ul.nav.nav-sidebar
-  - if current_user
-    = nav_link(path: user_snippets_path(current_user), html_options: {class: 'home'}) do
-      = link_to user_snippets_path(current_user), title: 'Your snippets', data: {placement: 'right'} do
-        = icon('dashboard fw')
-        %span
-          Your Snippets
-  = nav_link(path: snippets_path) do
-    = link_to snippets_path, title: 'Discover snippets', data: {placement: 'right'} do
-      = icon('globe fw')
-      %span
-        Discover Snippets
diff --git a/app/views/layouts/snippets.html.haml b/app/views/layouts/snippets.html.haml
index 9b0f40073a..b77fe09fc2 100644
--- a/app/views/layouts/snippets.html.haml
+++ b/app/views/layouts/snippets.html.haml
@@ -1,5 +1,8 @@
 - page_title    'Snippets'
-- header_title  'Snippets', snippets_path
-- sidebar       "snippets"
+- if current_user
+  - header_title  "Dashboard", root_path
+- else
+  - header_title  'Snippets', snippets_path
+- sidebar       "dashboard"
 
 = render template: "layouts/application"
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index dc45cfacd8..cd65bf6f68 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,5 +1,6 @@
 - page_title "Public Snippets"
-= render 'head'
+- if current_user
+  = render 'head'
 %h3.page-title
   Public snippets
 

From e238a8dad5ec6d1bb80cc8d4dd2b3f85b55a6879 Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem.sidorenko@telekom.de>
Date: Fri, 14 Aug 2015 15:56:33 +0200
Subject: [PATCH 044/111] Import sources: show only enabled sources

---
 app/controllers/application_controller.rb     |  30 +++-
 .../import/gitorious_controller.rb            |   5 +
 .../import/google_code_controller.rb          |   5 +
 .../_bitbucket_import_modal.html.haml         |   8 +-
 .../projects/_github_import_modal.html.haml   |   8 +-
 .../projects/_gitlab_import_modal.html.haml   |   8 +-
 app/views/projects/new.html.haml              | 129 +++++++++---------
 features/dashboard/new_project.feature        |  19 ++-
 features/steps/dashboard/new_project.rb       |  31 ++++-
 9 files changed, 166 insertions(+), 77 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3ce8dbc940..12d439b0b3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -20,7 +20,7 @@ class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
   helper_method :abilities, :can?, :current_application_settings
-  helper_method :github_import_enabled?, :gitlab_import_enabled?, :bitbucket_import_enabled?
+  helper_method :import_sources_enabled?, :github_import_enabled?, :github_import_configured?, :gitlab_import_enabled?, :gitlab_import_configured?, :bitbucket_import_enabled?, :bitbucket_import_configured?, :gitorious_import_enabled?, :google_code_import_enabled?, :git_import_enabled?
 
   rescue_from Encoding::CompatibilityError do |exception|
     log_exception(exception)
@@ -298,15 +298,43 @@ class ApplicationController < ActionController::Base
     @issuable_finder.execute
   end
 
+  def import_sources_enabled?
+    !current_application_settings.import_sources.empty?
+  end
+
   def github_import_enabled?
+    current_application_settings.import_sources.include?('github')
+  end
+
+  def github_import_configured?
     Gitlab::OAuth::Provider.enabled?(:github)
   end
 
   def gitlab_import_enabled?
+    request.host != 'gitlab.com' && current_application_settings.import_sources.include?('gitlab')
+  end
+
+  def gitlab_import_configured?
     Gitlab::OAuth::Provider.enabled?(:gitlab)
   end
 
   def bitbucket_import_enabled?
+    current_application_settings.import_sources.include?('bitbucket')
+  end
+
+  def bitbucket_import_configured?
     Gitlab::OAuth::Provider.enabled?(:bitbucket) && Gitlab::BitbucketImport.public_key.present?
   end
+
+  def gitorious_import_enabled?
+    current_application_settings.import_sources.include?('gitorious')
+  end
+
+  def google_code_import_enabled?
+    current_application_settings.import_sources.include?('google_code')
+  end
+
+  def git_import_enabled?
+    current_application_settings.import_sources.include?('git')
+  end
 end
diff --git a/app/controllers/import/gitorious_controller.rb b/app/controllers/import/gitorious_controller.rb
index c121d2de7c..f24cdb3709 100644
--- a/app/controllers/import/gitorious_controller.rb
+++ b/app/controllers/import/gitorious_controller.rb
@@ -1,4 +1,5 @@
 class Import::GitoriousController < Import::BaseController
+  before_action :verify_gitorious_import_enabled
 
   def new
     redirect_to client.authorize_url(callback_import_gitorious_url)
@@ -40,4 +41,8 @@ class Import::GitoriousController < Import::BaseController
     @client ||= Gitlab::GitoriousImport::Client.new(session[:gitorious_repos])
   end
 
+  def verify_gitorious_import_enabled
+    not_found! unless gitorious_import_enabled?
+  end
+
 end
diff --git a/app/controllers/import/google_code_controller.rb b/app/controllers/import/google_code_controller.rb
index 4aa6d28c9a..82fadeb7e8 100644
--- a/app/controllers/import/google_code_controller.rb
+++ b/app/controllers/import/google_code_controller.rb
@@ -1,4 +1,5 @@
 class Import::GoogleCodeController < Import::BaseController
+  before_action :verify_google_code_import_enabled
   before_action :user_map, only: [:new_user_map, :create_user_map]
 
   def new
@@ -104,6 +105,10 @@ class Import::GoogleCodeController < Import::BaseController
     @client ||= Gitlab::GoogleCodeImport::Client.new(session[:google_code_dump])
   end
 
+  def verify_google_code_import_enabled
+    not_found! unless google_code_import_enabled?
+  end
+
   def user_map
     @user_map ||= begin
       user_map = client.user_map
diff --git a/app/views/projects/_bitbucket_import_modal.html.haml b/app/views/projects/_bitbucket_import_modal.html.haml
index 745163e79a..2987f6b5b2 100644
--- a/app/views/projects/_bitbucket_import_modal.html.haml
+++ b/app/views/projects/_bitbucket_import_modal.html.haml
@@ -5,9 +5,9 @@
         %a.close{href: "#", "data-dismiss" => "modal"} ×
         %h3 Import projects from Bitbucket
       .modal-body
-        To enable importing projects from Bitbucket, 
+        To enable importing projects from Bitbucket,
         - if current_user.admin?
-          you need to
+          as administrator you need to configure
         - else
-          your GitLab administrator needs to
-        == #{link_to 'setup OAuth integration', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/bitbucket.md'}.
+          ask your GitLab administrator to configure
+        == #{link_to 'OAuth integration', help_page_path("integration", "bitbucket")}.
diff --git a/app/views/projects/_github_import_modal.html.haml b/app/views/projects/_github_import_modal.html.haml
index de58b27df2..46ad155935 100644
--- a/app/views/projects/_github_import_modal.html.haml
+++ b/app/views/projects/_github_import_modal.html.haml
@@ -5,9 +5,9 @@
         %a.close{href: "#", "data-dismiss" => "modal"} ×
         %h3 Import projects from GitHub
       .modal-body
-        To enable importing projects from GitHub, 
+        To enable importing projects from GitHub,
         - if current_user.admin?
-          you need to
+          as administrator you need to configure
         - else
-          your GitLab administrator needs to
-        == #{link_to 'setup OAuth integration', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/github.md'}.
\ No newline at end of file
+          ask your Gitlab administrator to configure
+        == #{link_to 'OAuth integration', help_page_path("integration", "github")}.
diff --git a/app/views/projects/_gitlab_import_modal.html.haml b/app/views/projects/_gitlab_import_modal.html.haml
index ae6c25f937..377cf0187b 100644
--- a/app/views/projects/_gitlab_import_modal.html.haml
+++ b/app/views/projects/_gitlab_import_modal.html.haml
@@ -5,9 +5,9 @@
         %a.close{href: "#", "data-dismiss" => "modal"} ×
         %h3 Import projects from GitLab.com
       .modal-body
-        To enable importing projects from GitLab.com, 
+        To enable importing projects from GitLab.com,
         - if current_user.admin?
-          you need to
+          as administrator you need to configure
         - else
-          your GitLab administrator needs to
-        == #{link_to 'setup OAuth integration', 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/gitlab.md'}.
\ No newline at end of file
+          ask your GitLab administrator to configure
+        == #{link_to 'OAuth integration', help_page_path("integration", "gitlab")}.
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index d25fe68242..636218368c 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -22,70 +22,75 @@
           .col-sm-10
             = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'select2', tabindex: 2}
 
-      %hr
+      - if import_sources_enabled?
+        %hr
 
-      .project-import.js-toggle-container
-        .form-group
-          %label.control-label Import project from
-          .col-sm-10
-            - if github_import_enabled?
-              = link_to status_import_github_path, class: 'btn' do
-                %i.fa.fa-github
-                GitHub
-            - else
-              = link_to '#', class: 'how_to_import_link light btn' do
-                %i.fa.fa-github
-                GitHub
-              = render 'github_import_modal'
-
-
-            - if bitbucket_import_enabled?
-              = link_to status_import_bitbucket_path, class: 'btn', "data-no-turbolink" => "true" do
-                %i.fa.fa-bitbucket
-                Bitbucket
-            - else
-              = link_to '#', class: 'how_to_import_link light btn' do
-                %i.fa.fa-bitbucket
-                Bitbucket
-              = render 'bitbucket_import_modal'
-
-            - unless request.host == 'gitlab.com'
-              - if gitlab_import_enabled?
-                = link_to status_import_gitlab_path, class: 'btn' do
-                  %i.fa.fa-heart
-                  GitLab.com
-              - else
-                = link_to '#', class: 'how_to_import_link light btn' do
-                  %i.fa.fa-heart
-                  GitLab.com
-                = render 'gitlab_import_modal'
-
-            = link_to new_import_gitorious_path, class: 'btn' do
-              %i.icon-gitorious.icon-gitorious-small
-              Gitorious.org
-
-            = link_to new_import_google_code_path, class: 'btn' do
-              %i.fa.fa-google
-              Google Code
-
-            = link_to "#", class: 'btn js-toggle-button' do
-              %i.fa.fa-git
-              %span Any repo by URL
-
-        .js-toggle-content.hide
-          .form-group.import-url-data
-            = f.label :import_url, class: 'control-label' do
-              %span Git repository URL
+        .project-import.js-toggle-container
+          .form-group
+            %label.control-label Import project from
             .col-sm-10
-              = f.text_field :import_url, class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git'
-              .well.prepend-top-20
-                %ul
-                  %li
-                    The repository must be accessible over HTTP(S). If it is not publicly accessible, you can add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.
-                  %li
-                    The import will time out after 4 minutes. For big repositories, use a clone/push combination.
-                  %li
-                    To migrate an SVN repository, check out #{link_to "this document", "http://doc.gitlab.com/ce/workflow/importing/migrating_from_svn.html"}.
+              - if github_import_enabled?
+                - if github_import_configured?
+                  = link_to status_import_github_path, class: 'btn import_github' do
+                    %i.fa.fa-github
+                    GitHub
+                - else
+                  = link_to '#', class: 'how_to_import_link light btn import_github' do
+                    %i.fa.fa-github
+                    GitHub
+                  = render 'github_import_modal'
+
+              - if bitbucket_import_enabled?
+                - if bitbucket_import_configured?
+                  = link_to status_import_bitbucket_path, class: 'btn import_bitbucket', "data-no-turbolink" => "true" do
+                    %i.fa.fa-bitbucket
+                    Bitbucket
+                - else
+                  = link_to status_import_bitbucket_path, class: 'how_to_import_link light btn import_bitbucket', "data-no-turbolink" => "true" do
+                    %i.fa.fa-bitbucket
+                    Bitbucket
+                  = render 'bitbucket_import_modal'
+
+              - if gitlab_import_enabled?
+                - if gitlab_import_configured?
+                  = link_to status_import_gitlab_path, class: 'btn import_gitlab' do
+                    %i.fa.fa-heart
+                    GitLab.com
+                - else
+                  = link_to status_import_gitlab_path, class: 'how_to_import_link light btn import_gitlab' do
+                    %i.fa.fa-heart
+                    GitLab.com
+                  = render 'gitlab_import_modal'
+
+              - if gitorious_import_enabled?
+                = link_to new_import_gitorious_path, class: 'btn import_gitorious' do
+                  %i.icon-gitorious.icon-gitorious-small
+                  Gitorious.org
+
+              - if google_code_import_enabled?
+                = link_to new_import_google_code_path, class: 'btn import_google_code' do
+                  %i.fa.fa-google
+                  Google Code
+
+              - if git_import_enabled?
+                = link_to "#", class: 'btn js-toggle-button import_git' do
+                  %i.fa.fa-git
+                  %span Any repo by URL
+
+          .js-toggle-content.hide
+            .form-group.import-url-data
+              = f.label :import_url, class: 'control-label' do
+                %span Git repository URL
+              .col-sm-10
+                = f.text_field :import_url, class: 'form-control', placeholder: 'https://username:password@gitlab.company.com/group/project.git'
+                .well.prepend-top-20
+                  %ul
+                    %li
+                      The repository must be accessible over HTTP(S). If it is not publicly accessible, you can add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.
+                    %li
+                      The import will time out after 4 minutes. For big repositories, use a clone/push combination.
+                    %li
+                      To migrate an SVN repository, check out #{link_to "this document", "http://doc.gitlab.com/ce/workflow/importing/migrating_from_svn.html"}.
 
       %hr.prepend-botton-10
 
diff --git a/features/dashboard/new_project.feature b/features/dashboard/new_project.feature
index 431dc4ccfc..bbd82a85e3 100644
--- a/features/dashboard/new_project.feature
+++ b/features/dashboard/new_project.feature
@@ -4,10 +4,27 @@ Background:
   Given I sign in as a user
   And I own project "Shop"
   And I visit dashboard page
+  And I click "New project" link
 
   @javascript
   Scenario: I should see New projects page
-  Given I click "New project" link
   Then I see "New project" page
+  Then I see all possible import optios
+
+  @javascript
+  Scenario: I should see instructions on how to import from Git URL
+  Given I see "New project" page
+  When I click on "Any repo by URL"
+  Then I see instructions on how to import from Git URL
+
+  @javascript
+  Scenario: I should see instructions on how to import from GitHub
+  Given I see "New project" page
   When I click on "Import project from GitHub"
   Then I see instructions on how to import from GitHub
+
+  @javascript
+  Scenario: I should see Google Code import page
+  Given I see "New project" page
+  When I click on "Google Code"
+  Then I redirected to Google Code import page
diff --git a/features/steps/dashboard/new_project.rb b/features/steps/dashboard/new_project.rb
index d4440c1fb4..1e09162a5b 100644
--- a/features/steps/dashboard/new_project.rb
+++ b/features/steps/dashboard/new_project.rb
@@ -13,8 +13,17 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps
     expect(page).to have_content('Project path')
   end
 
+  step 'I see all possible import optios' do
+    expect(page).to have_link('GitHub')
+    expect(page).to have_link('Bitbucket')
+    expect(page).to have_link('GitLab.com')
+    expect(page).to have_link('Gitorious.org')
+    expect(page).to have_link('Google Code')
+    expect(page).to have_link('Any repo by URL')
+  end
+
   step 'I click on "Import project from GitHub"' do
-    first('.how_to_import_link').click
+    first('.import_github').click
   end
 
   step 'I see instructions on how to import from GitHub' do
@@ -26,4 +35,24 @@ class Spinach::Features::NewProject < Spinach::FeatureSteps
       expect(element).not_to be_visible unless element == github_modal
     end
   end
+
+  step 'I click on "Any repo by URL"' do
+    first('.import_git').click
+  end
+
+  step 'I see instructions on how to import from Git URL' do
+    git_import_instructions = first('.js-toggle-content')
+    expect(git_import_instructions).to be_visible
+    expect(git_import_instructions).to have_content "Git repository URL"
+    expect(git_import_instructions).to have_content "The repository must be accessible over HTTP(S). If it is not publicly accessible, you can add authentication information to the URL:"
+  end
+
+  step 'I click on "Google Code"' do
+    first('.import_google_code').click
+  end
+
+  step 'I redirected to Google Code import page' do
+    expect(current_path).to eq new_import_google_code_path
+  end
+
 end

From bdae9bbebdb8d83fa21024b79aeb703268747f58 Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem.sidorenko@telekom.de>
Date: Thu, 20 Aug 2015 12:14:52 +0200
Subject: [PATCH 045/111] Import sources: changelog

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 8214e57aaa..54f83e5aea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ v 8.0.0 (unreleased)
   - Faster merge
   - Ability to fetch merge requests from refs/merge-requests/:id
   - Allow displaying of archived projects in the admin interface (Artem Sidorenko)
+  - Allow configuration of import sources for new projects (Artem Sidorenko)
 
 v 7.14.0 (unreleased)
   - Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller)

From e06e9623fdc82186895dfb5579ba2ee85690a0a6 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 20 Aug 2015 12:32:44 +0200
Subject: [PATCH 046/111] Fix test

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 features/steps/shared/active_tab.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/steps/shared/active_tab.rb b/features/steps/shared/active_tab.rb
index 72d873caa5..92e099315d 100644
--- a/features/steps/shared/active_tab.rb
+++ b/features/steps/shared/active_tab.rb
@@ -26,7 +26,7 @@ module SharedActiveTab
   end
 
   step 'the active main tab should be Home' do
-    ensure_active_main_tab('Your Projects')
+    ensure_active_main_tab('Projects')
   end
 
   step 'the active main tab should be Projects' do

From 0d8ad2dd6333e4f93b64cc43f3aacfcd89103cbd Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 20 Aug 2015 12:48:11 +0200
Subject: [PATCH 047/111] Cleanup snippets index pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 .../snippets/current_user_index.html.haml     | 11 +++++------
 app/views/snippets/index.html.haml            | 10 +---------
 app/views/snippets/user_index.html.haml       | 19 +++++++++----------
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/app/views/snippets/current_user_index.html.haml b/app/views/snippets/current_user_index.html.haml
index a10069478f..62a967a2e0 100644
--- a/app/views/snippets/current_user_index.html.haml
+++ b/app/views/snippets/current_user_index.html.haml
@@ -1,14 +1,13 @@
 - page_title "Your Snippets"
 = render 'head'
-%h3.page-title
-  Your Snippets
-  .pull-right
-    = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
-      Add new snippet
 
-%p.light
+.slead
   Share code pastes with others out of git repository
 
+  .pull-right
+    = link_to new_snippet_path, class: "btn btn-new btn-sm", title: "New Snippet" do
+      Add new snippet
+
 %ul.nav.nav-tabs
   = nav_tab :scope, nil do
     = link_to user_snippets_path(@user) do
diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml
index cd65bf6f68..8608815e0a 100644
--- a/app/views/snippets/index.html.haml
+++ b/app/views/snippets/index.html.haml
@@ -1,17 +1,9 @@
 - page_title "Public Snippets"
 - if current_user
   = render 'head'
-%h3.page-title
-  Public snippets
 
-  .pull-right
-    - if current_user
-      = link_to new_snippet_path, class: "btn btn-new btn-grouped", title: "New Snippet" do
-        Add new snippet
-
-%p.light
+.slead
   Public snippets created by you and other users are listed here
 
-%hr
 = render 'snippets'
 
diff --git a/app/views/snippets/user_index.html.haml b/app/views/snippets/user_index.html.haml
index 23700eb39d..7af5352da3 100644
--- a/app/views/snippets/user_index.html.haml
+++ b/app/views/snippets/user_index.html.haml
@@ -1,14 +1,13 @@
 - page_title "Snippets", @user.name
-%h3.page-title
-  = image_tag avatar_icon(@user.email), class: "avatar s24"
-  = @user.name
-  %span
-    \/
-    Snippets
-  - if current_user
-    = link_to new_snippet_path, class: "btn btn-sm add_new pull-right", title: "New Snippet" do
-      Add new snippet
 
-%hr
+%ol.breadcrumb
+  %li
+    = link_to snippets_path do
+      Snippets
+  %li
+    = @user.name
+  .pull-right.hidden-xs
+    = link_to user_path(@user) do
+      #{@user.name} profile page
 
 = render 'snippets'

From 8129e2f33f1b1538f2c984f0c7c58855d32dcd8b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 20 Aug 2015 12:56:15 +0200
Subject: [PATCH 048/111] Small ui improvements to snippet page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/snippets/show.html.haml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml
index 089e812291..aed00f9cae 100644
--- a/app/views/snippets/show.html.haml
+++ b/app/views/snippets/show.html.haml
@@ -1,5 +1,5 @@
 - page_title @snippet.title, "Snippets"
-%h3.page-title
+%h4.page-title
   = @snippet.title
 
   - if @snippet.private?
@@ -8,17 +8,14 @@
       private
 
   .pull-right
-    = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
+    = link_to new_snippet_path, class: "btn btn-new btn-sm", title: "New Snippet" do
       Add new snippet
-%hr
 
-.append-bottom-20
+.append-bottom-10.prepend-top-10
   .pull-right
-    = "##{@snippet.id}"
     %span.light
-      by
+      created by
       = link_to user_snippets_path(@snippet.author) do
-        = image_tag avatar_icon(@snippet.author_email), class: "avatar avatar-inline s16", alt: ''
         = @snippet.author_name
 
   .back-link
@@ -27,7 +24,7 @@
         &larr; your snippets
     - else
       = link_to snippets_path do
-        &larr; discover snippets
+        &larr; explore snippets
 
 .file-holder
   .file-title

From 6a91e32af9e743c7f9f4ed4926ae0f8884abb999 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 20 Aug 2015 13:05:14 +0200
Subject: [PATCH 049/111] Cleanup groups pages UI a bit

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/generic/common.scss | 2 +-
 app/views/dashboard/groups/index.html.haml | 9 +++------
 app/views/explore/groups/index.html.haml   | 5 +----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 081c8e2dd3..bf5c7a8d75 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -379,7 +379,7 @@ table {
   list-style: none;
   text-align: center;
   padding-bottom: 15px;
-  margin-bottom: 10px;
+  margin-bottom: 15px;
 
   li {
     display: inline-block;
diff --git a/app/views/dashboard/groups/index.html.haml b/app/views/dashboard/groups/index.html.haml
index 37315070ea..0860fe3c76 100644
--- a/app/views/dashboard/groups/index.html.haml
+++ b/app/views/dashboard/groups/index.html.haml
@@ -1,16 +1,13 @@
 - page_title "Groups"
 = render 'dashboard/groups_head'
 
-%h3.page-title
-  Group Membership
+.slead
+  Group members have access to all group projects.
   - if current_user.can_create_group?
     %span.pull-right.hidden-xs
-      = link_to new_group_path, class: "btn btn-new" do
+      = link_to new_group_path, class: "btn btn-new btn-sm" do
         %i.fa.fa-plus
         New Group
-%p.light
-  Group members have access to all group projects.
-%hr
 .panel.panel-default
   .panel-heading
     %strong Groups
diff --git a/app/views/explore/groups/index.html.haml b/app/views/explore/groups/index.html.haml
index c34493d0c2..7dcefd330a 100644
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -1,7 +1,7 @@
 - page_title "Groups"
 - if current_user
   = render 'dashboard/groups_head'
-.clearfix
+.clearfix.append-bottom-10
   .pull-left
     = form_tag explore_groups_path, method: :get, class: 'form-inline form-tiny' do |f|
       = hidden_field_tag :sort, @sort
@@ -30,15 +30,12 @@
           = link_to explore_groups_path(sort: sort_value_oldest_updated) do
             = sort_title_oldest_updated
 
-%hr
-
 %ul.bordered-list
   - @groups.each do |group|
     %li
       .clearfix
         %h4
           = link_to group_path(id: group.path) do
-            %i.fa.fa-users
             = group.name
       .clearfix
         %p

From 3930ec44909b9bf7d3780ae31bfaeea132290842 Mon Sep 17 00:00:00 2001
From: Nathan Neulinger <nneul@neulinger.org>
Date: Thu, 20 Aug 2015 12:47:55 +0000
Subject: [PATCH 050/111] Add size information back to project summary screen.

---
 app/views/projects/show.html.haml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index ebbd3e477f..507f2c7beb 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -23,6 +23,10 @@
       = link_to namespace_project_tags_path(@project.namespace, @project) do
         = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
 
+    %li
+      = link_to namespace_project_path(@project.namespace, @project) do
+        = repository_size
+
     - if !prefer_readme? && @repository.readme
       %li
         = link_to 'Readme', readme_path(@project)
@@ -76,4 +80,4 @@
       - if @project.project_member_by_id(current_user)
         = link_to leave_namespace_project_project_members_path(@project.namespace, @project),
           data: { confirm: leave_project_message(@project) }, method: :delete, title: 'Leave project', class: 'cred' do
-          Leave this project
+          Leave this project
\ No newline at end of file

From 3ff9d5c64cef8bf8daed5e253e388545987fb945 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 10:58:04 -0700
Subject: [PATCH 051/111] Use canonical version of mail_room.

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9879141f5c..3aa3c72e08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -273,6 +273,6 @@ gem "newrelic_rpm"
 
 gem 'octokit', '3.7.0'
 
-gem "mail_room", github: "DouweM/mail_room", branch: "sidekiq"
+gem "mail_room", "~> 0.4.0"
 
 gem 'email_reply_parser'
diff --git a/Gemfile.lock b/Gemfile.lock
index c4c327aa75..5278fe243a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
-  remote: git://github.com/DouweM/mail_room.git
-  revision: c17c74cdef55dcd962333545fdb4d6e496cd9050
-  branch: sidekiq
-  specs:
-    mail_room (0.3.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -379,6 +372,7 @@ GEM
       systemu (~> 2.6.2)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    mail_room (0.4.0)
     method_source (0.8.2)
     mime-types (1.25.1)
     mimemagic (0.3.0)
@@ -814,7 +808,7 @@ DEPENDENCIES
   jquery-ui-rails
   kaminari (~> 0.15.1)
   letter_opener
-  mail_room!
+  mail_room (~> 0.4.0)
   minitest (~> 5.3.0)
   mousetrap-rails
   mysql2

From e9972efc2f3d730e989907585dd1438c517a0bba Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 11:05:06 -0700
Subject: [PATCH 052/111] Extract ReplyParser and AttachmentUploader from
 Receiver.

---
 app/workers/email_receiver_worker.rb       |  16 +-
 lib/gitlab/email/attachment_uploader.rb    |  35 ++
 lib/gitlab/email/html_cleaner.rb           | 135 ++++++
 lib/gitlab/email/receiver.rb               | 101 +++++
 lib/gitlab/email/reply_parser.rb           |  91 ++++
 lib/gitlab/email_html_cleaner.rb           | 133 ------
 lib/gitlab/email_receiver.rb               | 192 --------
 spec/lib/gitlab/email/reply_parser_spec.rb | 191 ++++++++
 spec/lib/gitlab/email_receiver_spec.rb     | 481 ---------------------
 9 files changed, 561 insertions(+), 814 deletions(-)
 create mode 100644 lib/gitlab/email/attachment_uploader.rb
 create mode 100644 lib/gitlab/email/html_cleaner.rb
 create mode 100644 lib/gitlab/email/receiver.rb
 create mode 100644 lib/gitlab/email/reply_parser.rb
 delete mode 100644 lib/gitlab/email_html_cleaner.rb
 delete mode 100644 lib/gitlab/email_receiver.rb
 create mode 100644 spec/lib/gitlab/email/reply_parser_spec.rb
 delete mode 100644 spec/lib/gitlab/email_receiver_spec.rb

diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb
index 2cfd64cefa..4f3556bfc0 100644
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
@@ -7,7 +7,7 @@ class EmailReceiverWorker
     return unless Gitlab::ReplyByEmail.enabled?
 
     begin
-      Gitlab::EmailReceiver.new(raw).execute
+      Gitlab::Email::Receiver.new(raw).execute
     rescue => e
       handle_failure(raw, e)
     end
@@ -22,20 +22,20 @@ class EmailReceiverWorker
     reason = nil
 
     case e
-    when Gitlab::EmailReceiver::SentNotificationNotFound
+    when Gitlab::Email::Receiver::SentNotificationNotFound
       reason = "We couldn't figure out what the email is in reply to. Please create your comment through the web interface."
-    when Gitlab::EmailReceiver::EmptyEmailError
+    when Gitlab::Email::Receiver::EmptyEmailError
       can_retry = true
       reason = "It appears that the email is blank. Make sure your reply is at the top of the email, we can't process inline replies."
-    when Gitlab::EmailReceiver::AutoGeneratedEmailError
+    when Gitlab::Email::Receiver::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
+    when Gitlab::Email::Receiver::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
+    when Gitlab::Email::Receiver::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
+    when Gitlab::Email::Receiver::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
+    when Gitlab::Email::Receiver::InvalidNote
       can_retry = true
       reason = e.message
     else
diff --git a/lib/gitlab/email/attachment_uploader.rb b/lib/gitlab/email/attachment_uploader.rb
new file mode 100644
index 0000000000..0c0f50f275
--- /dev/null
+++ b/lib/gitlab/email/attachment_uploader.rb
@@ -0,0 +1,35 @@
+module Gitlab
+  module Email
+    module AttachmentUploader
+      attr_accessor :message
+
+      def initialize(message)
+        @message = message
+      end
+
+      def execute(project)
+        attachments = []
+
+        message.attachments.each do |attachment|
+          tmp = Tempfile.new("gitlab-email-attachment")
+          begin
+            File.open(tmp.path, "w+b") { |f| f.write attachment.body.decoded }
+
+            file = {
+              tempfile:     tmp,
+              filename:     attachment.filename,
+              content_type: attachment.content_type
+            }
+
+            link = ::Projects::UploadService.new(project, file).execute
+            attachments << link if link
+          ensure
+            tmp.close!
+          end
+        end
+
+        attachments
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/email/html_cleaner.rb b/lib/gitlab/email/html_cleaner.rb
new file mode 100644
index 0000000000..e1ae9eee56
--- /dev/null
+++ b/lib/gitlab/email/html_cleaner.rb
@@ -0,0 +1,135 @@
+# Taken mostly from Discourse's Email::HtmlCleaner
+module Gitlab
+  module Email
+    # 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 HtmlCleaner
+      # Elements to hoist all children out of
+      HTML_HOIST_ELEMENTS = %w(div span font table tbody th tr td)
+      # Node types to always delete
+      HTML_DELETE_ELEMENT_TYPES = [
+        Nokogiri::XML::Node::DTD_NODE,
+        Nokogiri::XML::Node::COMMENT_NODE,
+      ]
+
+      # Private variables:
+      #   @doc - nokogiri document
+      #   @out - same as @doc, but only if trimming has occured
+      def initialize(html)
+        if html.is_a?(String)
+          @doc = Nokogiri::HTML(html)
+        else
+          @doc = html
+        end
+      end
+
+      class << self
+        # HtmlCleaner.trim(inp, opts={})
+        #
+        # Arguments:
+        #   inp - Either a HTML string or a Nokogiri document.
+        # Options:
+        #   :return => :doc, :string
+        #     Specify the desired return type.
+        #     Defaults to the type of the input.
+        #     A value of :string is equivalent to calling get_document_text()
+        #     on the returned document.
+        def trim(inp, opts={})
+          cleaner = HtmlCleaner.new(inp)
+
+          opts[:return] ||= (inp.is_a?(String) ? :string : :doc)
+
+          if opts[:return] == :string
+            cleaner.output_html
+          else
+            cleaner.output_document
+          end
+        end
+
+        # HtmlCleaner.get_document_text(doc)
+        #
+        # Get the body portion of the document, including html, as a string.
+        def get_document_text(doc)
+          body = doc.xpath('//body')
+          if body
+            body.inner_html
+          else
+            doc.inner_html
+          end
+        end
+      end
+
+      def output_document
+        @out ||= begin
+          doc = @doc
+          trim_process_node doc
+          add_newlines doc
+          doc
+        end
+      end
+
+      def output_html
+        HtmlCleaner.get_document_text(output_document)
+      end
+
+      private
+
+      def add_newlines(doc)
+        # Replace <br> tags with a markdown \n
+        doc.xpath('//br').each do |br|
+          br.replace(new_linebreak_node doc, 2)
+        end
+        # Surround <p> tags with newlines, to help with line-wise postprocessing
+        # and ensure markdown paragraphs
+        doc.xpath('//p').each do |p|
+          p.before(new_linebreak_node doc)
+          p.after(new_linebreak_node doc, 2)
+        end
+      end
+
+      def new_linebreak_node(doc, count=1)
+        Nokogiri::XML::Text.new("\n" * count, doc)
+      end
+
+      def trim_process_node(node)
+        if should_hoist?(node)
+          hoisted = trim_hoist_element node
+          hoisted.each { |child| trim_process_node child }
+        elsif should_delete?(node)
+          node.remove
+        else
+          if children = node.children
+            children.each { |child| trim_process_node child }
+          end
+        end
+
+        node
+      end
+
+      def trim_hoist_element(element)
+        hoisted = []
+        element.children.each do |child|
+          element.before(child)
+          hoisted << child
+        end
+        element.remove
+        hoisted
+      end
+
+      def should_hoist?(node)
+        return false unless node.element?
+        HTML_HOIST_ELEMENTS.include? node.name
+      end
+
+      def should_delete?(node)
+        return true if HTML_DELETE_ELEMENT_TYPES.include? node.type
+        return true if node.element? && node.name == 'head'
+        return true if node.text? && node.text.strip.blank?
+
+        false
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
new file mode 100644
index 0000000000..c46fce6afe
--- /dev/null
+++ b/lib/gitlab/email/receiver.rb
@@ -0,0 +1,101 @@
+# Inspired in great part by Discourse's Email::Receiver
+module Gitlab
+  module Email
+    class Receiver
+      class ProcessingError < StandardError; end
+      class EmailUnparsableError < ProcessingError; end
+      class EmptyEmailError < ProcessingError; end
+      class UserNotFoundError < ProcessingError; end
+      class UserNotAuthorizedError < ProcessingError; end
+      class NoteableNotFoundError < ProcessingError; end
+      class AutoGeneratedEmailError < ProcessingError; end
+      class SentNotificationNotFound < ProcessingError; end
+      class InvalidNote < ProcessingError; end
+
+      def initialize(raw)
+        @raw = raw
+      end
+
+      def message
+        @message ||= Mail::Message.new(@raw)
+      rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError => e
+        raise EmailUnparsableError, e
+      end
+
+      def execute
+        raise SentNotificationNotFound unless sent_notification
+
+        raise EmptyEmailError if @raw.blank?
+
+        raise AutoGeneratedEmailError if message.header.to_s =~ /auto-(generated|replied)/
+
+        author = sent_notification.recipient
+
+        raise UserNotFoundError unless author
+
+        project = sent_notification.project
+
+        raise UserNotAuthorizedError unless author.can?(:create_note, project)
+
+        raise NoteableNotFoundError unless sent_notification.noteable
+
+        reply = ReplyParser.new(message).execute.strip
+
+        raise EmptyEmailError if reply.blank?
+
+        reply = add_attachments(reply)
+
+        note = create_note(reply)
+
+        unless note.persisted?
+          message = "The comment could not be created for the following reasons:"
+          note.errors.full_messages.each do |error|
+            message << "\n\n- #{error}"
+          end
+
+          raise InvalidNote, message
+        end
+      end
+
+      private
+
+      def reply_key
+        reply_key = nil
+        message.to.each do |address|
+          reply_key = Gitlab::ReplyByEmail.reply_key_from_address(address)
+          break if reply_key
+        end
+
+        reply_key
+      end
+
+      def sent_notification
+        return nil unless reply_key
+        
+        SentNotification.for(reply_key)
+      end
+
+      def add_attachments(reply)
+        attachments = AttachmentUploader.new(message).execute(project)
+
+        attachments.each do |link|
+          text = "[#{link[:alt]}](#{link[:url]})"
+          text.prepend("!") if link[:is_image]
+
+          reply << "\n\n#{text}"
+        end
+      end
+
+      def create_note(reply)
+        Notes::CreateService.new(
+          sent_notification.project,
+          sent_notification.recipient,
+          note:           reply,
+          noteable_type:  sent_notification.noteable_type,
+          noteable_id:    sent_notification.noteable_id,
+          commit_id:      sent_notification.commit_id
+        ).execute
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb
new file mode 100644
index 0000000000..6ceb755968
--- /dev/null
+++ b/lib/gitlab/email/reply_parser.rb
@@ -0,0 +1,91 @@
+# Inspired in great part by Discourse's Email::Receiver
+module Gitlab
+  module Email
+    class ReplyParser
+      attr_accessor :message
+
+      def initialize(message)
+        @message = message
+      end
+
+      def execute
+        body = select_body(message)
+
+        encoding = body.encoding
+
+        body = discourse_email_trimmer(body)
+
+        body = EmailReplyParser.parse_reply(body)
+
+        body.force_encoding(encoding).encode("UTF-8")
+      end
+
+      private
+
+      def select_body(message)
+        html = nil
+        text = nil
+
+        if message.multipart?
+          html = fix_charset(message.html_part)
+          text = fix_charset(message.text_part)
+        elsif message.content_type =~ /text\/html/
+          html = fix_charset(message)
+        end
+
+        # prefer plain text
+        return text if text
+
+        if html
+          body = HtmlCleaner.new(html).output_html
+        else
+          body = fix_charset(message)
+        end
+
+        # Certain trigger phrases that means we didn't parse correctly
+        if body =~ /(Content\-Type\:|multipart\/alternative|text\/plain)/
+          return ""
+        end
+
+        body
+      end
+
+      # Force encoding to UTF-8 on a Mail::Message or Mail::Part
+      def fix_charset(object)
+        return nil if object.nil?
+
+        if object.charset
+          object.body.decoded.force_encoding(object.charset.gsub(/utf8/i, "UTF-8")).encode("UTF-8").to_s
+        else
+          object.body.to_s
+        end
+      rescue
+        nil
+      end
+
+      REPLYING_HEADER_LABELS = %w(From Sent To Subject Reply To Cc Bcc Date)
+      REPLYING_HEADER_REGEX = Regexp.union(REPLYING_HEADER_LABELS.map { |label| "#{label}:" })
+
+      def discourse_email_trimmer(body)
+        lines = body.scrub.lines.to_a
+        range_end = 0
+
+        lines.each_with_index do |l, idx|
+          # This one might be controversial but so many reply lines have years, times and end with a colon.
+         # Let's try it and see how well it works.
+         break if (l =~ /\d{4}/ && l =~ /\d:\d\d/ && l =~ /\:$/) ||
+                   (l =~ /On \w+ \d+,? \d+,?.*wrote:/)
+
+          # Headers on subsequent lines
+          break if (0..2).all? { |off| lines[idx+off] =~ REPLYING_HEADER_REGEX }
+          # Headers on the same line
+          break if REPLYING_HEADER_LABELS.count { |label| l.include?(label) } >= 3
+
+          range_end = idx
+        end
+
+        lines[0..range_end].join.strip
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/email_html_cleaner.rb b/lib/gitlab/email_html_cleaner.rb
deleted file mode 100644
index 6d7a17fe87..0000000000
--- a/lib/gitlab/email_html_cleaner.rb
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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
-    # Elements to hoist all children out of
-    HTML_HOIST_ELEMENTS = %w(div span font table tbody th tr td)
-    # Node types to always delete
-    HTML_DELETE_ELEMENT_TYPES = [
-      Nokogiri::XML::Node::DTD_NODE,
-      Nokogiri::XML::Node::COMMENT_NODE,
-    ]
-
-    # Private variables:
-    #   @doc - nokogiri document
-    #   @out - same as @doc, but only if trimming has occured
-    def initialize(html)
-      if html.is_a?(String)
-        @doc = Nokogiri::HTML(html)
-      else
-        @doc = html
-      end
-    end
-
-    class << self
-      # EmailHtmlCleaner.trim(inp, opts={})
-      #
-      # Arguments:
-      #   inp - Either a HTML string or a Nokogiri document.
-      # Options:
-      #   :return => :doc, :string
-      #     Specify the desired return type.
-      #     Defaults to the type of the input.
-      #     A value of :string is equivalent to calling get_document_text()
-      #     on the returned document.
-      def trim(inp, opts={})
-        cleaner = EmailHtmlCleaner.new(inp)
-
-        opts[:return] ||= (inp.is_a?(String) ? :string : :doc)
-
-        if opts[:return] == :string
-          cleaner.output_html
-        else
-          cleaner.output_document
-        end
-      end
-
-      # EmailHtmlCleaner.get_document_text(doc)
-      #
-      # Get the body portion of the document, including html, as a string.
-      def get_document_text(doc)
-        body = doc.xpath('//body')
-        if body
-          body.inner_html
-        else
-          doc.inner_html
-        end
-      end
-    end
-
-    def output_document
-      @out ||= begin
-        doc = @doc
-        trim_process_node doc
-        add_newlines doc
-        doc
-      end
-    end
-
-    def output_html
-      EmailHtmlCleaner.get_document_text(output_document)
-    end
-
-    private
-
-    def add_newlines(doc)
-      # Replace <br> tags with a markdown \n
-      doc.xpath('//br').each do |br|
-        br.replace(new_linebreak_node doc, 2)
-      end
-      # Surround <p> tags with newlines, to help with line-wise postprocessing
-      # and ensure markdown paragraphs
-      doc.xpath('//p').each do |p|
-        p.before(new_linebreak_node doc)
-        p.after(new_linebreak_node doc, 2)
-      end
-    end
-
-    def new_linebreak_node(doc, count=1)
-      Nokogiri::XML::Text.new("\n" * count, doc)
-    end
-
-    def trim_process_node(node)
-      if should_hoist?(node)
-        hoisted = trim_hoist_element node
-        hoisted.each { |child| trim_process_node child }
-      elsif should_delete?(node)
-        node.remove
-      else
-        if children = node.children
-          children.each { |child| trim_process_node child }
-        end
-      end
-
-      node
-    end
-
-    def trim_hoist_element(element)
-      hoisted = []
-      element.children.each do |child|
-        element.before(child)
-        hoisted << child
-      end
-      element.remove
-      hoisted
-    end
-
-    def should_hoist?(node)
-      return false unless node.element?
-      HTML_HOIST_ELEMENTS.include? node.name
-    end
-
-    def should_delete?(node)
-      return true if HTML_DELETE_ELEMENT_TYPES.include? node.type
-      return true if node.element? && node.name == 'head'
-      return true if node.text? && node.text.strip.blank?
-
-      false
-    end
-  end
-end
diff --git a/lib/gitlab/email_receiver.rb b/lib/gitlab/email_receiver.rb
deleted file mode 100644
index 3c1f346c0c..0000000000
--- a/lib/gitlab/email_receiver.rb
+++ /dev/null
@@ -1,192 +0,0 @@
-# Inspired in great part by Discourse's Email::Receiver
-module Gitlab
-  class EmailReceiver
-    class ProcessingError < StandardError; end
-    class EmailUnparsableError < ProcessingError; end
-    class EmptyEmailError < ProcessingError; end
-    class UserNotFoundError < ProcessingError; end
-    class UserNotAuthorizedError < ProcessingError; end
-    class NoteableNotFoundError < ProcessingError; end
-    class AutoGeneratedEmailError < ProcessingError; end
-    class SentNotificationNotFound < ProcessingError; end
-    class InvalidNote < ProcessingError; end
-
-    def initialize(raw)
-      @raw = raw
-    end
-
-    def message
-      @message ||= Mail::Message.new(@raw)
-    rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError => e
-      raise EmailUnparsableError, e
-    end
-
-    def execute
-      raise SentNotificationNotFound unless sent_notification
-
-      raise EmptyEmailError if @raw.blank?
-
-      raise AutoGeneratedEmailError if message.header.to_s =~ /auto-(generated|replied)/
-
-      author = sent_notification.recipient
-
-      raise UserNotFoundError unless author
-
-      project = sent_notification.project
-
-      raise UserNotAuthorizedError unless author.can?(:create_note, project)
-
-      raise NoteableNotFoundError unless sent_notification.noteable
-
-      body = parse_body(message)
-
-      upload_attachments.each do |link|
-        body << "\n\n#{link}"
-      end
-
-      note = Notes::CreateService.new(
-        project,
-        author,
-        note:           body,
-        noteable_type:  sent_notification.noteable_type,
-        noteable_id:    sent_notification.noteable_id,
-        commit_id:      sent_notification.commit_id
-      ).execute
-
-      unless note.persisted?
-        message = "The comment could not be created for the following reasons:"
-        note.errors.full_messages.each do |error|
-          message << "\n\n- #{error}"
-        end
-        raise InvalidNote, message
-      end
-    end
-
-    def parse_body(message)
-      body = select_body(message)
-
-      encoding = body.encoding
-      raise EmptyEmailError if body.strip.blank?
-
-      body = discourse_email_trimmer(body)
-      raise EmptyEmailError if body.strip.blank?
-
-      body = EmailReplyParser.parse_reply(body)
-      raise EmptyEmailError if body.strip.blank?
-
-      body.force_encoding(encoding).encode("UTF-8")
-    end
-
-    private
-
-    def reply_key
-      reply_key = nil
-      message.to.each do |address|
-        reply_key = Gitlab::ReplyByEmail.reply_key_from_address(address)
-        break if reply_key
-      end
-
-      reply_key
-    end
-
-    def sent_notification
-      return nil unless reply_key
-      
-      SentNotification.for(reply_key)
-    end
-
-    def select_body(message)
-      html = nil
-      text = nil
-
-      if message.multipart?
-        html = fix_charset(message.html_part)
-        text = fix_charset(message.text_part)
-      elsif message.content_type =~ /text\/html/
-        html = fix_charset(message)
-      end
-
-      # prefer plain text
-      return text if text
-
-      if html
-        body = EmailHtmlCleaner.new(html).output_html
-      else
-        body = fix_charset(message)
-      end
-
-      # Certain trigger phrases that means we didn't parse correctly
-      if body =~ /(Content\-Type\:|multipart\/alternative|text\/plain)/
-        raise EmptyEmailError
-      end
-
-      body
-    end
-
-    # Force encoding to UTF-8 on a Mail::Message or Mail::Part
-    def fix_charset(object)
-      return nil if object.nil?
-
-      if object.charset
-        object.body.decoded.force_encoding(object.charset.gsub(/utf8/i, "UTF-8")).encode("UTF-8").to_s
-      else
-        object.body.to_s
-      end
-    rescue
-      nil
-    end
-
-    REPLYING_HEADER_LABELS = %w(From Sent To Subject Reply To Cc Bcc Date)
-    REPLYING_HEADER_REGEX = Regexp.union(REPLYING_HEADER_LABELS.map { |label| "#{label}:" })
-
-    def discourse_email_trimmer(body)
-      lines = body.scrub.lines.to_a
-      range_end = 0
-
-      lines.each_with_index do |l, idx|
-        # This one might be controversial but so many reply lines have years, times and end with a colon.
-       # Let's try it and see how well it works.
-       break if (l =~ /\d{4}/ && l =~ /\d:\d\d/ && l =~ /\:$/) ||
-                 (l =~ /On \w+ \d+,? \d+,?.*wrote:/)
-
-        # Headers on subsequent lines
-        break if (0..2).all? { |off| lines[idx+off] =~ REPLYING_HEADER_REGEX }
-        # Headers on the same line
-        break if REPLYING_HEADER_LABELS.count { |label| l.include?(label) } >= 3
-
-        range_end = idx
-      end
-
-      lines[0..range_end].join.strip
-    end
-
-    def upload_attachments
-      attachments = []
-
-      message.attachments.each do |attachment|
-        tmp = Tempfile.new("gitlab-email-attachment")
-        begin
-          File.open(tmp.path, "w+b") { |f| f.write attachment.body.decoded }
-
-          file = {
-            tempfile:     tmp,
-            filename:     attachment.filename,
-            content_type: attachment.content_type
-          }
-
-          link = ::Projects::UploadService.new(sent_notification.project, file).execute
-          if link
-            text = "[#{link[:alt]}](#{link[:url]})"
-            text.prepend("!") if link[:is_image]
-
-            attachments << text
-          end
-        ensure
-          tmp.close!
-        end
-      end
-
-      attachments
-    end
-  end
-end
diff --git a/spec/lib/gitlab/email/reply_parser_spec.rb b/spec/lib/gitlab/email/reply_parser_spec.rb
new file mode 100644
index 0000000000..999515beb1
--- /dev/null
+++ b/spec/lib/gitlab/email/reply_parser_spec.rb
@@ -0,0 +1,191 @@
+require "spec_helper"
+
+# Inspired in great part by Discourse's Email::Receiver
+describe Gitlab::Email::ReplyParser do
+  def fixture_file(filename)
+    return '' if filename.blank?
+    file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
+    File.read(file_path)
+  end
+
+  describe 'self.parse_body' do
+    def test_parse_body(mail_string)
+      described_class.new(Mail::Message.new(mail_string)).execute
+    end
+
+    it "returns an empty string if the message is blank" do
+      expect(test_parse_body("")).to eq("")
+    end
+
+    it "returns an empty string if the message is not an email" do
+      expect(test_parse_body("asdf" * 30)).to eq("")
+    end
+
+    it "returns an empty string if there is no reply content" do
+      expect(test_parse_body(fixture_file("emails/no_content_reply.eml"))).to eq("")
+    end
+
+    it "can parse the html section" do
+      expect(test_parse_body(fixture_file("emails/html_only.eml"))).to eq("The EC2 instance - I've seen that there tends to be odd and " +
+          "unrecommended settings on the Bitnami installs that I've checked out.")
+    end
+
+    it "supports a Dutch reply" do
+      expect(test_parse_body(fixture_file("emails/dutch.eml"))).to eq("Dit is een antwoord in het Nederlands.")
+    end
+
+    it "removes an 'on date wrote' quoting line" do
+      expect(test_parse_body(fixture_file("emails/on_wrote.eml"))).to eq("Sure, all you need to do is frobnicate the foobar and you'll be all set!")
+    end
+
+    it "handles multiple paragraphs" do
+      expect(test_parse_body(fixture_file("emails/paragraphs.eml"))).
+          to eq(
+"Is there any reason the *old* candy can't be be kept in silos while the new candy
+is imported into *new* silos?
+
+The thing about candy is it stays delicious for a long time -- we can just keep
+it there without worrying about it too much, imo.
+
+Thanks for listening."
+      )
+    end
+
+    it "handles multiple paragraphs when parsing html" do
+      expect(test_parse_body(fixture_file("emails/html_paragraphs.eml"))).
+          to eq(
+"Awesome!
+
+Pleasure to have you here!
+
+:boom:"
+      )
+    end
+
+    it "handles newlines" do
+      expect(test_parse_body(fixture_file("emails/newlines.eml"))).
+          to eq(
+"This is my reply.
+It is my best reply.
+It will also be my *only* reply."
+      )
+    end
+
+    it "handles inline reply" do
+      expect(test_parse_body(fixture_file("emails/inline_reply.eml"))).
+          to eq(
+"On Wed, Oct 8, 2014 at 11:12 AM, techAPJ <info@unconfigured.discourse.org> wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog."
+      )
+    end
+
+    it "strips iPhone signature" do
+      expect(test_parse_body(fixture_file("emails/iphone_signature.eml"))).not_to match /Sent from my iPhone/
+    end
+
+    it "properly renders email reply from gmail web client" do
+      expect(test_parse_body(fixture_file("emails/gmail_web.eml"))).
+          to eq(
+"### This is a reply from standard GMail in Google Chrome.
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog.
+
+Here's some **bold** text in Markdown.
+
+Here's a link http://example.com"
+      )
+    end
+
+    it "properly renders email reply from iOS default mail client" do
+      expect(test_parse_body(fixture_file("emails/ios_default.eml"))).
+          to eq(
+"### this is a reply from iOS default mail
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+
+Here's some **bold** markdown text.
+
+Here's a link http://example.com"
+      )
+    end
+
+    it "properly renders email reply from Android 5 gmail client" do
+      expect(test_parse_body(fixture_file("emails/android_gmail.eml"))).
+          to eq(
+"### this is a reply from Android 5 gmail
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+
+This is **bold** in Markdown.
+
+This is a link to http://example.com"
+      )
+    end
+
+    it "properly renders email reply from Windows 8.1 Metro default mail client" do
+      expect(test_parse_body(fixture_file("emails/windows_8_metro.eml"))).
+          to eq(
+"### reply from default mail client in Windows 8.1 Metro
+
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+
+
+This is a **bold** word in Markdown
+
+
+This is a link http://example.com"
+      )
+    end
+
+    it "properly renders email reply from MS Outlook client" do
+      expect(test_parse_body(fixture_file("emails/outlook.eml"))).to eq("Microsoft Outlook 2010")
+    end
+  end
+end
diff --git a/spec/lib/gitlab/email_receiver_spec.rb b/spec/lib/gitlab/email_receiver_spec.rb
deleted file mode 100644
index d6302eac13..0000000000
--- a/spec/lib/gitlab/email_receiver_spec.rb
+++ /dev/null
@@ -1,481 +0,0 @@
-require "spec_helper"
-
-# Inspired in great part by Discourse's Email::Receiver
-describe Gitlab::EmailReceiver do
-  def fixture_file(filename)
-    return '' if filename.blank?
-    file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
-    File.read(file_path)
-  end
-
-  before do
-    allow(Gitlab.config.reply_by_email).to receive(:enabled).and_return(true)
-    allow(Gitlab.config.reply_by_email).to receive(:address).and_return("reply+%{reply_key}@appmail.adventuretime.ooo")
-  end
-
-  describe 'parse_body' do
-    def test_parse_body(mail_string)
-      Gitlab::EmailReceiver.new(nil).parse_body(Mail::Message.new(mail_string))
-    end
-
-    it "raises EmptyEmailError if the message is blank" do
-      expect { test_parse_body("") }.to raise_error(Gitlab::EmailReceiver::EmptyEmailError)
-    end
-
-    it "raises EmptyEmailError if the message is not an email" do
-      expect { test_parse_body("asdf" * 30) }.to raise_error(Gitlab::EmailReceiver::EmptyEmailError)
-    end
-
-    it "raises EmptyEmailError if there is no reply content" do
-      expect { test_parse_body(fixture_file("emails/no_content_reply.eml")) }.to raise_error(Gitlab::EmailReceiver::EmptyEmailError)
-    end
-
-    it "can parse the html section" do
-      expect(test_parse_body(fixture_file("emails/html_only.eml"))).to eq("The EC2 instance - I've seen that there tends to be odd and " +
-          "unrecommended settings on the Bitnami installs that I've checked out.")
-    end
-
-    it "supports a Dutch reply" do
-      expect(test_parse_body(fixture_file("emails/dutch.eml"))).to eq("Dit is een antwoord in het Nederlands.")
-    end
-
-    it "removes an 'on date wrote' quoting line" do
-      expect(test_parse_body(fixture_file("emails/on_wrote.eml"))).to eq("Sure, all you need to do is frobnicate the foobar and you'll be all set!")
-    end
-
-    it "handles multiple paragraphs" do
-      expect(test_parse_body(fixture_file("emails/paragraphs.eml"))).
-          to eq(
-"Is there any reason the *old* candy can't be be kept in silos while the new candy
-is imported into *new* silos?
-
-The thing about candy is it stays delicious for a long time -- we can just keep
-it there without worrying about it too much, imo.
-
-Thanks for listening."
-      )
-    end
-
-    it "handles multiple paragraphs when parsing html" do
-      expect(test_parse_body(fixture_file("emails/html_paragraphs.eml"))).
-          to eq(
-"Awesome!
-
-Pleasure to have you here!
-
-:boom:"
-      )
-    end
-
-    it "handles newlines" do
-      expect(test_parse_body(fixture_file("emails/newlines.eml"))).
-          to eq(
-"This is my reply.
-It is my best reply.
-It will also be my *only* reply."
-      )
-    end
-
-    it "handles inline reply" do
-      expect(test_parse_body(fixture_file("emails/inline_reply.eml"))).
-          to eq(
-"On Wed, Oct 8, 2014 at 11:12 AM, techAPJ <info@unconfigured.discourse.org> wrote:
-
->     techAPJ <https://meta.discourse.org/users/techapj>
-> November 28
->
-> Test reply.
->
-> First paragraph.
->
-> Second paragraph.
->
-> To respond, reply to this email or visit
-> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
-> your browser.
->  ------------------------------
-> Previous Replies    codinghorror
-> <https://meta.discourse.org/users/codinghorror>
-> November 28
->
-> We're testing the latest GitHub email processing library which we are
-> integrating now.
->
-> https://github.com/github/email_reply_parser
->
-> Go ahead and reply to this topic and I'll reply from various email clients
-> for testing.
->   ------------------------------
->
-> To respond, reply to this email or visit
-> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
-> your browser.
->
-> To unsubscribe from these emails, visit your user preferences
-> <https://meta.discourse.org/my/preferences>.
->
-
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
-fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog."
-      )
-    end
-
-    it "strips iPhone signature" do
-      expect(test_parse_body(fixture_file("emails/iphone_signature.eml"))).not_to match /Sent from my iPhone/
-    end
-
-    it "properly renders email reply from gmail web client" do
-      expect(test_parse_body(fixture_file("emails/gmail_web.eml"))).
-          to eq(
-"### This is a reply from standard GMail in Google Chrome.
-
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
-fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog.
-
-Here's some **bold** text in Markdown.
-
-Here's a link http://example.com"
-      )
-    end
-
-    it "properly renders email reply from iOS default mail client" do
-      expect(test_parse_body(fixture_file("emails/ios_default.eml"))).
-          to eq(
-"### this is a reply from iOS default mail
-
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
-
-Here's some **bold** markdown text.
-
-Here's a link http://example.com"
-      )
-    end
-
-    it "properly renders email reply from Android 5 gmail client" do
-      expect(test_parse_body(fixture_file("emails/android_gmail.eml"))).
-          to eq(
-"### this is a reply from Android 5 gmail
-
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
-fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
-The quick brown fox jumps over the lazy dog.
-
-This is **bold** in Markdown.
-
-This is a link to http://example.com"
-      )
-    end
-
-    it "properly renders email reply from Windows 8.1 Metro default mail client" do
-      expect(test_parse_body(fixture_file("emails/windows_8_metro.eml"))).
-          to eq(
-"### reply from default mail client in Windows 8.1 Metro
-
-
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
-
-
-This is a **bold** word in Markdown
-
-
-This is a link http://example.com"
-      )
-    end
-
-    it "properly renders email reply from MS Outlook client" do
-      expect(test_parse_body(fixture_file("emails/outlook.eml"))).to eq("Microsoft Outlook 2010")
-    end
-  end
-
-#   describe "posting replies" do
-#     let(:reply_key) { raise "Override this in a lower describe block" }
-#     let(:email_raw) { raise "Override this in a lower describe block" }
-#     # ----
-#     let(:receiver) { Gitlab::EmailReceiver.new(email_raw) }
-#     let(:post) { create_post }
-#     let(:topic) { post.topic }
-#     let(:posting_user) { post.user }
-#     let(:replying_user_email) { 'jake@adventuretime.ooo' }
-#     let(:replying_user) { Fabricate(:user, email: replying_user_email, trust_level: 2)}
-#     let(:email_log) { EmailLog.new(reply_key: reply_key,
-#                                    post: post,
-#                                    post_id: post.id,
-#                                    topic_id: post.topic_id,
-#                                    email_type: 'user_posted',
-#                                    user: replying_user,
-#                                    user_id: replying_user.id,
-#                                    to_address: replying_user_email
-#     ) }
-
-#     before do
-#       email_log.save
-#     end
-
-#     # === Success Posting ===
-
-#     describe "valid_reply.eml" do
-#       let!(:reply_key) { '59d8df8370b7e95c5a49fbf86aeb2c93' }
-#       let!(:email_raw) { fixture_file("emails/valid_reply.eml") }
-
-#       it "creates a post with the correct content" do
-#         start_count = topic.posts.count
-
-#         receiver.process
-
-#         expect(topic.posts.count).to eq(start_count + 1)
-#         created_post = topic.posts.last
-#         expect(created_post.via_email).to eq(true)
-#         expect(created_post.raw_email).to eq(fixture_file("emails/valid_reply.eml"))
-#         expect(created_post.cooked.strip).to eq(fixture_file("emails/valid_reply.cooked").strip)
-#       end
-#     end
-
-#     describe "paragraphs.eml" do
-#       let!(:reply_key) { '59d8df8370b7e95c5a49fbf86aeb2c93' }
-#       let!(:email_raw) { fixture_file("emails/paragraphs.eml") }
-
-#       it "cooks multiple paragraphs with traditional Markdown linebreaks" do
-#         start_count = topic.posts.count
-
-#         receiver.process
-
-#         expect(topic.posts.count).to eq(start_count + 1)
-#         expect(topic.posts.last.cooked.strip).to eq(fixture_file("emails/paragraphs.cooked").strip)
-#         expect(topic.posts.last.cooked).not_to match /<br/
-#       end
-#     end
-
-#     describe "attachment.eml" do
-#       let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
-#       let!(:email_raw) {
-#         fixture_file("emails/attachment.eml")
-#         .gsub("TO", "reply+#{reply_key}@appmail.adventuretime.ooo")
-#         .gsub("FROM", replying_user_email)
-#       }
-
-#       let(:upload_sha) { '04df605be528d03876685c52166d4b063aabb78a' }
-
-#       it "creates a post with an attachment" do
-#         Upload.stubs(:fix_image_orientation)
-#         ImageOptim.any_instance.stubs(:optimize_image!)
-
-#         start_count = topic.posts.count
-#         Upload.find_by(sha1: upload_sha).try(:destroy)
-
-#         receiver.process
-
-#         expect(topic.posts.count).to eq(start_count + 1)
-#         expect(topic.posts.last.cooked).to match /<img src=['"](\/uploads\/default\/original\/.+\.png)['"] width=['"]289['"] height=['"]126['"]>/
-#         expect(Upload.find_by(sha1: upload_sha)).not_to eq(nil)
-#       end
-
-#     end
-
-#     # === Failure Conditions ===
-
-#     describe "too_short.eml" do
-#       let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
-#       let!(:email_raw) {
-#         fixture_file("emails/too_short.eml")
-#         .gsub("TO", "reply+#{reply_key}@appmail.adventuretime.ooo")
-#         .gsub("FROM", replying_user_email)
-#         .gsub("SUBJECT", "re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'")
-#       }
-
-#       it "raises an InvalidPost error" do
-#         SiteSetting.min_post_length = 5
-#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::InvalidPost)
-#       end
-#     end
-
-#     describe "too_many_mentions.eml" do
-#       let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
-#       let!(:email_raw) { fixture_file("emails/too_many_mentions.eml") }
-
-#       it "raises an InvalidPost error" do
-#         SiteSetting.max_mentions_per_post = 10
-#         (1..11).each do |i|
-#           Fabricate(:user, username: "user#{i}").save
-#         end
-
-#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::InvalidPost)
-#       end
-#     end
-
-#     describe "auto response email replies should not be accepted" do
-#       let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
-#       let!(:email_raw) { fixture_file("emails/auto_reply.eml") }
-#       it "raises a AutoGeneratedEmailError" do
-#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::AutoGeneratedEmailError)
-#       end
-#     end
-
-#   end
-
-#   describe "posting reply to a closed topic" do
-#     let(:reply_key) { raise "Override this in a lower describe block" }
-#     let(:email_raw) { raise "Override this in a lower describe block" }
-#     let(:receiver) { Gitlab::EmailReceiver.new(email_raw) }
-#     let(:topic) { Fabricate(:topic, closed: true) }
-#     let(:post) { Fabricate(:post, topic: topic, post_number: 1) }
-#     let(:replying_user_email) { 'jake@adventuretime.ooo' }
-#     let(:replying_user) { Fabricate(:user, email: replying_user_email, trust_level: 2) }
-#     let(:email_log) { EmailLog.new(reply_key: reply_key,
-#                                    post: post,
-#                                    post_id: post.id,
-#                                    topic_id: topic.id,
-#                                    email_type: 'user_posted',
-#                                    user: replying_user,
-#                                    user_id: replying_user.id,
-#                                    to_address: replying_user_email
-#     ) }
-
-#     before do
-#       email_log.save
-#     end
-
-#     describe "should not create post" do
-#       let!(:reply_key) { '59d8df8370b7e95c5a49fbf86aeb2c93' }
-#       let!(:email_raw) { fixture_file("emails/valid_reply.eml") }
-#       it "raises a TopicClosedError" do
-#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::TopicClosedError)
-#       end
-#     end
-#   end
-
-#   describe "posting reply to a deleted topic" do
-#     let(:reply_key) { raise "Override this in a lower describe block" }
-#     let(:email_raw) { raise "Override this in a lower describe block" }
-#     let(:receiver) { Gitlab::EmailReceiver.new(email_raw) }
-#     let(:deleted_topic) { Fabricate(:deleted_topic) }
-#     let(:post) { Fabricate(:post, topic: deleted_topic, post_number: 1) }
-#     let(:replying_user_email) { 'jake@adventuretime.ooo' }
-#     let(:replying_user) { Fabricate(:user, email: replying_user_email, trust_level: 2) }
-#     let(:email_log) { EmailLog.new(reply_key: reply_key,
-#                                    post: post,
-#                                    post_id: post.id,
-#                                    topic_id: deleted_topic.id,
-#                                    email_type: 'user_posted',
-#                                    user: replying_user,
-#                                    user_id: replying_user.id,
-#                                    to_address: replying_user_email
-#     ) }
-
-#     before do
-#       email_log.save
-#     end
-
-#     describe "should not create post" do
-#       let!(:reply_key) { '59d8df8370b7e95c5a49fbf86aeb2c93' }
-#       let!(:email_raw) { fixture_file("emails/valid_reply.eml") }
-#       it "raises a TopicNotFoundError" do
-#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::TopicNotFoundError)
-#       end
-#     end
-#   end
-
-#   describe "posting a new topic" do
-#     let(:category_destination) { raise "Override this in a lower describe block" }
-#     let(:email_raw) { raise "Override this in a lower describe block" }
-#     let(:allow_strangers) { false }
-#     # ----
-#     let(:receiver) { Gitlab::EmailReceiver.new(email_raw) }
-#     let(:user_email) { 'jake@adventuretime.ooo' }
-#     let(:user) { Fabricate(:user, email: user_email, trust_level: 2)}
-#     let(:category) { Fabricate(:category, email_in: category_destination, email_in_allow_strangers: allow_strangers) }
-
-#     before do
-#       SiteSetting.email_in = true
-#       user.save
-#       category.save
-#     end
-
-#     describe "too_short.eml" do
-#       let!(:category_destination) { 'incoming+amazing@appmail.adventuretime.ooo' }
-#       let(:email_raw) {
-#         fixture_file("emails/too_short.eml")
-#         .gsub("TO", category_destination)
-#         .gsub("FROM", user_email)
-#         .gsub("SUBJECT", "A long subject that passes the checks")
-#       }
-
-#       it "does not create a topic if the post fails" do
-#         before_topic_count = Topic.count
-
-#         expect { receiver.process }.to raise_error(Gitlab::EmailReceiver::InvalidPost)
-
-#         expect(Topic.count).to eq(before_topic_count)
-#       end
-
-#     end
-
-#   end
-
-#   def fill_email(mail, from, to, body = nil, subject = nil)
-#     result = mail.gsub("FROM", from).gsub("TO", to)
-#     if body
-#       result.gsub!(/Hey.*/m, body)
-#     end
-#     if subject
-#       result.sub!(/We .*/, subject)
-#     end
-#     result
-#   end
-
-#   def process_email(opts)
-#     incoming_email = fixture_file("emails/valid_incoming.eml")
-#     email = fill_email(incoming_email, opts[:from],  opts[:to], opts[:body], opts[:subject])
-#     Gitlab::EmailReceiver.new(email).process
-#   end
-
-#   describe "with a valid email" do
-#     let(:reply_key) { "59d8df8370b7e95c5a49fbf86aeb2c93" }
-#     let(:to) { SiteSetting.reply_by_email_address.gsub("%{reply_key}", reply_key) }
-
-#     let(:valid_reply) {
-#       reply = fixture_file("emails/valid_reply.eml")
-#       to = SiteSetting.reply_by_email_address.gsub("%{reply_key}", reply_key)
-#       fill_email(reply, "test@test.com", to)
-#     }
-
-#     let(:receiver) { Gitlab::EmailReceiver.new(valid_reply) }
-#     let(:post) { create_post }
-#     let(:user) { post.user }
-#     let(:email_log) { EmailLog.new(reply_key: reply_key,
-#                                    post_id: post.id,
-#                                    topic_id: post.topic_id,
-#                                    user_id: post.user_id,
-#                                    post: post,
-#                                    user: user,
-#                                    email_type: 'test',
-#                                    to_address: 'test@test.com'
-#                                    ) }
-#     let(:reply_body) {
-# "I could not disagree more. I am obviously biased but adventure time is the
-# greatest show ever created. Everyone should watch it.
-
-# - Jake out" }
-
-#     describe "with an email log" do
-
-#       it "extracts data" do
-#         expect{ receiver.process }.to raise_error(Gitlab::EmailReceiver::EmailLogNotFound)
-
-#         email_log.save!
-#         receiver.process
-
-#         expect(receiver.body).to eq(reply_body)
-#         expect(receiver.email_log).to eq(email_log)
-#       end
-
-#     end
-
-#   end
-end

From 0b401f2e94c5062d26887cdeda73341c1aae82a5 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 11:17:14 -0700
Subject: [PATCH 053/111] Fix a couple of whoopsy daisies.

---
 lib/gitlab/email/attachment_uploader.rb | 2 +-
 lib/gitlab/email/receiver.rb            | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/email/attachment_uploader.rb b/lib/gitlab/email/attachment_uploader.rb
index 0c0f50f275..32cece8316 100644
--- a/lib/gitlab/email/attachment_uploader.rb
+++ b/lib/gitlab/email/attachment_uploader.rb
@@ -1,6 +1,6 @@
 module Gitlab
   module Email
-    module AttachmentUploader
+    class AttachmentUploader
       attr_accessor :message
 
       def initialize(message)
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index c46fce6afe..7160af2908 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -76,7 +76,7 @@ module Gitlab
       end
 
       def add_attachments(reply)
-        attachments = AttachmentUploader.new(message).execute(project)
+        attachments = Email::AttachmentUploader.new(message).execute(sent_notification.project)
 
         attachments.each do |link|
           text = "[#{link[:alt]}](#{link[:url]})"
@@ -84,6 +84,8 @@ module Gitlab
 
           reply << "\n\n#{text}"
         end
+
+        reply
       end
 
       def create_note(reply)

From 2f78b5e8afbf0024211bbd5bfe3a6c6f53b2421e Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 11:33:18 -0700
Subject: [PATCH 054/111] Make error class names more consistent.

---
 app/workers/email_receiver_worker.rb |  4 ++--
 lib/gitlab/email/receiver.rb         | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb
index 4f3556bfc0..8f6c27ce4a 100644
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
@@ -22,7 +22,7 @@ class EmailReceiverWorker
     reason = nil
 
     case e
-    when Gitlab::Email::Receiver::SentNotificationNotFound
+    when Gitlab::Email::Receiver::SentNotificationNotFoundError
       reason = "We couldn't figure out what the email is in reply to. Please create your comment through the web interface."
     when Gitlab::Email::Receiver::EmptyEmailError
       can_retry = true
@@ -35,7 +35,7 @@ class EmailReceiverWorker
       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::Email::Receiver::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::Email::Receiver::InvalidNote
+    when Gitlab::Email::Receiver::InvalidNoteError
       can_retry = true
       reason = e.message
     else
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index 7160af2908..466e48b22e 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -4,13 +4,13 @@ module Gitlab
     class Receiver
       class ProcessingError < StandardError; end
       class EmailUnparsableError < ProcessingError; end
+      class SentNotificationNotFoundError < ProcessingError; end
       class EmptyEmailError < ProcessingError; end
+      class AutoGeneratedEmailError < ProcessingError; end
       class UserNotFoundError < ProcessingError; end
       class UserNotAuthorizedError < ProcessingError; end
       class NoteableNotFoundError < ProcessingError; end
-      class AutoGeneratedEmailError < ProcessingError; end
-      class SentNotificationNotFound < ProcessingError; end
-      class InvalidNote < ProcessingError; end
+      class InvalidNoteError < ProcessingError; end
 
       def initialize(raw)
         @raw = raw
@@ -23,7 +23,7 @@ module Gitlab
       end
 
       def execute
-        raise SentNotificationNotFound unless sent_notification
+        raise SentNotificationNotFoundError unless sent_notification
 
         raise EmptyEmailError if @raw.blank?
 
@@ -53,7 +53,7 @@ module Gitlab
             message << "\n\n- #{error}"
           end
 
-          raise InvalidNote, message
+          raise InvalidNoteError, message
         end
       end
 

From 991c9f6fdab46909fbbe652b1c88a6521a969c02 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 11:33:35 -0700
Subject: [PATCH 055/111] Test Email::AttachmentUploader.

---
 .../gitlab/email/attachment_uploader_spec.rb  | 26 ++++++++++
 spec/lib/gitlab/email/reply_parser_spec.rb    |  2 +-
 spec/services/projects/upload_service_spec.rb | 48 +++++++++----------
 3 files changed, 51 insertions(+), 25 deletions(-)
 create mode 100644 spec/lib/gitlab/email/attachment_uploader_spec.rb

diff --git a/spec/lib/gitlab/email/attachment_uploader_spec.rb b/spec/lib/gitlab/email/attachment_uploader_spec.rb
new file mode 100644
index 0000000000..b54ee8aa72
--- /dev/null
+++ b/spec/lib/gitlab/email/attachment_uploader_spec.rb
@@ -0,0 +1,26 @@
+require "spec_helper"
+
+describe Gitlab::Email::AttachmentUploader do
+  def fixture_file(filename)
+    return '' if filename.blank?
+    file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
+    File.read(file_path)
+  end
+
+  describe "#execute" do
+    let(:project) { build(:project) }
+    let(:message_raw) { fixture_file("emails/attachment.eml") }
+    let(:message) { Mail::Message.new(message_raw) }
+
+    it "creates a post with an attachment" do
+      links = described_class.new(message).execute(project)
+      link = links.first
+
+      expect(link).not_to be_nil
+      expect(link[:is_image]).to be_truthy
+      expect(link[:alt]).to eq("bricks")
+      expect(link[:url]).to include("/#{project.path_with_namespace}")
+      expect(link[:url]).to include("bricks.png")
+    end
+  end
+end
diff --git a/spec/lib/gitlab/email/reply_parser_spec.rb b/spec/lib/gitlab/email/reply_parser_spec.rb
index 999515beb1..32120d56cb 100644
--- a/spec/lib/gitlab/email/reply_parser_spec.rb
+++ b/spec/lib/gitlab/email/reply_parser_spec.rb
@@ -8,7 +8,7 @@ describe Gitlab::Email::ReplyParser do
     File.read(file_path)
   end
 
-  describe 'self.parse_body' do
+  describe '#execute' do
     def test_parse_body(mail_string)
       described_class.new(Mail::Message.new(mail_string)).execute
     end
diff --git a/spec/services/projects/upload_service_spec.rb b/spec/services/projects/upload_service_spec.rb
index 7aa2685764..fa4ff6b01a 100644
--- a/spec/services/projects/upload_service_spec.rb
+++ b/spec/services/projects/upload_service_spec.rb
@@ -13,13 +13,13 @@ describe Projects::UploadService do
         @link_to_file = upload_file(@project.repository, gif)
       end
 
-      it { expect(@link_to_file).to have_key('alt') }
-      it { expect(@link_to_file).to have_key('url') }
-      it { expect(@link_to_file).to have_key('is_image') }
+      it { expect(@link_to_file).to have_key(:alt) }
+      it { expect(@link_to_file).to have_key(:url) }
+      it { expect(@link_to_file).to have_key(:is_image) }
       it { expect(@link_to_file).to have_value('banana_sample') }
-      it { expect(@link_to_file['is_image']).to equal(true) }
-      it { expect(@link_to_file['url']).to match("/#{@project.path_with_namespace}") }
-      it { expect(@link_to_file['url']).to match('banana_sample.gif') }
+      it { expect(@link_to_file[:is_image]).to equal(true) }
+      it { expect(@link_to_file[:url]).to match("/#{@project.path_with_namespace}") }
+      it { expect(@link_to_file[:url]).to match('banana_sample.gif') }
     end
 
     context 'for valid png file' do
@@ -29,13 +29,13 @@ describe Projects::UploadService do
         @link_to_file = upload_file(@project.repository, png)
       end
 
-      it { expect(@link_to_file).to have_key('alt') }
-      it { expect(@link_to_file).to have_key('url') }
+      it { expect(@link_to_file).to have_key(:alt) }
+      it { expect(@link_to_file).to have_key(:url) }
       it { expect(@link_to_file).to have_value('dk') }
-      it { expect(@link_to_file).to have_key('is_image') }
-      it { expect(@link_to_file['is_image']).to equal(true) }
-      it { expect(@link_to_file['url']).to match("/#{@project.path_with_namespace}") }
-      it { expect(@link_to_file['url']).to match('dk.png') }
+      it { expect(@link_to_file).to have_key(:is_image) }
+      it { expect(@link_to_file[:is_image]).to equal(true) }
+      it { expect(@link_to_file[:url]).to match("/#{@project.path_with_namespace}") }
+      it { expect(@link_to_file[:url]).to match('dk.png') }
     end
 
     context 'for valid jpg file' do
@@ -44,13 +44,13 @@ describe Projects::UploadService do
         @link_to_file = upload_file(@project.repository, jpg)
       end
 
-      it { expect(@link_to_file).to have_key('alt') }
-      it { expect(@link_to_file).to have_key('url') }
-      it { expect(@link_to_file).to have_key('is_image') }
+      it { expect(@link_to_file).to have_key(:alt) }
+      it { expect(@link_to_file).to have_key(:url) }
+      it { expect(@link_to_file).to have_key(:is_image) }
       it { expect(@link_to_file).to have_value('rails_sample') }
-      it { expect(@link_to_file['is_image']).to equal(true) }
-      it { expect(@link_to_file['url']).to match("/#{@project.path_with_namespace}") }
-      it { expect(@link_to_file['url']).to match('rails_sample.jpg') }
+      it { expect(@link_to_file[:is_image]).to equal(true) }
+      it { expect(@link_to_file[:url]).to match("/#{@project.path_with_namespace}") }
+      it { expect(@link_to_file[:url]).to match('rails_sample.jpg') }
     end
 
     context 'for txt file' do
@@ -59,13 +59,13 @@ describe Projects::UploadService do
         @link_to_file = upload_file(@project.repository, txt)
       end
 
-      it { expect(@link_to_file).to have_key('alt') }
-      it { expect(@link_to_file).to have_key('url') }
-      it { expect(@link_to_file).to have_key('is_image') }
+      it { expect(@link_to_file).to have_key(:alt) }
+      it { expect(@link_to_file).to have_key(:url) }
+      it { expect(@link_to_file).to have_key(:is_image) }
       it { expect(@link_to_file).to have_value('doc_sample.txt') }
-      it { expect(@link_to_file['is_image']).to equal(false) }
-      it { expect(@link_to_file['url']).to match("/#{@project.path_with_namespace}") }
-      it { expect(@link_to_file['url']).to match('doc_sample.txt') }
+      it { expect(@link_to_file[:is_image]).to equal(false) }
+      it { expect(@link_to_file[:url]).to match("/#{@project.path_with_namespace}") }
+      it { expect(@link_to_file[:url]).to match('doc_sample.txt') }
     end
 
     context 'for too large a file' do

From e44936f3ed4799714fc36a342c1dbab1d50f0ffc Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 11:47:09 -0700
Subject: [PATCH 056/111] Test EmailReceiverWorker.

---
 spec/fixtures/emails/valid_incoming.eml    | 10 ++---
 spec/workers/email_receiver_worker_spec.rb | 51 ++++++++++++++++++++++
 2 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 spec/workers/email_receiver_worker_spec.rb

diff --git a/spec/fixtures/emails/valid_incoming.eml b/spec/fixtures/emails/valid_incoming.eml
index 5e8db53319..409711ab41 100644
--- a/spec/fixtures/emails/valid_incoming.eml
+++ b/spec/fixtures/emails/valid_incoming.eml
@@ -1,11 +1,11 @@
-Return-Path: <FROM>
+Return-Path: <from@example.com>
 Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
-Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <TO>; Thu, 13 Jun 2013 17:03:50 -0400
-Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <TO>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <to@example.com>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <to@example.com>; Thu, 13 Jun 2013 14:03:48 -0700
 Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
 Date: Thu, 13 Jun 2013 17:03:48 -0400
-From: Jake the Dog <FROM>
-To: <TO>
+From: Jake the Dog <from@example.com>
+To: <to@example.com>
 Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
 Subject: We should have a post-by-email-feature.
 Mime-Version: 1.0
diff --git a/spec/workers/email_receiver_worker_spec.rb b/spec/workers/email_receiver_worker_spec.rb
new file mode 100644
index 0000000000..109a7b3eb1
--- /dev/null
+++ b/spec/workers/email_receiver_worker_spec.rb
@@ -0,0 +1,51 @@
+require "spec_helper"
+
+describe EmailReceiverWorker do
+  def fixture_file(filename)
+    return '' if filename.blank?
+    file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
+    File.read(file_path)
+  end
+
+  let(:raw_message) { fixture_file('emails/valid_incoming.eml') }
+
+  context "when reply by email is enabled" do
+    before do
+      allow(Gitlab::ReplyByEmail).to receive(:enabled?).and_return(true)
+    end
+
+    it "calls the email receiver" do
+      expect(Gitlab::Email::Receiver).to receive(:new).with(raw_message).and_call_original
+      expect_any_instance_of(Gitlab::Email::Receiver).to receive(:execute)
+
+      described_class.new.perform(raw_message)
+    end
+
+    context "when an error occurs" do
+      before do
+        allow_any_instance_of(Gitlab::Email::Receiver).to receive(:execute).and_raise(Gitlab::Email::Receiver::EmptyEmailError)
+      end
+
+      it "sends out a rejection email" do
+        described_class.new.perform(raw_message)
+
+        email = ActionMailer::Base.deliveries.last
+        expect(email).not_to be_nil
+        expect(email.to).to eq(["from@example.com"])
+        expect(email.subject).to include("Rejected")
+      end
+    end
+  end
+
+  context "when reply by email is disabled" do
+    before do
+      allow(Gitlab::ReplyByEmail).to receive(:enabled?).and_return(false)
+    end
+
+    it "doesn't call the email receiver" do
+      expect(Gitlab::Email::Receiver).not_to receive(:new)
+
+      described_class.new.perform(raw_message)
+    end
+  end
+end

From 8ec5fb138dde9937814ac138352177399d3e776d Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 12:17:59 -0700
Subject: [PATCH 057/111] Test Gitlab::Email::Receiver.

---
 lib/gitlab/email/receiver.rb           |  18 ++--
 spec/lib/gitlab/email/receiver_spec.rb | 135 +++++++++++++++++++++++++
 2 files changed, 144 insertions(+), 9 deletions(-)
 create mode 100644 spec/lib/gitlab/email/receiver_spec.rb

diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index 466e48b22e..17b8339edc 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -16,17 +16,11 @@ module Gitlab
         @raw = raw
       end
 
-      def message
-        @message ||= Mail::Message.new(@raw)
-      rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError => e
-        raise EmailUnparsableError, e
-      end
-
       def execute
-        raise SentNotificationNotFoundError unless sent_notification
-
         raise EmptyEmailError if @raw.blank?
 
+        raise SentNotificationNotFoundError unless sent_notification
+
         raise AutoGeneratedEmailError if message.header.to_s =~ /auto-(generated|replied)/
 
         author = sent_notification.recipient
@@ -35,7 +29,7 @@ module Gitlab
 
         project = sent_notification.project
 
-        raise UserNotAuthorizedError unless author.can?(:create_note, project)
+        raise UserNotAuthorizedError unless project && author.can?(:create_note, project)
 
         raise NoteableNotFoundError unless sent_notification.noteable
 
@@ -59,6 +53,12 @@ module Gitlab
 
       private
 
+      def message
+        @message ||= Mail::Message.new(@raw)
+      rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError => e
+        raise EmailUnparsableError, e
+      end
+
       def reply_key
         reply_key = nil
         message.to.each do |address|
diff --git a/spec/lib/gitlab/email/receiver_spec.rb b/spec/lib/gitlab/email/receiver_spec.rb
new file mode 100644
index 0000000000..65f3ceb5de
--- /dev/null
+++ b/spec/lib/gitlab/email/receiver_spec.rb
@@ -0,0 +1,135 @@
+require "spec_helper"
+
+describe Gitlab::Email::Receiver do
+  def fixture_file(filename)
+    return '' if filename.blank?
+    file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
+    File.read(file_path)
+  end
+
+  before do
+    allow(Gitlab.config.reply_by_email).to receive(:enabled).and_return(true)
+    allow(Gitlab.config.reply_by_email).to receive(:address).and_return("reply+%{reply_key}@appmail.adventuretime.ooo")
+  end
+
+  let(:reply_key) { "59d8df8370b7e95c5a49fbf86aeb2c93" }
+  let(:email_raw) { fixture_file('emails/valid_reply.eml') }
+
+  let(:project)   { create(:project, :public) }
+  let(:noteable)  { create(:issue, project: project) }
+  let(:user)      { create(:user) }
+  let!(:sent_notification) { SentNotification.record(noteable, user.id, reply_key) }
+
+  let(:receiver) { described_class.new(email_raw) }
+
+  context "when the recipient address doesn't include a reply key" do
+    let(:email_raw) { fixture_file('emails/valid_reply.eml').gsub(reply_key, "") }
+
+    it "raises a SentNotificationNotFoundError" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::SentNotificationNotFoundError)
+    end
+  end
+
+  context "when no sent notificiation for the reply key could be found" do
+    let(:email_raw) { fixture_file('emails/valid_reply.eml').gsub(reply_key, "nope") }
+
+    it "raises a SentNotificationNotFoundError" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::SentNotificationNotFoundError)
+    end
+  end
+
+  context "when the email is blank" do
+    let(:email_raw) { "" }
+
+    it "raises an EmptyEmailError" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::EmptyEmailError)
+    end
+  end
+
+  context "when the email was auto generated" do
+    let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
+    let!(:email_raw) { fixture_file("emails/auto_reply.eml") }
+    
+    it "raises an AutoGeneratedEmailError" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::AutoGeneratedEmailError)
+    end
+  end
+
+  context "when the user could not be found" do
+    before do
+      user.destroy
+    end
+
+    it "raises a UserNotFoundError" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::UserNotFoundError)
+    end
+  end
+
+  context "when the user is not authorized to create a note" do
+    before do
+      project.update_attribute(:visibility_level, Project::PRIVATE)
+    end
+
+    it "raises a UserNotAuthorizedError" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::UserNotAuthorizedError)
+    end
+  end
+
+  context "when the noteable could not be found" do
+    before do
+      noteable.destroy
+    end
+
+    it "raises a NoteableNotFoundError" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::NoteableNotFoundError)
+    end
+  end
+
+  context "when the reply is blank" do
+    let!(:email_raw) { fixture_file("emails/no_content_reply.eml") }
+    
+    it "raises an EmptyEmailError" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::EmptyEmailError)
+    end
+  end
+
+  context "when the note could not be saved" do
+    before do
+      allow_any_instance_of(Note).to receive(:persisted?).and_return(false)
+    end
+
+    it "raises an InvalidNoteError" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::InvalidNoteError)
+    end
+  end
+
+  context "when everything is fine" do
+    before do
+      allow_any_instance_of(Gitlab::Email::AttachmentUploader).to receive(:execute).and_return(
+        [
+          {
+            url: "uploads/image.png",
+            is_image: true,
+            alt: "image"
+          }
+        ]
+      )
+    end
+
+    it "creates a comment" do
+      expect { receiver.execute }.to change { noteable.notes.count }.by(1)
+      note = noteable.notes.last
+
+      expect(note.author).to eq(sent_notification.recipient)
+      expect(note.note).to include("I could not disagree more.")
+    end
+
+    it "adds all attachments" do
+      receiver.execute
+
+      note = noteable.notes.last
+
+      expect(note.note).to include("![image](uploads/image.png)")
+    end
+  end
+end

From 2b5a2b8f398aa6af0a24c40cd6586eae76c85a3f Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 12:29:03 -0700
Subject: [PATCH 058/111] Removed unused fixtures.

---
 spec/fixtures/emails/boundary.eml             |  61 ------
 .../fixtures/emails/multiple_destinations.eml |  40 ----
 spec/fixtures/emails/paragraphs.cooked        |   7 -
 spec/fixtures/emails/previous.eml             |  38 ----
 spec/fixtures/emails/previous_replies.eml     | 180 ------------------
 spec/fixtures/emails/too_many_mentions.eml    |  31 ---
 spec/fixtures/emails/valid_incoming.cooked    |   5 -
 spec/fixtures/emails/valid_incoming.eml       |  25 ---
 spec/fixtures/emails/valid_reply.cooked       |   4 -
 spec/fixtures/emails/via_line.eml             |  25 ---
 spec/lib/gitlab/email/receiver_spec.rb        |   2 +-
 11 files changed, 1 insertion(+), 417 deletions(-)
 delete mode 100644 spec/fixtures/emails/boundary.eml
 delete mode 100644 spec/fixtures/emails/multiple_destinations.eml
 delete mode 100644 spec/fixtures/emails/paragraphs.cooked
 delete mode 100644 spec/fixtures/emails/previous.eml
 delete mode 100644 spec/fixtures/emails/previous_replies.eml
 delete mode 100644 spec/fixtures/emails/too_many_mentions.eml
 delete mode 100644 spec/fixtures/emails/valid_incoming.cooked
 delete mode 100644 spec/fixtures/emails/valid_incoming.eml
 delete mode 100644 spec/fixtures/emails/valid_reply.cooked
 delete mode 100644 spec/fixtures/emails/via_line.eml

diff --git a/spec/fixtures/emails/boundary.eml b/spec/fixtures/emails/boundary.eml
deleted file mode 100644
index 1250fe498b..0000000000
--- a/spec/fixtures/emails/boundary.eml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-MIME-Version: 1.0
-Received: by 10.64.14.41 with HTTP; Wed, 19 Jun 2013 06:29:41 -0700 (PDT)
-In-Reply-To: <51c19490e928a_13442dd8ae892548@tree.mail>
-References: <51c19490e928a_13442dd8ae892548@tree.mail>
-Date: Wed, 19 Jun 2013 09:29:41 -0400
-Delivered-To: finn@adventuretime.ooo
-Message-ID: <CADkmRcL=2aPV7jOcs2i00QGZNwmjYj3qMaJTsKnB7DTP5sgyFQ@mail.gmail.com>
-Subject: Re: [Adventure Time] jake mentioned you in 'peppermint butler is
- missing'
-From: Finn the Human <finn@adventuretime.ooo>
-To: jake via Adventure Time <reply+96dcd9072ba9072d06226009d4223a6e@appmail.adventuretime.ooo>
-Content-Type: multipart/alternative; boundary=001a11c206a073876a04df81d2a9
-
---001a11c206a073876a04df81d2a9
-Content-Type: text/plain; charset=ISO-8859-1
-
-I'll look into it, thanks!
-
-
-On Wednesday, June 19, 2013, jake via Discourse wrote:
-
-> jake mentioned you in 'peppermint butler is missing' on Adventure
-> Time:
-> ------------------------------
->
-> yeah, just noticed this cc @jake
-> ------------------------------
->
-> Please visit this link to respond:
-> http://adventuretime.ooo/t/peppermint-butler-is-missing/7628/2
->
-> To unsubscribe from these emails, visit your user preferences
-> <http://adventuretime.ooo/user_preferences>.
->
-
---001a11c206a073876a04df81d2a9
-Content-Type: text/html; charset=ISO-8859-1
-Content-Transfer-Encoding: quoted-printable
-
-I&#39;ll look into it, thanks!<span></span><br><br>On Wednesday, June 19, 2=
-013, jake via Adventure Time  wrote:<br><blockquote class=3D"gmail_quote" st=
-yle=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><p>sa=
-m mentioned you in &#39;Duplicate message are shown in profile&#39; on Adve=
-nture Time</p>
-
-
-<hr><p>yeah, just noticed this cc <a href=3D"http://users/eviltrout" target=
-=3D"_blank">@eviltrout</a> </p>
-
-<hr><p>Please visit this link to respond: <a href=3D"http://adventuretime.oo=
-o/t/duplicate-message-are-shown-in-profile/7628/2" target=3D"_blank">http=
-://adventuretime.ooo/t/peppermint-butler-is-missing/7628/2</a></=
-p>
-
-
-<p>To unsubscribe from these emails, visit your <a href=3D"http://adventuret=
-ime.ooo/user_preferences" target=3D"_blank">user preferences</a>.</p>
-</blockquote>
-
---001a11c206a073876a04df81d2a9--
diff --git a/spec/fixtures/emails/multiple_destinations.eml b/spec/fixtures/emails/multiple_destinations.eml
deleted file mode 100644
index 6d31bbf197..0000000000
--- a/spec/fixtures/emails/multiple_destinations.eml
+++ /dev/null
@@ -1,40 +0,0 @@
-Return-Path: <jake@adventuretime.ooo>
-Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
-Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 17:03:50 -0400
-Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo>; Thu, 13 Jun 2013 14:03:48 -0700
-Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
-Date: Thu, 13 Jun 2013 17:03:48 -0400
-From: Jake the Dog <jake@adventuretime.ooo>
-To: finn@adventuretime.ooo, reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo
-Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
-Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
-Mime-Version: 1.0
-Content-Type: text/plain;
- charset=ISO-8859-1
-Content-Transfer-Encoding: 7bit
-X-Sieve: CMU Sieve 2.2
-X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
- 13 Jun 2013 14:03:48 -0700 (PDT)
-X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
-
-I could not disagree more. I am obviously biased but adventure time is the
-greatest show ever created. Everyone should watch it.
-
-- Jake out
-
-
-On Sun, Jun 9, 2013 at 1:39 PM, eviltrout via Discourse Meta
-<reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo> wrote:
->
->
->
-> eviltrout posted in 'Adventure Time Sux' on Discourse Meta:
->
-> ---
-> hey guys everyone knows adventure time sucks!
->
-> ---
-> Please visit this link to respond: http://localhost:3000/t/adventure-time-sux/1234/3
->
-> To unsubscribe from these emails, visit your [user preferences](http://localhost:3000/user_preferences).
->
\ No newline at end of file
diff --git a/spec/fixtures/emails/paragraphs.cooked b/spec/fixtures/emails/paragraphs.cooked
deleted file mode 100644
index da83260e09..0000000000
--- a/spec/fixtures/emails/paragraphs.cooked
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>Is there any reason the <em>old</em> candy can't be be kept in silos while the new candy
-is imported into <em>new</em> silos?</p>
-
-<p>The thing about candy is it stays delicious for a long time -- we can just keep
-it there without worrying about it too much, imo.</p>
-
-<p>Thanks for listening.</p>
\ No newline at end of file
diff --git a/spec/fixtures/emails/previous.eml b/spec/fixtures/emails/previous.eml
deleted file mode 100644
index 24ac5a63de..0000000000
--- a/spec/fixtures/emails/previous.eml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-Delivered-To: discourse-reply+cd480e301683c9902891f15968bf07a5@discourse.org
-Received: by 10.194.216.104 with SMTP id op8csp80593wjc;
-        Wed, 24 Jul 2013 07:59:14 -0700 (PDT)
-Return-Path: <walter.white@googlemail.com>
-References: <topic/5043@discourse.org> <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
-From: Walter White <walter.white@googlemail.com>
-In-Reply-To: <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
-Mime-Version: 1.0 (1.0)
-Date: Wed, 24 Jul 2013 15:59:10 +0100
-Message-ID: <4597127794206131679@unknownmsgid>
-Subject: Re: [Discourse] new reply to your post in 'Crystal Blue'
-To: walter via Discourse <reply+cd480e301683c9902891f15968bf07a5@appmail.adventuretime.ooo>
-Content-Type: multipart/alternative; boundary=001a11c20edc15a39304e2432790
-
-This will not include the previous discussion that is present in this email.
- ------------------------------
-Previous discussion
-skylerwhite<http://discourse.org/users/skylerwhite> July 24
-
-This is a reply.
-    fring <http://discourse.org/users/fring>  July 24
-
-This is an older reply.
-    hank_schrader <http://discourse.org/users/hank_schrader>  July 24
-
-Of course another reply here.
-    walterwhite <http://discourse.org/users/walterwhite>  July 24
-
- ------------------------------
-
-To respond, reply to this email or visit
-http://discourse.org/t/crystal-blue/5043/10in
-your browser.
-
-To unsubscribe from these emails, visit your user
-preferences<http://discourse.org/user_preferences>
-.
diff --git a/spec/fixtures/emails/previous_replies.eml b/spec/fixtures/emails/previous_replies.eml
deleted file mode 100644
index 3fd74482c0..0000000000
--- a/spec/fixtures/emails/previous_replies.eml
+++ /dev/null
@@ -1,180 +0,0 @@
-Delivered-To: reply@discourse.org
-MIME-Version: 1.0
-In-Reply-To: <topic/22638/86406@meta.discourse.org>
-References: <topic/22638@meta.discourse.org>
-  <topic/22638/86406@meta.discourse.org>
-Date: Fri, 28 Nov 2014 12:55:32 -0800
-Subject: Re: [Discourse Meta] [Lounge] Testing default email replies
-From: Walter White <walter.white@googlemail.com>
-To: Discourse Meta <reply@discourse.org>
-Content-Type: multipart/alternative; boundary=001a1137c9285318bb0508f17bc5
-
---001a1137c9285318bb0508f17bc5
-Content-Type: text/plain; charset=UTF-8
-
-### this is a reply from iOS Gmail app
-
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
-fox jumps over the lazy dog. The quick brown fox jumps over the lazy
-dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps
-over the lazy dog.
-
-This is **bold** text in Markdown.
-
-This is a link to http://example.com
-
-On Friday, November 28, 2014, Arpit Jalan <info@discourse.org> wrote:
-
->     techAPJ <https://meta.discourse.org/users/techapj>
-> November 28
->
-> Test reply.
->
-> First paragraph.
->
-> Second paragraph.
->
-> To respond, reply to this email or visit
-> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
-> your browser.
->  ------------------------------
-> Previous Replies    codinghorror
-> <https://meta.discourse.org/users/codinghorror>
-> November 28
->
-> We're testing the latest GitHub email processing library which we are
-> integrating now.
->
-> https://github.com/github/email_reply_parser
->
-> Go ahead and reply to this topic and I'll reply from various email clients
-> for testing.
->   ------------------------------
->
-> To respond, reply to this email or visit
-> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
-> your browser.
->
-> To unsubscribe from these emails, visit your user preferences
-> <https://meta.discourse.org/my/preferences>.
->
-
---001a1137c9285318bb0508f17bc5
-Content-Type: text/html; charset=UTF-8
-Content-Transfer-Encoding: quoted-printable
-
-### this is a reply from iOS Gmail app<div><br></div><div>The quick brown f=
-ox jumps over the lazy dog.=C2=A0<font><span style=3D"background-color:rgba=
-(255,255,255,0)">The quick brown fox jumps over the lazy dog.=C2=A0The quic=
-k brown fox jumps over the lazy dog.=C2=A0The quick brown fox jumps over th=
-e lazy dog.=C2=A0The quick brown fox jumps over the lazy dog.=C2=A0The quic=
-k brown fox jumps over the lazy dog.=C2=A0The quick brown fox jumps over th=
-e lazy dog.=C2=A0</span></font></div><div><font><span style><br></span></fo=
-nt></div><div><font><span style>This is **bold** text in Markdown.</span></=
-font></div><div><font><span style><br></span></font></div><div><font><span =
-style>This is a link to <a href=3D"http://example.com">http://example.com</=
-a><br></span></font><br>On Friday, November 28, 2014, Arpit Jalan &lt;<a hr=
-ef=3D"mailto:info@discourse.org">info@discourse.org</a>&gt; wrote:<br><bloc=
-kquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #cc=
-c solid;padding-left:1ex"><div>
-
-<table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" bor=
-der=3D"0">
-  <tbody>
-    <tr>
-      <td style=3D"vertical-align:top;width:55px">
-        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
-r/meta.discourse.org/techapj/45/3281.png" title=3D"techAPJ" style=3D"max-wi=
-dth:100%" width=3D"45" height=3D"45">
-      </td>
-      <td>
-        <a href=3D"https://meta.discourse.org/users/techapj" style=3D"text-=
-decoration:none;font-weight:bold;color:#006699;font-size:13px;font-family:&=
-#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;text-d=
-ecoration:none;font-weight:bold" target=3D"_blank">techAPJ</a><br>
-        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
-t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
-11px">November 28</span>
-      </td>
-    </tr>
-    <tr>
-      <td style=3D"padding-top:5px" colspan=3D"2">
-<p style=3D"margin-top:0;border:0">Test reply.</p>
-
-<p style=3D"margin-top:0;border:0">First paragraph.</p>
-
-<p style=3D"margin-top:0;border:0">Second paragraph.</p>
-</td>
-    </tr>
-  </tbody>
-</table>
-
-
-  <div style=3D"color:#666">
-    <p>To respond, reply to this email or visit <a href=3D"https://meta.dis=
-course.org/t/testing-default-email-replies/22638/3" style=3D"text-decoratio=
-n:none;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https:/=
-/meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your bro=
-wser.</p>
-  </div>
-  <hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-c=
-olor:#ddd;min-height:1px;border:1px">
-  <h4>Previous Replies</h4>
-
-  <table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" b=
-order=3D"0">
-  <tbody>
-    <tr>
-      <td style=3D"vertical-align:top;width:55px">
-        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
-r/meta.discourse.org/codinghorror/45/5297.png" title=3D"codinghorror" style=
-=3D"max-width:100%" width=3D"45" height=3D"45">
-      </td>
-      <td>
-        <a href=3D"https://meta.discourse.org/users/codinghorror" style=3D"=
-text-decoration:none;font-weight:bold;color:#006699;font-size:13px;font-fam=
-ily:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;t=
-ext-decoration:none;font-weight:bold" target=3D"_blank">codinghorror</a><br=
->
-        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
-t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
-11px">November 28</span>
-      </td>
-    </tr>
-    <tr>
-      <td style=3D"padding-top:5px" colspan=3D"2">
-<p style=3D"margin-top:0;border:0">We&#39;re testing the latest GitHub emai=
-l processing library which we are integrating now.</p>
-
-<p style=3D"margin-top:0;border:0"><a href=3D"https://github.com/github/ema=
-il_reply_parser" style=3D"text-decoration:none;font-weight:bold;color:#0066=
-99" target=3D"_blank">https://github.com/github/email_reply_parser</a></p>
-
-<p style=3D"margin-top:0;border:0">Go ahead and reply to this topic and I&#=
-39;ll reply from various email clients for testing.</p>
-</td>
-    </tr>
-  </tbody>
-</table>
-
-
-<hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-col=
-or:#ddd;min-height:1px;border:1px">
-
-<div style=3D"color:#666">
-<p>To respond, reply to this email or visit <a href=3D"https://meta.discour=
-se.org/t/testing-default-email-replies/22638/3" style=3D"text-decoration:no=
-ne;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https://met=
-a.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser=
-.</p>
-</div>
-<div style=3D"color:#666">
-<p>To unsubscribe from these emails, visit your <a href=3D"https://meta.dis=
-course.org/my/preferences" style=3D"text-decoration:none;font-weight:bold;c=
-olor:#006699;color:#666" target=3D"_blank">user preferences</a>.</p>
-</div>
-</div>
-</blockquote></div>
-
---001a1137c9285318bb0508f17bc5--
diff --git a/spec/fixtures/emails/too_many_mentions.eml b/spec/fixtures/emails/too_many_mentions.eml
deleted file mode 100644
index 9cc7b75c94..0000000000
--- a/spec/fixtures/emails/too_many_mentions.eml
+++ /dev/null
@@ -1,31 +0,0 @@
-Return-Path: <jake@adventuretime.ooo>
-Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
-Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 17:03:50 -0400
-Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 14:03:48 -0700
-Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
-Date: Thu, 13 Jun 2013 17:03:48 -0400
-From: Jake the Dog <jake@adventuretime.ooo>
-To: reply+636ca428858779856c226bb145ef4fad@appmail.adventuretime.ooo
-Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
-Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
-Mime-Version: 1.0
-Content-Type: text/plain;
- charset=ISO-8859-1
-Content-Transfer-Encoding: 7bit
-X-Sieve: CMU Sieve 2.2
-X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
- 13 Jun 2013 14:03:48 -0700 (PDT)
-X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
-
-
-@user1
-@user2
-@user3
-@user4
-@user5
-@user6
-@user7
-@user8
-@user9
-@user10
-@user11
\ No newline at end of file
diff --git a/spec/fixtures/emails/valid_incoming.cooked b/spec/fixtures/emails/valid_incoming.cooked
deleted file mode 100644
index 2bf3582537..0000000000
--- a/spec/fixtures/emails/valid_incoming.cooked
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>Hey folks,</p>
-
-<p>I was thinking. Wouldn't it be great if we could post topics via email? Yes it would!</p>
-
-<p>Jakie</p>
diff --git a/spec/fixtures/emails/valid_incoming.eml b/spec/fixtures/emails/valid_incoming.eml
deleted file mode 100644
index 409711ab41..0000000000
--- a/spec/fixtures/emails/valid_incoming.eml
+++ /dev/null
@@ -1,25 +0,0 @@
-Return-Path: <from@example.com>
-Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
-Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <to@example.com>; Thu, 13 Jun 2013 17:03:50 -0400
-Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <to@example.com>; Thu, 13 Jun 2013 14:03:48 -0700
-Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
-Date: Thu, 13 Jun 2013 17:03:48 -0400
-From: Jake the Dog <from@example.com>
-To: <to@example.com>
-Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
-Subject: We should have a post-by-email-feature.
-Mime-Version: 1.0
-Content-Type: text/plain;
- charset=ISO-8859-1
-Content-Transfer-Encoding: 7bit
-X-Sieve: CMU Sieve 2.2
-X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
- 13 Jun 2013 14:03:48 -0700 (PDT)
-X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
-
-Hey folks,
-
-I was thinking. Wouldn't it be great if we could post topics via email? Yes it would!
-
-Jakie
-
diff --git a/spec/fixtures/emails/valid_reply.cooked b/spec/fixtures/emails/valid_reply.cooked
deleted file mode 100644
index 4bce79ad12..0000000000
--- a/spec/fixtures/emails/valid_reply.cooked
+++ /dev/null
@@ -1,4 +0,0 @@
-<p>I could not disagree more. I am obviously biased but adventure time is the
-greatest show ever created. Everyone should watch it.</p>
-
-<ul><li>Jake out</li></ul>
diff --git a/spec/fixtures/emails/via_line.eml b/spec/fixtures/emails/via_line.eml
deleted file mode 100644
index 0b2947ff95..0000000000
--- a/spec/fixtures/emails/via_line.eml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Delivered-To: discourse-reply+cd480e301683c9902891f15968bf07a5@discourse.org
-Received: by 10.194.216.104 with SMTP id op8csp80593wjc;
-        Wed, 24 Jul 2013 07:59:14 -0700 (PDT)
-Return-Path: <walter.white@googlemail.com>
-References: <topic/5043@discourse.org> <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
-From: Walter White <walter.white@googlemail.com>
-In-Reply-To: <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
-Mime-Version: 1.0 (1.0)
-Date: Wed, 24 Jul 2013 15:59:10 +0100
-Message-ID: <4597127794206131679@unknownmsgid>
-Subject: Re: [Discourse] new reply to your post in 'Crystal Blue'
-To: walter via Discourse <reply+cd480e301683c9902891f15968bf07a5@appmail.adventuretime.ooo>
-Content-Type: multipart/alternative; boundary=001a11c20edc15a39304e2432790
-
-Hello this email has content!
-
-codinghorror via Discourse wrote:
-> [codinghorror]  codinghorror
-> <http://meta.discourse.org/users/codinghorror>
-> August 7
->
-> It wouldn't be great at the moment for 100% email, since there's no
-> way to be notified of new topics via email. (you can get notified of
-> new replies to your posts and topics via email, and reply to them.)
diff --git a/spec/lib/gitlab/email/receiver_spec.rb b/spec/lib/gitlab/email/receiver_spec.rb
index 65f3ceb5de..3d434aeaf9 100644
--- a/spec/lib/gitlab/email/receiver_spec.rb
+++ b/spec/lib/gitlab/email/receiver_spec.rb
@@ -31,7 +31,7 @@ describe Gitlab::Email::Receiver do
   end
 
   context "when no sent notificiation for the reply key could be found" do
-    let(:email_raw) { fixture_file('emails/valid_reply.eml').gsub(reply_key, "nope") }
+    let(:email_raw) { fixture_file('emails/wrong_reply_key.eml') }
 
     it "raises a SentNotificationNotFoundError" do
       expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::SentNotificationNotFoundError)

From e1eb09dd0e376768eb73d660b64343d7b3ad8fad Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 12:33:33 -0700
Subject: [PATCH 059/111] Remove more unused fixtures.

---
 spec/fixtures/emails/big5.eml         |  26 -----
 spec/fixtures/emails/bottom_reply.eml | 160 --------------------------
 spec/fixtures/emails/empty.eml        |  21 ----
 spec/fixtures/emails/hebrew.eml       |  17 ---
 spec/fixtures/emails/too_short.eml    |  21 ----
 5 files changed, 245 deletions(-)
 delete mode 100644 spec/fixtures/emails/big5.eml
 delete mode 100644 spec/fixtures/emails/bottom_reply.eml
 delete mode 100644 spec/fixtures/emails/empty.eml
 delete mode 100644 spec/fixtures/emails/hebrew.eml
 delete mode 100644 spec/fixtures/emails/too_short.eml

diff --git a/spec/fixtures/emails/big5.eml b/spec/fixtures/emails/big5.eml
deleted file mode 100644
index 4a7b208248..0000000000
--- a/spec/fixtures/emails/big5.eml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-Delivered-To: discourse-reply+cd480e301683c9902891f15968bf07a5@discourse.org
-Received: by 10.194.216.104 with SMTP id op8csp80593wjc;
-        Wed, 24 Jul 2013 07:59:14 -0700 (PDT)
-Return-Path: <walter.white@googlemail.com>
-References: <topic/5043@discourse.org> <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
-From: Walter White <walter.white@googlemail.com>
-In-Reply-To: <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
-Mime-Version: 1.0 (1.0)
-Date: Wed, 24 Jul 2013 15:59:10 +0100
-Message-ID: <4597127794206131679@unknownmsgid>
-Subject: Re: [Discourse] new reply to your post in 'Crystal Blue'
-To: walter via Discourse <reply+cd480e301683c9902891f15968bf07a5@appmail.adventuretime.ooo>
-Content-Type: multipart/alternative; boundary=20cf301cc47ada510404f040b262
-
---20cf301cc47ada510404f040b262
-Content-Type: text/plain; charset=Big5
-Content-Transfer-Encoding: base64
-
-tv2hSafapFe5cbX4pEahSQ0K
---20cf301cc47ada510404f040b262
-Content-Type: text/html; charset=Big5
-Content-Transfer-Encoding: base64
-
-PGRpdiBkaXI9Imx0ciI+tv2hSafapFe5cbX4pEahSTxicj48L2Rpdj4NCg==
---20cf301cc47ada510404f040b262--
diff --git a/spec/fixtures/emails/bottom_reply.eml b/spec/fixtures/emails/bottom_reply.eml
deleted file mode 100644
index 5fc992971f..0000000000
--- a/spec/fixtures/emails/bottom_reply.eml
+++ /dev/null
@@ -1,160 +0,0 @@
-Received: by 10.107.19.29 with SMTP id b29csp111716ioj;
-        Wed, 30 Jul 2014 17:52:05 -0700 (PDT)
-X-Received: by 10.194.238.6 with SMTP id vg6mr11340975wjc.24.1406767925330;
-        Wed, 30 Jul 2014 17:52:05 -0700 (PDT)
-Received: from localhost (localhost [127.0.0.1])
-	by bendel.debian.org (Postfix) with QMQP
-	id 18F5C417; Thu, 31 Jul 2014 00:52:04 +0000 (UTC)
-Old-Return-Path: <vorlon@debian.org>
-X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on bendel.debian.org
-X-Spam-Level:
-X-Spam-Status: No, score=-25.9 required=4.0 tests=FOURLA,LDOSUBSCRIBER,
-	LDO_WHITELIST,MURPHY_DEBIAN_MESSAGE,PGPSIGNATURE autolearn=unavailable
-	version=3.3.2
-X-Original-To: lists-debian-ctte@bendel.debian.org
-Delivered-To: lists-debian-ctte@bendel.debian.org
-Received: from localhost (localhost [127.0.0.1])
-	by bendel.debian.org (Postfix) with ESMTP id CE6CDEE
-	for <lists-debian-ctte@bendel.debian.org>; Thu, 31 Jul 2014 00:51:52 +0000 (UTC)
-X-Virus-Scanned: at lists.debian.org with policy bank en-lt
-X-Amavis-Spam-Status: No, score=-11.9 tagged_above=-10000 required=5.3
-	tests=[BAYES_00=-2, FOURLA=0.1, LDO_WHITELIST=-5, PGPSIGNATURE=-5]
-	autolearn=ham
-Received: from bendel.debian.org ([127.0.0.1])
-	by localhost (lists.debian.org [127.0.0.1]) (amavisd-new, port 2525)
-	with ESMTP id SB451DwGZCOe for <lists-debian-ctte@bendel.debian.org>;
-	Thu, 31 Jul 2014 00:51:47 +0000 (UTC)
-X-policyd-weight:  NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .debian. - helo: .becquer.dodds. - helo-domain: .dodds.)  FROM/MX_MATCHES_NOT_HELO(DOMAIN)=0; rate: -5
-Received: from becquer.dodds.net (becquer.dodds.net [207.224.24.209])
-	by bendel.debian.org (Postfix) with ESMTP id 8E89A2B4
-	for <debian-ctte@lists.debian.org>; Thu, 31 Jul 2014 00:51:47 +0000 (UTC)
-Received: from virgil.dodds.net (unknown [192.168.15.59])
-	by becquer.dodds.net (Postfix) with ESMTPA id 9B0A9256EB
-	for <debian-ctte@lists.debian.org>; Wed, 30 Jul 2014 17:51:19 -0700 (PDT)
-Received: by virgil.dodds.net (Postfix, from userid 1000)
-	id 942FB60199; Wed, 30 Jul 2014 17:51:15 -0700 (PDT)
-Date: Wed, 30 Jul 2014 17:51:15 -0700
-From: Jake <jake@adventuretime.ooo>
-To: incoming+amazing@appmail.adventuretime.ooo
-Subject: Re: Next Debian CTTE IRC Meeting at date -d'Thu Jul 31 17:00:00 UTC
- 2014'
-Message-ID: <20140731005115.GA19044@virgil.dodds.net>
-Mail-Followup-To: debian-ctte@lists.debian.org
-References: <20140730213924.GA12356@teltox.donarmstrong.com>
-MIME-Version: 1.0
-Content-Type: multipart/signed; micalg=pgp-sha256;
-	protocol="application/pgp-signature"; boundary="qMm9M+Fa2AknHoGS"
-Content-Disposition: inline
-In-Reply-To: <20140730213924.GA12356@teltox.donarmstrong.com>
-User-Agent: Mutt/1.5.23 (2014-03-12)
-X-Debian-Message: Signature check passed for Debian member
-X-Rc-Virus: 2007-09-13_01
-X-Rc-Spam: 2008-11-04_01
-Resent-Message-ID: <c_LGA2C2wUK.A.URD.zMZ2TB@bendel>
-Resent-From: debian-ctte@lists.debian.org
-X-Mailing-List: <debian-ctte@lists.debian.org> archive/latest/4791
-X-Loop: debian-ctte@lists.debian.org
-List-Id: <debian-ctte.lists.debian.org>
-List-Post: <mailto:debian-ctte@lists.debian.org>
-List-Help: <mailto:debian-ctte-request@lists.debian.org?subject=help>
-List-Subscribe: <mailto:debian-ctte-request@lists.debian.org?subject=subscribe>
-List-Unsubscribe: <mailto:debian-ctte-request@lists.debian.org?subject=unsubscribe>
-Precedence: list
-Resent-Sender: debian-ctte-request@lists.debian.org
-Resent-Date: Thu, 31 Jul 2014 00:52:04 +0000 (UTC)
-
-
---qMm9M+Fa2AknHoGS
-Content-Type: text/plain; charset=us-ascii
-Content-Disposition: inline
-Content-Transfer-Encoding: quoted-printable
-
-On Wed, Jul 30, 2014 at 02:39:24PM -0700, Don Armstrong wrote:
-> The next Debian CTTE IRC meeting is at=20
-
-> date -d 'Thu Jul 31 17:00:00 UTC 2014' on irc.debian.org in
-> #debian-ctte.
-
-> The current meeting agenda is here, and more up-to-date ones may be
-> found in the git repository.
-
-> #startmeeting
-
-> #topic Who is here?
-
-> #topic Next Meeting?
-
-> #topic #717076 Decide between libjpeg-turbo and libjpeg8 et al.
-
-This has been voted on; should probably be removed from the agenda, someone
-just needs to confirm the vote results and get it on the website.  (AIUI the
-archive has already begun moving on accordingly.)
-
-> #topic #636783 constitution: super-majority bug
-
-> #topic #636783 constitution: casting vote
-
-> #topic #636783 constitution: minimum discussion period
-
-> #topic #636783 constitution: TC member retirement/rollover
-
-> #topic #636783 constitution: TC chair retirement/rollover
-
-> #topic #681419 Depends: foo | foo-nonfree
-
-> #topic #741573 menu systems and mime-support
-
-> #topic #746715 init system fallout
-
-Also voted and just needs to be confirmed.
-
-> #topic #750135 Maintainer of aptitude package
->=20
-> #topic #752400 Advice on util-linux
-
-This has been closed by mutual agreement of the people involved and doesn't
-require any action from the TC.  Removed from the agenda.
-
-There's also bug #744246, which was assigned to the TC at my request but
-without any preamble so it may have escaped notice.  However, that situation
-has been evolving constructively among the related parties (apparently, an
-informal comment from a member of the release team was mistaken for a
-release team position, so that's now being revisited), so I don't believe
-this is anything we need to put on the agenda for tomorrow despite being on
-the open bug list.
-
---=20
-Steve Langasek                   Give me a lever long enough and a Free OS
-Debian Developer                   to set it on, and I can move the world.
-Ubuntu Developer                                    http://www.debian.org/
-slangasek@ubuntu.com                                     vorlon@debian.org
-
---qMm9M+Fa2AknHoGS
-Content-Type: application/pgp-signature; name="signature.asc"
-Content-Description: Digital signature
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAEBCAAGBQJT2ZMDAAoJEFaNMPMhshM9GLsP/244S3wtYZEeVgJWIdB5PE0A
-sZVezEA692y++/0oVZVecwV67yBOyfSjPPetdAph2UDMRtfurwxfj2BkbOFA2+Y6
-++MErbmC3V7IGpd/L/fFGdXgvMQT2MNBpw0fnMA7bLpNjCvoj+Hr1HXRUcWoJSlj
-WmHWwWSTVRcHg8a3iWYJzY6XfLyEEgHlahrlKvJExsTx/9mc1qg7g8KGdnhzHFBl
-ttdH2fxpAk/624dReCcw5RKmOLfZ1HsEl9XcVe1cb4K+MDaQiXmoEK5v3xaNz1tS
-NK5v2D5gDs229zoxKzQnnzOPLHxqI5E0L9PpI/mu4T9z7H2bHR3U5BvhnT99t5uw
-ydf2cZNGY0uFCV3Rvn07BfAIW5WSXhOfN/5IymRKmdhjsTiwZ/wFjFrK8tVjtERu
-yeyA7RIYiblGCEKYIYLWSxhoXeEdmAdfp6EA2/IA1CpgMB+ZdSfaeMgFY7xosgmG
-ax3NTnaKyhr1QEUJ2gjAwHnKjuGbRVDAinYrSvP0o8Bh9sAs2BN2negWBCZVwwkN
-S9hWTjVqsBmpaPOt5SEDwDo9O9dfzkmaamDsxOuUEz9F7v5jYg0mxA/WbogGty9R
-vOMKxdxRkzflL/CferVbkzL/EkZRDfWDp9SleZggrpz7miiNDbS7jdRzJ4EttmJ8
-gHBAVrOzcnbIPOIkk9pw
-=KXIu
------END PGP SIGNATURE-----
-
---qMm9M+Fa2AknHoGS--
-
-
---
-To UNSUBSCRIBE, email to debian-ctte-REQUEST@lists.debian.org
-with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
-Archive: https://lists.debian.org/20140731005115.GA19044@virgil.dodds.net
diff --git a/spec/fixtures/emails/empty.eml b/spec/fixtures/emails/empty.eml
deleted file mode 100644
index 85bebc6624..0000000000
--- a/spec/fixtures/emails/empty.eml
+++ /dev/null
@@ -1,21 +0,0 @@
-Return-Path: <jake@adventuretime.ooo>
-Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
-Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 17:03:50 -0400
-Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 14:03:48 -0700
-Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
-Date: Thu, 13 Jun 2013 17:03:48 -0400
-From: Jake the Dog <jake@adventuretime.ooo>
-To: reply+59d8df8370b7e95c5a49fbf86aeb2c93@appmail.adventuretime.ooo
-Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
-Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
-Mime-Version: 1.0
-Content-Type: text/plain;
- charset=ISO-8859-1
-Content-Transfer-Encoding: 7bit
-X-Sieve: CMU Sieve 2.2
-X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
- 13 Jun 2013 14:03:48 -0700 (PDT)
-X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
-
-
-
diff --git a/spec/fixtures/emails/hebrew.eml b/spec/fixtures/emails/hebrew.eml
deleted file mode 100644
index f4c8f01adc..0000000000
--- a/spec/fixtures/emails/hebrew.eml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-Delivered-To: discourse-reply+cd480e301683c9902891f15968bf07a5@discourse.org
-Received: by 10.194.216.104 with SMTP id op8csp80593wjc;
-        Wed, 24 Jul 2013 07:59:14 -0700 (PDT)
-Return-Path: <walter.white@googlemail.com>
-References: <topic/5043@discourse.org> <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
-From: Walter White <walter.white@googlemail.com>
-In-Reply-To: <51efeb9b36c34_66dc2dfce6811866@discourse.mail>
-Mime-Version: 1.0 (1.0)
-Date: Wed, 24 Jul 2013 15:59:10 +0100
-Message-ID: <4597127794206131679@unknownmsgid>
-Subject: Re: [Discourse] new reply to your post in 'Crystal Blue'
-To: walter via Discourse <reply+cd480e301683c9902891f15968bf07a5@appmail.adventuretime.ooo>
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: base64
-
-16nXnNeV150=
\ No newline at end of file
diff --git a/spec/fixtures/emails/too_short.eml b/spec/fixtures/emails/too_short.eml
deleted file mode 100644
index 54fed0f98c..0000000000
--- a/spec/fixtures/emails/too_short.eml
+++ /dev/null
@@ -1,21 +0,0 @@
-Return-Path: <jake@adventuretime.ooo>
-Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
-Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 17:03:50 -0400
-Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 14:03:48 -0700
-Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
-Date: Thu, 13 Jun 2013 17:03:48 -0400
-From: Jake the Dog <FROM>
-To: TO
-Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
-Subject: SUBJECT
-Mime-Version: 1.0
-Content-Type: text/plain;
- charset=ISO-8859-1
-Content-Transfer-Encoding: 7bit
-X-Sieve: CMU Sieve 2.2
-X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
- 13 Jun 2013 14:03:48 -0700 (PDT)
-X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
-
-
-+1
\ No newline at end of file

From ac268674edfdaa5b8232f9875481410fc5112f60 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 12:34:45 -0700
Subject: [PATCH 060/111] Update spec.

---
 spec/workers/email_receiver_worker_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/workers/email_receiver_worker_spec.rb b/spec/workers/email_receiver_worker_spec.rb
index 109a7b3eb1..e0081904db 100644
--- a/spec/workers/email_receiver_worker_spec.rb
+++ b/spec/workers/email_receiver_worker_spec.rb
@@ -7,7 +7,7 @@ describe EmailReceiverWorker do
     File.read(file_path)
   end
 
-  let(:raw_message) { fixture_file('emails/valid_incoming.eml') }
+  let(:raw_message) { fixture_file('emails/valid_reply.eml') }
 
   context "when reply by email is enabled" do
     before do
@@ -31,7 +31,7 @@ describe EmailReceiverWorker do
 
         email = ActionMailer::Base.deliveries.last
         expect(email).not_to be_nil
-        expect(email.to).to eq(["from@example.com"])
+        expect(email.to).to eq(["jake@adventuretime.ooo"])
         expect(email.subject).to include("Rejected")
       end
     end

From 54b04f1c5b6c486a67c654ee9987e5f5ec4501fd Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 12:41:47 -0700
Subject: [PATCH 061/111] Add fixture_file helper.

---
 spec/lib/gitlab/email/attachment_uploader_spec.rb   |  8 +-------
 spec/lib/gitlab/email/receiver_spec.rb              |  6 ------
 spec/lib/gitlab/email/reply_parser_spec.rb          |  6 ------
 spec/lib/gitlab/google_code_import/client_spec.rb   |  2 +-
 spec/lib/gitlab/google_code_import/importer_spec.rb |  2 +-
 spec/support/fixture_helpers.rb                     | 11 +++++++++++
 spec/support/markdown_feature.rb                    |  4 ++--
 spec/workers/email_receiver_worker_spec.rb          |  6 ------
 8 files changed, 16 insertions(+), 29 deletions(-)
 create mode 100644 spec/support/fixture_helpers.rb

diff --git a/spec/lib/gitlab/email/attachment_uploader_spec.rb b/spec/lib/gitlab/email/attachment_uploader_spec.rb
index b54ee8aa72..e8208e15e2 100644
--- a/spec/lib/gitlab/email/attachment_uploader_spec.rb
+++ b/spec/lib/gitlab/email/attachment_uploader_spec.rb
@@ -1,18 +1,12 @@
 require "spec_helper"
 
 describe Gitlab::Email::AttachmentUploader do
-  def fixture_file(filename)
-    return '' if filename.blank?
-    file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
-    File.read(file_path)
-  end
-
   describe "#execute" do
     let(:project) { build(:project) }
     let(:message_raw) { fixture_file("emails/attachment.eml") }
     let(:message) { Mail::Message.new(message_raw) }
 
-    it "creates a post with an attachment" do
+    it "uploads all attachments and returns their links" do
       links = described_class.new(message).execute(project)
       link = links.first
 
diff --git a/spec/lib/gitlab/email/receiver_spec.rb b/spec/lib/gitlab/email/receiver_spec.rb
index 3d434aeaf9..a6f682a271 100644
--- a/spec/lib/gitlab/email/receiver_spec.rb
+++ b/spec/lib/gitlab/email/receiver_spec.rb
@@ -1,12 +1,6 @@
 require "spec_helper"
 
 describe Gitlab::Email::Receiver do
-  def fixture_file(filename)
-    return '' if filename.blank?
-    file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
-    File.read(file_path)
-  end
-
   before do
     allow(Gitlab.config.reply_by_email).to receive(:enabled).and_return(true)
     allow(Gitlab.config.reply_by_email).to receive(:address).and_return("reply+%{reply_key}@appmail.adventuretime.ooo")
diff --git a/spec/lib/gitlab/email/reply_parser_spec.rb b/spec/lib/gitlab/email/reply_parser_spec.rb
index 32120d56cb..c552e632ce 100644
--- a/spec/lib/gitlab/email/reply_parser_spec.rb
+++ b/spec/lib/gitlab/email/reply_parser_spec.rb
@@ -2,12 +2,6 @@ require "spec_helper"
 
 # Inspired in great part by Discourse's Email::Receiver
 describe Gitlab::Email::ReplyParser do
-  def fixture_file(filename)
-    return '' if filename.blank?
-    file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
-    File.read(file_path)
-  end
-
   describe '#execute' do
     def test_parse_body(mail_string)
       described_class.new(Mail::Message.new(mail_string)).execute
diff --git a/spec/lib/gitlab/google_code_import/client_spec.rb b/spec/lib/gitlab/google_code_import/client_spec.rb
index 6aa4428f36..37985c062b 100644
--- a/spec/lib/gitlab/google_code_import/client_spec.rb
+++ b/spec/lib/gitlab/google_code_import/client_spec.rb
@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Gitlab::GoogleCodeImport::Client do
-  let(:raw_data) { JSON.parse(File.read(Rails.root.join("spec/fixtures/GoogleCodeProjectHosting.json"))) }
+  let(:raw_data) { JSON.parse(fixture_file("GoogleCodeProjectHosting.json")) }
   subject { described_class.new(raw_data) }
 
   describe "#valid?" do
diff --git a/spec/lib/gitlab/google_code_import/importer_spec.rb b/spec/lib/gitlab/google_code_import/importer_spec.rb
index f49cbb7f53..65ad7524cc 100644
--- a/spec/lib/gitlab/google_code_import/importer_spec.rb
+++ b/spec/lib/gitlab/google_code_import/importer_spec.rb
@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Gitlab::GoogleCodeImport::Importer do
   let(:mapped_user) { create(:user, username: "thilo123") }
-  let(:raw_data) { JSON.parse(File.read(Rails.root.join("spec/fixtures/GoogleCodeProjectHosting.json"))) }
+  let(:raw_data) { JSON.parse(fixture_file("GoogleCodeProjectHosting.json")) }
   let(:client) { Gitlab::GoogleCodeImport::Client.new(raw_data) }
   let(:import_data) do
     {
diff --git a/spec/support/fixture_helpers.rb b/spec/support/fixture_helpers.rb
new file mode 100644
index 0000000000..a05c9d1800
--- /dev/null
+++ b/spec/support/fixture_helpers.rb
@@ -0,0 +1,11 @@
+module FixtureHelpers
+  def fixture_file(filename)
+    return '' if filename.blank?
+    file_path = File.expand_path(Rails.root.join('spec/fixtures/', filename))
+    File.read(file_path)
+  end
+end
+
+RSpec.configure do |config|
+  config.include FixtureHelpers
+end
diff --git a/spec/support/markdown_feature.rb b/spec/support/markdown_feature.rb
index c59df4e84d..f8b2ce03e6 100644
--- a/spec/support/markdown_feature.rb
+++ b/spec/support/markdown_feature.rb
@@ -100,7 +100,7 @@ class MarkdownFeature
   end
 
   def raw_markdown
-    fixture = Rails.root.join('spec/fixtures/markdown.md.erb')
-    ERB.new(File.read(fixture)).result(binding)
+    markdown = fixture_file('markdown.md.erb')
+    ERB.new(markdown).result(binding)
   end
 end
diff --git a/spec/workers/email_receiver_worker_spec.rb b/spec/workers/email_receiver_worker_spec.rb
index e0081904db..e8f1bd2fa2 100644
--- a/spec/workers/email_receiver_worker_spec.rb
+++ b/spec/workers/email_receiver_worker_spec.rb
@@ -1,12 +1,6 @@
 require "spec_helper"
 
 describe EmailReceiverWorker do
-  def fixture_file(filename)
-    return '' if filename.blank?
-    file_path = File.expand_path(Rails.root + 'spec/fixtures/' + filename)
-    File.read(file_path)
-  end
-
   let(:raw_message) { fixture_file('emails/valid_reply.eml') }
 
   context "when reply by email is enabled" do

From 6110e175dc3bcf6d9ef416c7b95696efe509d02b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 13:10:55 -0700
Subject: [PATCH 062/111] Use heredocs.

---
 spec/fixtures/emails/iphone_signature.eml  |  29 ---
 spec/lib/gitlab/email/reply_parser_spec.rb | 198 +++++++++++----------
 2 files changed, 105 insertions(+), 122 deletions(-)
 delete mode 100644 spec/fixtures/emails/iphone_signature.eml

diff --git a/spec/fixtures/emails/iphone_signature.eml b/spec/fixtures/emails/iphone_signature.eml
deleted file mode 100644
index d314ad1f1e..0000000000
--- a/spec/fixtures/emails/iphone_signature.eml
+++ /dev/null
@@ -1,29 +0,0 @@
-Delivered-To: test@mail.com
-Return-Path: <walter.white@googlemail.com>
-From: Walter White <walter.white@googlemail.com>
-Content-Type: multipart/alternative;
-  boundary=Apple-Mail-8E182EEF-9DBC-41DE-A593-DF2E5EBD3975
-Content-Transfer-Encoding: 7bit
-Mime-Version: 1.0 (1.0)
-Subject: Re: Signature in email replies!
-Date: Thu, 23 Oct 2014 14:43:49 +0530
-References: <1234@mail.gmail.com>
-In-Reply-To: <1234@mail.gmail.com>
-To: Arpit Jalan <test@mail.com>
-X-Mailer: iPhone Mail (12A405)
-
-
---Apple-Mail-8E182EEF-9DBC-41DE-A593-DF2E5EBD3975
-Content-Type: text/plain;
-  charset=us-ascii
-Content-Transfer-Encoding: 7bit
-
-This post should not include signature.
-
-Sent from my iPhone
-
-> On 23-Oct-2014, at 9:45 am, Arpit Jalan <test@mail.com> wrote:
->
-> Signature in email replies!
-
---Apple-Mail-8E182EEF-9DBC-41DE-A593-DF2E5EBD3975
diff --git a/spec/lib/gitlab/email/reply_parser_spec.rb b/spec/lib/gitlab/email/reply_parser_spec.rb
index c552e632ce..a94c92ad53 100644
--- a/spec/lib/gitlab/email/reply_parser_spec.rb
+++ b/spec/lib/gitlab/email/reply_parser_spec.rb
@@ -34,148 +34,160 @@ describe Gitlab::Email::ReplyParser do
 
     it "handles multiple paragraphs" do
       expect(test_parse_body(fixture_file("emails/paragraphs.eml"))).
-          to eq(
-"Is there any reason the *old* candy can't be be kept in silos while the new candy
-is imported into *new* silos?
+        to eq(
+          <<-BODY.strip_heredoc.chomp
+            Is there any reason the *old* candy can't be be kept in silos while the new candy
+            is imported into *new* silos?
 
-The thing about candy is it stays delicious for a long time -- we can just keep
-it there without worrying about it too much, imo.
+            The thing about candy is it stays delicious for a long time -- we can just keep
+            it there without worrying about it too much, imo.
 
-Thanks for listening."
-      )
+            Thanks for listening.
+          BODY
+        )
     end
 
     it "handles multiple paragraphs when parsing html" do
       expect(test_parse_body(fixture_file("emails/html_paragraphs.eml"))).
-          to eq(
-"Awesome!
+        to eq(
+          <<-BODY.strip_heredoc.chomp
+            Awesome!
 
-Pleasure to have you here!
+            Pleasure to have you here!
 
-:boom:"
-      )
+            :boom:
+          BODY
+        )
     end
 
     it "handles newlines" do
       expect(test_parse_body(fixture_file("emails/newlines.eml"))).
-          to eq(
-"This is my reply.
-It is my best reply.
-It will also be my *only* reply."
-      )
+        to eq(
+          <<-BODY.strip_heredoc.chomp
+            This is my reply.
+            It is my best reply.
+            It will also be my *only* reply.
+          BODY
+        )
     end
 
     it "handles inline reply" do
       expect(test_parse_body(fixture_file("emails/inline_reply.eml"))).
-          to eq(
-"On Wed, Oct 8, 2014 at 11:12 AM, techAPJ <info@unconfigured.discourse.org> wrote:
+        to eq(
+          <<-BODY.strip_heredoc.chomp
+            On Wed, Oct 8, 2014 at 11:12 AM, techAPJ <info@unconfigured.discourse.org> wrote:
 
->     techAPJ <https://meta.discourse.org/users/techapj>
-> November 28
->
-> Test reply.
->
-> First paragraph.
->
-> Second paragraph.
->
-> To respond, reply to this email or visit
-> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
-> your browser.
->  ------------------------------
-> Previous Replies    codinghorror
-> <https://meta.discourse.org/users/codinghorror>
-> November 28
->
-> We're testing the latest GitHub email processing library which we are
-> integrating now.
->
-> https://github.com/github/email_reply_parser
->
-> Go ahead and reply to this topic and I'll reply from various email clients
-> for testing.
->   ------------------------------
->
-> To respond, reply to this email or visit
-> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
-> your browser.
->
-> To unsubscribe from these emails, visit your user preferences
-> <https://meta.discourse.org/my/preferences>.
->
+            >     techAPJ <https://meta.discourse.org/users/techapj>
+            > November 28
+            >
+            > Test reply.
+            >
+            > First paragraph.
+            >
+            > Second paragraph.
+            >
+            > To respond, reply to this email or visit
+            > https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+            > your browser.
+            >  ------------------------------
+            > Previous Replies    codinghorror
+            > <https://meta.discourse.org/users/codinghorror>
+            > November 28
+            >
+            > We're testing the latest GitHub email processing library which we are
+            > integrating now.
+            >
+            > https://github.com/github/email_reply_parser
+            >
+            > Go ahead and reply to this topic and I'll reply from various email clients
+            > for testing.
+            >   ------------------------------
+            >
+            > To respond, reply to this email or visit
+            > https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+            > your browser.
+            >
+            > To unsubscribe from these emails, visit your user preferences
+            > <https://meta.discourse.org/my/preferences>.
+            >
 
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
-fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog."
-      )
-    end
-
-    it "strips iPhone signature" do
-      expect(test_parse_body(fixture_file("emails/iphone_signature.eml"))).not_to match /Sent from my iPhone/
+            The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+            the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+            fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+            The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+            the lazy dog. The quick brown fox jumps over the lazy dog.
+          BODY
+        )
     end
 
     it "properly renders email reply from gmail web client" do
       expect(test_parse_body(fixture_file("emails/gmail_web.eml"))).
-          to eq(
-"### This is a reply from standard GMail in Google Chrome.
+        to eq(
+          <<-BODY.strip_heredoc.chomp
+            ### This is a reply from standard GMail in Google Chrome.
 
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
-fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog.
+            The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+            the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+            fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+            The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+            the lazy dog. The quick brown fox jumps over the lazy dog.
 
-Here's some **bold** text in Markdown.
+            Here's some **bold** text in Markdown.
 
-Here's a link http://example.com"
-      )
+            Here's a link http://example.com
+          BODY
+        )
     end
 
     it "properly renders email reply from iOS default mail client" do
       expect(test_parse_body(fixture_file("emails/ios_default.eml"))).
-          to eq(
-"### this is a reply from iOS default mail
+        to eq(
+          <<-BODY.strip_heredoc.chomp
+            ### this is a reply from iOS default mail
 
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+            The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
 
-Here's some **bold** markdown text.
+            Here's some **bold** markdown text.
 
-Here's a link http://example.com"
-      )
+            Here's a link http://example.com
+          BODY
+        )
     end
 
     it "properly renders email reply from Android 5 gmail client" do
       expect(test_parse_body(fixture_file("emails/android_gmail.eml"))).
-          to eq(
-"### this is a reply from Android 5 gmail
+        to eq(
+          <<-BODY.strip_heredoc.chomp
+            ### this is a reply from Android 5 gmail
 
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
-the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
-fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
-The quick brown fox jumps over the lazy dog.
+            The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+            the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+            fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+            The quick brown fox jumps over the lazy dog.
 
-This is **bold** in Markdown.
+            This is **bold** in Markdown.
 
-This is a link to http://example.com"
-      )
+            This is a link to http://example.com
+          BODY
+        )
     end
 
     it "properly renders email reply from Windows 8.1 Metro default mail client" do
       expect(test_parse_body(fixture_file("emails/windows_8_metro.eml"))).
-          to eq(
-"### reply from default mail client in Windows 8.1 Metro
+        to eq(
+          <<-BODY.strip_heredoc.chomp
+            ### reply from default mail client in Windows 8.1 Metro
 
 
-The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+            The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
 
 
-This is a **bold** word in Markdown
+            This is a **bold** word in Markdown
 
 
-This is a link http://example.com"
-      )
+            This is a link http://example.com
+          BODY
+        )
     end
 
     it "properly renders email reply from MS Outlook client" do

From 48e25a019a7dacbadeb3a49ed96e41d2c2241feb Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 13:21:22 -0700
Subject: [PATCH 063/111] Add stub_reply_by_email_setting helper.

---
 spec/lib/gitlab/email/receiver_spec.rb |  3 +--
 spec/lib/gitlab/reply_by_email_spec.rb | 12 ++++++------
 spec/support/stub_configuration.rb     |  4 ++++
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/spec/lib/gitlab/email/receiver_spec.rb b/spec/lib/gitlab/email/receiver_spec.rb
index a6f682a271..af44c1242e 100644
--- a/spec/lib/gitlab/email/receiver_spec.rb
+++ b/spec/lib/gitlab/email/receiver_spec.rb
@@ -2,8 +2,7 @@ require "spec_helper"
 
 describe Gitlab::Email::Receiver do
   before do
-    allow(Gitlab.config.reply_by_email).to receive(:enabled).and_return(true)
-    allow(Gitlab.config.reply_by_email).to receive(:address).and_return("reply+%{reply_key}@appmail.adventuretime.ooo")
+    stub_reply_by_email_setting(enabled: true, address: "reply+%{reply_key}@appmail.adventuretime.ooo")
   end
 
   let(:reply_key) { "59d8df8370b7e95c5a49fbf86aeb2c93" }
diff --git a/spec/lib/gitlab/reply_by_email_spec.rb b/spec/lib/gitlab/reply_by_email_spec.rb
index a52af51e97..a678c7e1a7 100644
--- a/spec/lib/gitlab/reply_by_email_spec.rb
+++ b/spec/lib/gitlab/reply_by_email_spec.rb
@@ -4,12 +4,12 @@ describe Gitlab::ReplyByEmail do
   describe "self.enabled?" do
     context "when reply by email is enabled" do
       before do
-        allow(Gitlab.config.reply_by_email).to receive(:enabled).and_return(true)
+        stub_reply_by_email_setting(enabled: true)
       end
 
       context "when the address is valid" do
         before do
-          allow(Gitlab.config.reply_by_email).to receive(:address).and_return("replies+%{reply_key}@example.com")
+          stub_reply_by_email_setting(address: "replies+%{reply_key}@example.com")
         end
 
         it "returns true" do
@@ -19,7 +19,7 @@ describe Gitlab::ReplyByEmail do
 
       context "when the address is invalid" do
         before do
-          allow(Gitlab.config.reply_by_email).to receive(:address).and_return("replies@example.com")
+          stub_reply_by_email_setting(address: "replies@example.com")
         end
 
         it "returns false" do
@@ -30,7 +30,7 @@ describe Gitlab::ReplyByEmail do
 
     context "when reply by email is disabled" do
       before do
-        allow(Gitlab.config.reply_by_email).to receive(:enabled).and_return(false)
+        stub_reply_by_email_setting(enabled: false)
       end
 
       it "returns false" do
@@ -66,7 +66,7 @@ describe Gitlab::ReplyByEmail do
 
   context "self.reply_address" do
     before do
-      allow(Gitlab.config.reply_by_email).to receive(:address).and_return("replies+%{reply_key}@example.com")
+      stub_reply_by_email_setting(address: "replies+%{reply_key}@example.com")
     end
 
     it "returns the address with an interpolated reply key" do
@@ -76,7 +76,7 @@ describe Gitlab::ReplyByEmail do
 
   context "self.reply_key_from_address" do
     before do
-      allow(Gitlab.config.reply_by_email).to receive(:address).and_return("replies+%{reply_key}@example.com")
+      stub_reply_by_email_setting(address: "replies+%{reply_key}@example.com")
     end
 
     it "returns reply key" do
diff --git a/spec/support/stub_configuration.rb b/spec/support/stub_configuration.rb
index e4004ec8f7..ef3a120d44 100644
--- a/spec/support/stub_configuration.rb
+++ b/spec/support/stub_configuration.rb
@@ -17,6 +17,10 @@ module StubConfiguration
     allow(Gitlab.config.gravatar).to receive_messages(messages)
   end
 
+  def stub_reply_by_email_setting(messages)
+    allow(Gitlab.config.reply_by_email).to receive_messages(messages)
+  end
+
   private
 
   # Modifies stubbed messages to also stub possible predicate versions

From 123af7856167f01ac0a7873bca1ef2cbb835e3b5 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 14:03:04 -0700
Subject: [PATCH 064/111] Add gitlab:reply_by_email:check rake task.

---
 doc/reply_by_email/README.md |   6 ++
 lib/gitlab/reply_by_email.rb |   9 ++-
 lib/tasks/gitlab/check.rake  | 145 +++++++++++++++++++++++++++++++++++
 3 files changed, 157 insertions(+), 3 deletions(-)

diff --git a/doc/reply_by_email/README.md b/doc/reply_by_email/README.md
index e168e9a17e..1a0ce79bc5 100644
--- a/doc/reply_by_email/README.md
+++ b/doc/reply_by_email/README.md
@@ -93,6 +93,12 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`. If you'
     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`.
diff --git a/lib/gitlab/reply_by_email.rb b/lib/gitlab/reply_by_email.rb
index b6157de361..61d048fd20 100644
--- a/lib/gitlab/reply_by_email.rb
+++ b/lib/gitlab/reply_by_email.rb
@@ -2,9 +2,12 @@ module Gitlab
   module ReplyByEmail
     class << self
       def enabled?
-        config.enabled &&
-          config.address &&
-          config.address.include?("%{reply_key}")
+        config.enabled && address_formatted_correctly?
+      end
+
+      def address_formatted_correctly?
+        config.address &&
+        config.address.include?("%{reply_key}")
       end
 
       def reply_key
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 80ee572938..608253d916 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -2,6 +2,7 @@ namespace :gitlab do
   desc "GitLab | Check the configuration of GitLab and its environment"
   task check: %w{gitlab:gitlab_shell:check
                  gitlab:sidekiq:check
+                 gitlab:reply_by_email:check
                  gitlab:ldap:check
                  gitlab:app:check}
 
@@ -577,6 +578,150 @@ namespace :gitlab do
     end
   end
 
+
+  namespace :reply_by_email do
+    desc "GitLab | Check the configuration of Reply by email"
+    task check: :environment  do
+      warn_user_is_not_gitlab
+      start_checking "Reply by email"
+
+      if Gitlab.config.reply_by_email.enabled
+        check_address_formatted_correctly
+        check_mail_room_config_exists
+        check_imap_authentication
+        check_initd_configured_correctly
+        check_mail_room_running
+      else
+        puts 'Reply by email is disabled in config/gitlab.yml'
+      end
+
+      finished_checking "Reply by email"
+    end
+
+
+    # Checks
+    ########################
+
+    def check_address_formatted_correctly
+      print "Address formatted correctly? ... "
+
+      if Gitlab::ReplyByEmail.address_formatted_correctly?
+        puts "yes".green
+      else
+        puts "no".red
+        try_fixing_it(
+          "Make sure that the address in config/gitlab.yml includes the '%{reply_key}' placeholder."
+        )
+        fix_and_rerun
+      end
+    end
+
+    def check_initd_configured_correctly
+      print "Init.d configured correctly? ... "
+
+      path = "/etc/default/gitlab"
+
+      if File.exist?(path) && File.read(path).include?("mail_room_enabled=true")
+        puts "yes".green
+      else
+        puts "no".red
+        try_fixing_it(
+          "Enable mail_room in the init.d configuration."
+        )
+        for_more_information(
+          "doc/reply_by_email/README.md"
+        )
+        fix_and_rerun
+      end
+    end
+
+    def check_mail_room_running
+      print "MailRoom running? ... "
+
+      path = "/etc/default/gitlab"
+
+      unless File.exist?(path) && File.read(path).include?("mail_room_enabled=true")
+        puts "can't check because of previous errors".magenta
+        return
+      end
+
+      if mail_room_process_count > 0
+        puts "yes".green
+      else
+        puts "no".red
+        try_fixing_it(
+          sudo_gitlab("RAILS_ENV=production bin/mail_room start")
+        )
+        for_more_information(
+          see_installation_guide_section("Install Init Script"),
+          "see log/mail_room.log for possible errors"
+        )
+        fix_and_rerun
+      end
+    end
+
+    def check_mail_room_config_exists
+      print "MailRoom config exists? ... "
+
+      mail_room_config_file = Rails.root.join("config", "mail_room.yml")
+
+      if File.exists?(mail_room_config_file)
+        puts "yes".green
+      else
+        puts "no".red
+        try_fixing_it(
+          "Copy config/mail_room.yml.example to config/mail_room.yml",
+          "Check that the information in config/mail_room.yml is correct"
+        )
+        for_more_information(
+          "doc/reply_by_email/README.md"
+        )
+        fix_and_rerun
+      end
+    end
+
+    def check_imap_authentication
+      print "IMAP server credentials are correct? ... "
+
+      mail_room_config_file = Rails.root.join("config", "mail_room.yml")
+
+      unless File.exists?(mail_room_config_file)
+        puts "can't check because of previous errors".magenta
+        return
+      end
+
+      config = YAML.load_file(mail_room_config_file)[:mailboxes].first rescue nil
+
+      if config
+        begin
+          imap = Net::IMAP.new(config[:host], port: config[:port], ssl: config[:ssl])
+          imap.login(config[:email], config[:password])
+          connected = true
+        rescue
+          connected = false
+        end
+      end
+
+      if connected
+        puts "yes".green
+      else
+        puts "no".red
+        try_fixing_it(
+          "Check that the information in config/mail_room.yml is correct"
+        )
+        for_more_information(
+          "doc/reply_by_email/README.md"
+        )
+        fix_and_rerun
+      end
+    end
+
+    def mail_room_process_count
+      ps_ux, _ = Gitlab::Popen.popen(%W(ps ux))
+      ps_ux.scan(/mail_room \d+\.\d+\.\d+/).count
+    end
+  end
+
   namespace :ldap do
     task :check, [:limit] => :environment do |t, args|
       # Only show up to 100 results because LDAP directories can be very big.

From 02b7be4a6847c0f79c6088edcc84600008ba0c1e Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 14:03:09 -0700
Subject: [PATCH 065/111] Remove weirdness.

---
 app/helpers/icons_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index 30b17a736a..1cf5b96481 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -20,7 +20,7 @@ module IconsHelper
   end
 
   def boolean_to_icon(value)
-    if value.to_s == "true"
+    if value
       icon('circle', class: 'cgreen')
     else
       icon('power-off', class: 'clgray')

From 41ed60c21a34f5a413c45d2d303e28b438a09ef2 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 14:09:37 -0700
Subject: [PATCH 066/111] Fix MailRoom running check.

---
 lib/tasks/gitlab/check.rake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 608253d916..3fbd429ef8 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -645,7 +645,7 @@ namespace :gitlab do
         return
       end
 
-      if mail_room_process_count > 0
+      if mail_room_running?
         puts "yes".green
       else
         puts "no".red
@@ -716,9 +716,9 @@ namespace :gitlab do
       end
     end
 
-    def mail_room_process_count
+    def mail_room_running?
       ps_ux, _ = Gitlab::Popen.popen(%W(ps ux))
-      ps_ux.scan(/mail_room \d+\.\d+\.\d+/).count
+      ps_ux.include?("mail_room")
     end
   end
 

From f26c2905d198436ea4c4b7f26c6971edd4ff8049 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 14:25:56 -0700
Subject: [PATCH 067/111] Fix indentation

---
 lib/gitlab/email/reply_parser.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb
index 6ceb755968..6e768e46a7 100644
--- a/lib/gitlab/email/reply_parser.rb
+++ b/lib/gitlab/email/reply_parser.rb
@@ -72,8 +72,8 @@ module Gitlab
 
         lines.each_with_index do |l, idx|
           # This one might be controversial but so many reply lines have years, times and end with a colon.
-         # Let's try it and see how well it works.
-         break if (l =~ /\d{4}/ && l =~ /\d:\d\d/ && l =~ /\:$/) ||
+          # Let's try it and see how well it works.
+          break if (l =~ /\d{4}/ && l =~ /\d:\d\d/ && l =~ /\:$/) ||
                    (l =~ /On \w+ \d+,? \d+,?.*wrote:/)
 
           # Headers on subsequent lines

From 99ef8c81598ad31922dfbe28c0c56130e01bd13a Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 15:37:43 -0700
Subject: [PATCH 068/111] Fix markdown specs.

---
 lib/gitlab/reply_by_email.rb     | 2 +-
 spec/support/markdown_feature.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/reply_by_email.rb b/lib/gitlab/reply_by_email.rb
index 61d048fd20..4fdeb6b8a7 100644
--- a/lib/gitlab/reply_by_email.rb
+++ b/lib/gitlab/reply_by_email.rb
@@ -7,7 +7,7 @@ module Gitlab
 
       def address_formatted_correctly?
         config.address &&
-        config.address.include?("%{reply_key}")
+          config.address.include?("%{reply_key}")
       end
 
       def reply_key
diff --git a/spec/support/markdown_feature.rb b/spec/support/markdown_feature.rb
index f8b2ce03e6..cb47d29082 100644
--- a/spec/support/markdown_feature.rb
+++ b/spec/support/markdown_feature.rb
@@ -9,6 +9,7 @@
 # reference to the factory-created objects.
 class MarkdownFeature
   include FactoryGirl::Syntax::Methods
+  include FixtureHelpers
 
   def user
     @user ||= create(:user)

From afb765ad9ef6fd394a9709f6ab519267a761e6ad Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 15:41:34 -0700
Subject: [PATCH 069/111] Fix markdown specs again. Apparently development and
 test behave differently.

---
 spec/support/markdown_feature.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/support/markdown_feature.rb b/spec/support/markdown_feature.rb
index cb47d29082..39a6439146 100644
--- a/spec/support/markdown_feature.rb
+++ b/spec/support/markdown_feature.rb
@@ -9,7 +9,6 @@
 # reference to the factory-created objects.
 class MarkdownFeature
   include FactoryGirl::Syntax::Methods
-  include FixtureHelpers
 
   def user
     @user ||= create(:user)
@@ -101,7 +100,7 @@ class MarkdownFeature
   end
 
   def raw_markdown
-    markdown = fixture_file('markdown.md.erb')
+    markdown = File.read(Rails.root.join('spec/fixtures/markdown.md.erb'))
     ERB.new(markdown).result(binding)
   end
 end

From 3d141d1512a39b61159026457b31c6f0aecf5b6c Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 16:21:31 -0700
Subject: [PATCH 070/111] Fix spec by removing global state.

---
 lib/gitlab/reply_by_email.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/lib/gitlab/reply_by_email.rb b/lib/gitlab/reply_by_email.rb
index 4fdeb6b8a7..f93fda4302 100644
--- a/lib/gitlab/reply_by_email.rb
+++ b/lib/gitlab/reply_by_email.rb
@@ -36,14 +36,12 @@ module Gitlab
       end
 
       def address_regex
-        @address_regex ||= begin
-          wildcard_address = config.address
-          return nil unless wildcard_address
+        wildcard_address = config.address
+        return nil unless wildcard_address
 
-          regex = Regexp.escape(wildcard_address)
-          regex = regex.gsub(Regexp.escape('%{reply_key}'), "(.+)")
-          Regexp.new(regex).freeze
-        end
+        regex = Regexp.escape(wildcard_address)
+        regex = regex.gsub(Regexp.escape('%{reply_key}'), "(.+)")
+        Regexp.new(regex).freeze
       end
     end
   end

From 35224d5e7f3e0c978640b7a6dd64e9778c4d1c60 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 16:44:44 -0700
Subject: [PATCH 071/111] Memoize address_regex locally.

---
 lib/gitlab/reply_by_email.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/gitlab/reply_by_email.rb b/lib/gitlab/reply_by_email.rb
index f93fda4302..c3fe6778f0 100644
--- a/lib/gitlab/reply_by_email.rb
+++ b/lib/gitlab/reply_by_email.rb
@@ -21,9 +21,10 @@ module Gitlab
       end
 
       def reply_key_from_address(address)
-        return unless address_regex
+        regex = address_regex
+        return unless regex
 
-        match = address.match(address_regex)
+        match = address.match(regex)
         return unless match
 
         match[1]

From 747fe7520b244a324b60049cbe22c22a5df29c82 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 20 Aug 2015 18:25:16 -0700
Subject: [PATCH 072/111] Remove trailing HTML entities from non-Rinku
 autolinks as well.

---
 lib/gitlab/markdown/autolink_filter.rb           |  8 +++++++-
 spec/lib/gitlab/markdown/autolink_filter_spec.rb | 10 ++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/markdown/autolink_filter.rb b/lib/gitlab/markdown/autolink_filter.rb
index 4e14a048cf..541f1d88ff 100644
--- a/lib/gitlab/markdown/autolink_filter.rb
+++ b/lib/gitlab/markdown/autolink_filter.rb
@@ -87,8 +87,14 @@ module Gitlab
 
       def autolink_filter(text)
         text.gsub(LINK_PATTERN) do |match|
+          # Remove any trailing HTML entities and store them for appending
+          # outside the link element. The entity must be marked HTML safe in
+          # order to be output literally rather than escaped.
+          match.gsub!(/((?:&[\w#]+;)+)\z/, '')
+          dropped = ($1 || '').html_safe
+
           options = link_options.merge(href: match)
-          content_tag(:a, match, options)
+          content_tag(:a, match, options) + dropped
         end
       end
 
diff --git a/spec/lib/gitlab/markdown/autolink_filter_spec.rb b/spec/lib/gitlab/markdown/autolink_filter_spec.rb
index 982be0782c..26332ba521 100644
--- a/spec/lib/gitlab/markdown/autolink_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/autolink_filter_spec.rb
@@ -86,6 +86,16 @@ module Gitlab::Markdown
 
         doc = filter("See #{link}, ok?")
         expect(doc.at_css('a').text).to eq link
+
+        doc = filter("See #{link}...")
+        expect(doc.at_css('a').text).to eq link
+      end
+
+      it 'does not include trailing HTML entities' do
+        doc = filter("See &lt;&lt;&lt;#{link}&gt;&gt;&gt;")
+
+        expect(doc.at_css('a')['href']).to eq link
+        expect(doc.text).to eq "See <<<#{link}>>>"
       end
 
       it 'accepts link_attr options' do

From 77e508d8fd7a915f5ae221f5e4d6022560398a9e Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 20 Aug 2015 18:32:32 -0700
Subject: [PATCH 073/111] Fix bug where non-project members of the target
 project could set labels on new merge requests.

---
 CHANGELOG                                 | 1 +
 app/views/shared/issuable/_form.html.haml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 54f83e5aea..17b063536d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ v 8.0.0 (unreleased)
   - Allow configuration of import sources for new projects (Artem Sidorenko)
 
 v 7.14.0 (unreleased)
+  - Fix bug where non-project members of the target project could set labels on new merge requests.
   - Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller)
   - Fix redirection after sign in when using auto_sign_in_with_provider
   - Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules (Stan Hu)
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 3489bf3f19..f6b09de383 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -38,7 +38,7 @@
       .clearfix
       .error-alert
   %hr
-- if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
+- if can?(current_user, :"admin_#{issuable.to_ability_name}", issuable.project)
   .form-group
     .issue-assignee
       = f.label :assignee_id, class: 'control-label' do

From 4cd06867c76daca698bc4a9d23e1875f4b4866d5 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 21 Aug 2015 16:12:46 +0200
Subject: [PATCH 074/111] Do not delete the SQL dump too early

The change in baa157926d432f404a41c31ad6514ff8d5366269 broke backup
restore fucnctionality. This would not lead to data loss, but it
prevented the restore script from working. This bug exists only in
7.14.0 release candidate versions, not in 7.13.

Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 .
---
 lib/backup/database.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/backup/database.rb b/lib/backup/database.rb
index 939f28fc1c..ce75476a09 100644
--- a/lib/backup/database.rb
+++ b/lib/backup/database.rb
@@ -7,14 +7,15 @@ module Backup
     def initialize
       @config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env]
       @db_dir = File.join(Gitlab.config.backup.path, 'db')
+    end
+
+    def dump
       FileUtils.rm_rf(@db_dir)
       # Ensure the parent dir of @db_dir exists
       FileUtils.mkdir_p(Gitlab.config.backup.path)
       # Fail if somebody raced to create @db_dir before us
       FileUtils.mkdir(@db_dir, mode: 0700)
-    end
 
-    def dump
       success = case config["adapter"]
       when /^mysql/ then
         $progress.print "Dumping MySQL database #{config['database']} ... "

From 414533ca48147120586f531f61f131dbef9d85fc Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 21 Aug 2015 09:47:39 -0700
Subject: [PATCH 075/111] Check permissions on target project in merge request
 create service.

---
 app/services/merge_requests/create_service.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb
index f431c5d553..9651b16462 100644
--- a/app/services/merge_requests/create_service.rb
+++ b/app/services/merge_requests/create_service.rb
@@ -1,11 +1,17 @@
 module MergeRequests
   class CreateService < MergeRequests::BaseService
     def execute
+      # @project is used to determine whether the user can set the merge request's
+      # assignee, milestone and labels. Whether they can depends on their 
+      # permissions on the target project.
+      source_project = @project
+      @project = Project.find(params[:target_project_id]) if params[:target_project_id]
+
       filter_params
       label_params = params[:label_ids]
       merge_request = MergeRequest.new(params.except(:label_ids))
-      merge_request.source_project = project
-      merge_request.target_project ||= project
+      merge_request.source_project = source_project
+      merge_request.target_project ||= source_project
       merge_request.author = current_user
 
       if merge_request.save

From 69708dab9f6e1c265dd2bf80eafc39bf68c356e0 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 21 Aug 2015 10:14:45 -0700
Subject: [PATCH 076/111] Block blocked users from replying to threads by
 email.

---
 app/workers/email_receiver_worker.rb   |  2 ++
 lib/gitlab/email/receiver.rb           |  3 +++
 spec/lib/gitlab/email/receiver_spec.rb | 10 ++++++++++
 3 files changed, 15 insertions(+)

diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb
index 8f6c27ce4a..a588a1f45e 100644
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
@@ -31,6 +31,8 @@ class EmailReceiverWorker
       reason = "The email was marked as 'auto generated', which we can't accept. Please create your comment through the web interface."
     when Gitlab::Email::Receiver::UserNotFoundError
       reason = "We couldn't figure out what user corresponds to the email. Please create your comment through the web interface."
+    when Gitlab::Email::Receiver::UserBlockedError
+      reason = "Your account has been blocked. If you believe this is in error, contact a staff member."
     when Gitlab::Email::Receiver::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::Email::Receiver::NoteableNotFoundError
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index 17b8339edc..355fbd2789 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -8,6 +8,7 @@ module Gitlab
       class EmptyEmailError < ProcessingError; end
       class AutoGeneratedEmailError < ProcessingError; end
       class UserNotFoundError < ProcessingError; end
+      class UserBlockedError < ProcessingError; end
       class UserNotAuthorizedError < ProcessingError; end
       class NoteableNotFoundError < ProcessingError; end
       class InvalidNoteError < ProcessingError; end
@@ -27,6 +28,8 @@ module Gitlab
 
         raise UserNotFoundError unless author
 
+        raise UserBlockedError if author.blocked?
+
         project = sent_notification.project
 
         raise UserNotAuthorizedError unless project && author.can?(:create_note, project)
diff --git a/spec/lib/gitlab/email/receiver_spec.rb b/spec/lib/gitlab/email/receiver_spec.rb
index af44c1242e..1cc80f35f9 100644
--- a/spec/lib/gitlab/email/receiver_spec.rb
+++ b/spec/lib/gitlab/email/receiver_spec.rb
@@ -58,6 +58,16 @@ describe Gitlab::Email::Receiver do
     end
   end
 
+  context "when the user has been blocked" do
+    before do
+      user.block
+    end
+
+    it "raises a UserBlockedError" do
+      expect { receiver.execute }.to raise_error(Gitlab::Email::Receiver::UserBlockedError)
+    end
+  end
+
   context "when the user is not authorized to create a note" do
     before do
       project.update_attribute(:visibility_level, Project::PRIVATE)

From 3715a0f29b6758b3075abb6f28ee24c4eb8ed427 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Thu, 20 Aug 2015 21:33:00 -0700
Subject: [PATCH 077/111] Fix bug preventing invite by e-mail

This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320
---
 app/assets/javascripts/users_select.js.coffee    |  2 ++
 app/controllers/autocomplete_controller.rb       | 10 ++++++++--
 app/helpers/selects_helper.rb                    |  4 +++-
 app/views/shared/issuable/_context.html.haml     |  2 +-
 app/views/shared/issuable/_filter.html.haml      |  6 +++---
 app/views/shared/issuable/_form.html.haml        |  3 ++-
 features/admin/groups.feature                    |  6 ++++++
 features/steps/admin/groups.rb                   | 15 +++++++++++++++
 spec/controllers/autocomplete_controller_spec.rb |  2 +-
 9 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index aeeed9ca3c..9157562a5c 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -6,6 +6,7 @@ class @UsersSelect
     $('.ajax-users-select').each (i, select) =>
       @projectId = $(select).data('project-id')
       @groupId = $(select).data('group-id')
+      @showCurrentUser = $(select).data('current-user')
       showNullUser = $(select).data('null-user')
       showAnyUser = $(select).data('any-user')
       showEmailUser = $(select).data('email-user')
@@ -108,6 +109,7 @@ class @UsersSelect
         active: true
         project_id: @projectId
         group_id: @groupId
+        current_user: @showCurrentUser
       dataType: "json"
     ).done (users) ->
       callback(users)
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb
index 5c3ca8e23c..904d26a39f 100644
--- a/app/controllers/autocomplete_controller.rb
+++ b/app/controllers/autocomplete_controller.rb
@@ -33,8 +33,14 @@ class AutocompleteController < ApplicationController
     @users = @users.search(params[:search]) if params[:search].present?
     @users = @users.active
     @users = @users.page(params[:page]).per(PER_PAGE)
-    # Always include current user if available to filter by "Me"
-    @users = User.find(@users.pluck(:id) + [current_user.id]).uniq if current_user
+
+    unless params[:search].present?
+      # Include current user if available to filter by "Me"
+      if params[:current_user] && current_user
+        @users = [*@users, current_user].uniq
+      end
+    end
+
     render json: @users, only: [:name, :username, :id], methods: [:avatar_url]
   end
 
diff --git a/app/helpers/selects_helper.rb b/app/helpers/selects_helper.rb
index 2b99a39804..12fce8db70 100644
--- a/app/helpers/selects_helper.rb
+++ b/app/helpers/selects_helper.rb
@@ -10,6 +10,7 @@ module SelectsHelper
     any_user = opts[:any_user] || false
     email_user = opts[:email_user] || false
     first_user = opts[:first_user] && current_user ? current_user.username : false
+    current_user = opts[:current_user] || false
     project = opts[:project] || @project
 
     html = {
@@ -18,7 +19,8 @@ module SelectsHelper
       'data-null-user' => null_user,
       'data-any-user' => any_user,
       'data-email-user' => email_user,
-      'data-first-user' => first_user
+      'data-first-user' => first_user,
+      'data-current-user' => current_user
     }
 
     unless opts[:scope] == :all
diff --git a/app/views/shared/issuable/_context.html.haml b/app/views/shared/issuable/_context.html.haml
index 19e8c31975..cba18c1456 100644
--- a/app/views/shared/issuable/_context.html.haml
+++ b/app/views/shared/issuable/_context.html.haml
@@ -9,7 +9,7 @@
         none
     .issuable-context-selectbox
       - if can?(current_user, :"admin_#{issuable.to_ability_name}", @project)
-        = users_select_tag("#{issuable.class.table_name.singularize}[assignee_id]", placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: issuable.assignee_id, project: @target_project, null_user: true)
+        = users_select_tag("#{issuable.class.table_name.singularize}[assignee_id]", placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: issuable.assignee_id, project: @target_project, null_user: true, current_user: true)
 
   %div.prepend-top-20.clearfix
     .issuable-context-title
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index 0e8da8de72..8801f213fd 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -36,11 +36,11 @@
       .issues-other-filters
         .filter-item.inline
           = users_select_tag(:assignee_id, selected: params[:assignee_id],
-            placeholder: 'Assignee', class: 'trigger-submit', any_user: true, null_user: true, first_user: true)
+            placeholder: 'Assignee', class: 'trigger-submit', any_user: true, null_user: true, first_user: true, current_user: true)
 
         .filter-item.inline
           = users_select_tag(:author_id, selected: params[:author_id],
-            placeholder: 'Author', class: 'trigger-submit', any_user: true, first_user: true)
+            placeholder: 'Author', class: 'trigger-submit', any_user: true, first_user: true, current_user: true)
 
         .filter-item.inline.milestone-filter
           = select_tag('milestone_title', projects_milestones_options,
@@ -60,7 +60,7 @@
       .issues_bulk_update.hide
         = form_tag bulk_update_namespace_project_issues_path(@project.namespace, @project), method: :post  do
           = select_tag('update[state_event]', options_for_select([['Open', 'reopen'], ['Closed', 'close']]), prompt: "Status", class: 'form-control')
-          = users_select_tag('update[assignee_id]', placeholder: 'Assignee', null_user: true)
+          = users_select_tag('update[assignee_id]', placeholder: 'Assignee', null_user: true, current_user: true)
           = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
           = hidden_field_tag 'update[issues_ids]', []
           = hidden_field_tag :state_event, params[:state_event]
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 3489bf3f19..8a4ae6987f 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -47,7 +47,8 @@
       .col-sm-10
         = users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
             placeholder: 'Select a user', class: 'custom-form-control', null_user: true,
-            selected: issuable.assignee_id, project: @target_project || @project)
+            selected: issuable.assignee_id, project: @target_project || @project,
+            current_user: true)
         &nbsp;
         = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
   .form-group
diff --git a/features/admin/groups.feature b/features/admin/groups.feature
index aa365a6ea1..973918086a 100644
--- a/features/admin/groups.feature
+++ b/features/admin/groups.feature
@@ -27,3 +27,9 @@ Feature: Admin Groups
     When I visit admin group page
     And I remove user "John Doe" from group
     Then I should not see "John Doe" in team list
+
+  @javascript
+  Scenario: Invite user to a group by e-mail
+    When I visit admin group page
+    When I select user "johndoe@gitlab.com" from user list as "Reporter"
+    Then I should see "johndoe@gitlab.com" in team list in every project as "Reporter"
diff --git a/features/steps/admin/groups.rb b/features/steps/admin/groups.rb
index 83a3f48abe..d27634858a 100644
--- a/features/steps/admin/groups.rb
+++ b/features/steps/admin/groups.rb
@@ -44,6 +44,14 @@ class Spinach::Features::AdminGroups < Spinach::FeatureSteps
     click_button "Add users to group"
   end
 
+  When 'I select user "johndoe@gitlab.com" from user list as "Reporter"' do
+    select2('johndoe@gitlab.com', from: "#user_ids", multiple: true)
+    page.within "#new_project_member" do
+      select "Reporter", from: "access_level"
+    end
+    click_button "Add users to group"
+  end
+
   step 'I should see "John Doe" in team list in every project as "Reporter"' do
     page.within ".group-users-list" do
       expect(page).to have_content "John Doe"
@@ -51,6 +59,13 @@ class Spinach::Features::AdminGroups < Spinach::FeatureSteps
     end
   end
 
+  step 'I should see "johndoe@gitlab.com" in team list in every project as "Reporter"' do
+    page.within ".group-users-list" do
+      expect(page).to have_content "johndoe@gitlab.com (invited)"
+      expect(page).to have_content "Reporter"
+    end
+  end
+
   step 'I should be all groups' do
     Group.all.each do |group|
       expect(page).to have_content group.name
diff --git a/spec/controllers/autocomplete_controller_spec.rb b/spec/controllers/autocomplete_controller_spec.rb
index 3521d69025..aa8d6cb807 100644
--- a/spec/controllers/autocomplete_controller_spec.rb
+++ b/spec/controllers/autocomplete_controller_spec.rb
@@ -74,7 +74,7 @@ describe AutocompleteController do
 
     describe 'GET #users with project ID' do
       before do
-        get(:users, project_id: project.id)
+        get(:users, project_id: project.id, current_user: true)
       end
 
       it { expect(body).to be_kind_of(Array) }

From 577df6b8ca4532545ac2cad11a693dc976160b36 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 21 Aug 2015 14:26:57 -0700
Subject: [PATCH 078/111] List the current user first in issuable dropdowns

---
 app/views/shared/issuable/_filter.html.haml | 2 +-
 app/views/shared/issuable/_form.html.haml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml
index 8801f213fd..bcaa48c7a1 100644
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
@@ -60,7 +60,7 @@
       .issues_bulk_update.hide
         = form_tag bulk_update_namespace_project_issues_path(@project.namespace, @project), method: :post  do
           = select_tag('update[state_event]', options_for_select([['Open', 'reopen'], ['Closed', 'close']]), prompt: "Status", class: 'form-control')
-          = users_select_tag('update[assignee_id]', placeholder: 'Assignee', null_user: true, current_user: true)
+          = users_select_tag('update[assignee_id]', placeholder: 'Assignee', null_user: true, first_user: true, current_user: true)
           = select_tag('update[milestone_id]', bulk_update_milestone_options, prompt: "Milestone")
           = hidden_field_tag 'update[issues_ids]', []
           = hidden_field_tag :state_event, params[:state_event]
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 8a4ae6987f..61df138ad1 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -48,7 +48,7 @@
         = users_select_tag("#{issuable.class.model_name.param_key}[assignee_id]",
             placeholder: 'Select a user', class: 'custom-form-control', null_user: true,
             selected: issuable.assignee_id, project: @target_project || @project,
-            current_user: true)
+            first_user: true, current_user: true)
         &nbsp;
         = link_to 'Assign to me', '#', class: 'btn assign-to-me-link'
   .form-group

From 50baa1fdd1be1090c0d8ae6f7346d82f07369657 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 21 Aug 2015 15:03:16 -0700
Subject: [PATCH 079/111] Add development section to doc.

---
 doc/reply_by_email/README.md |  4 ++--
 lib/tasks/gitlab/check.rake  | 28 ++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/doc/reply_by_email/README.md b/doc/reply_by_email/README.md
index 1a0ce79bc5..358e48abcc 100644
--- a/doc/reply_by_email/README.md
+++ b/doc/reply_by_email/README.md
@@ -87,13 +87,13 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`. If you'
     mail_room_enabled=true
     ```
 
-6. Restart GitLab
+6. Restart GitLab:
     
     ```sh
     sudo service gitlab restart
     ```
 
-7. Check if everything is configured correctly
+7. Check if everything is configured correctly:
 
     ```sh
     sudo bundle exec rake gitlab:reply_by_email:check RAILS_ENV=production
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 3fbd429ef8..a48e23e63a 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -589,8 +589,13 @@ namespace :gitlab do
         check_address_formatted_correctly
         check_mail_room_config_exists
         check_imap_authentication
-        check_initd_configured_correctly
-        check_mail_room_running
+        
+        if Rails.env.production?
+          check_initd_configured_correctly
+          check_mail_room_running
+        else
+          check_foreman_configured_correctly
+        end
       else
         puts 'Reply by email is disabled in config/gitlab.yml'
       end
@@ -635,6 +640,25 @@ namespace :gitlab do
       end
     end
 
+    def check_foreman_configured_correctly
+      print "Foreman configured correctly? ... "
+
+      path = Rails.root.join("Procfile")
+
+      if File.exist?(path) && File.read(path) =~ /mail_room:/
+        puts "yes".green
+      else
+        puts "no".red
+        try_fixing_it(
+          "Enable mail_room in your Procfile."
+        )
+        for_more_information(
+          "doc/reply_by_email/README.md"
+        )
+        fix_and_rerun
+      end
+    end
+
     def check_mail_room_running
       print "MailRoom running? ... "
 

From 0366655311f3de0806eb1ad84abfffb881b5c609 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 21 Aug 2015 15:06:04 -0700
Subject: [PATCH 080/111] Fix check task for development.

---
 lib/tasks/gitlab/check.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index a48e23e63a..6f7a13159f 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -589,7 +589,7 @@ namespace :gitlab do
         check_address_formatted_correctly
         check_mail_room_config_exists
         check_imap_authentication
-        
+
         if Rails.env.production?
           check_initd_configured_correctly
           check_mail_room_running
@@ -645,7 +645,7 @@ namespace :gitlab do
 
       path = Rails.root.join("Procfile")
 
-      if File.exist?(path) && File.read(path) =~ /mail_room:/
+      if File.exist?(path) && File.read(path) =~ /^mail_room:/
         puts "yes".green
       else
         puts "no".red

From 3abb356dd215235765f89c78c98655dc62688b77 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 21 Aug 2015 15:13:22 -0700
Subject: [PATCH 081/111] Add development documentation for real.

---
 doc/reply_by_email/README.md | 72 +++++++++++++++++++++++++++++++++++-
 1 file changed, 70 insertions(+), 2 deletions(-)

diff --git a/doc/reply_by_email/README.md b/doc/reply_by_email/README.md
index 358e48abcc..91eea956e5 100644
--- a/doc/reply_by_email/README.md
+++ b/doc/reply_by_email/README.md
@@ -101,8 +101,76 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`. If you'
 
 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`.
-
 ### Omnibus package installations
 
 TODO
+
+### Development
+
+1. Go to the GitLab installation directory.
+
+1. Find the `reply_by_email` section in `config/gitlab.yml`, enable the feature and enter the email address including a placeholder for the `reply_key`:
+    
+    ```yaml
+    reply_by_email:
+      enabled: true
+      address: "gitlab-replies+%{reply_key}@gmail.com"
+    ```
+
+    As mentioned, the part after `+` is ignored, and this will end up in the mailbox for `gitlab-replies@gmail.com`.
+
+2. Find `config/mail_room.yml.example` and copy it to `config/mail_room.yml`:
+    
+    ```sh
+    sudo cp config/mail_room.yml.example config/mail_room.yml
+    ```
+
+3. Uncomment the configuration options in `config/mail_room.yml` and fill in the details for your specific IMAP server and email account:
+
+    ```yaml
+    :mailboxes:
+      -
+        # IMAP server host
+        :host: "imap.gmail.com"
+        # IMAP server port
+        :port: 993
+        # Whether the IMAP server uses SSL
+        :ssl: true
+        # Email account username. Usually the full email address.
+        :email: "gitlab-replies@gmail.com"
+        # Email account password
+        :password: "[REDACTED]"
+        # The name of the mailbox where incoming mail will end up. Usually "inbox".
+        :name: "inbox"
+        # Always "sidekiq".
+        :delivery_method: sidekiq
+        :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. Uncomment the `mail_room` line in your `Procfile`:
+
+    ```yaml
+    mail_room: bundle exec mail_room -q -c config/mail_room.yml
+    ```
+
+6. Restart GitLab:
+    
+    ```sh
+    bundle exec foreman start
+    ```
+
+7. Check if everything is configured correctly:
+
+    ```sh
+    bundle exec rake gitlab:reply_by_email:check RAILS_ENV=development
+    ```
+
+8. Reply by email should now be working.

From 15fc7bd6139f0b429c05c055b4cfab561c926e08 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 21 Aug 2015 16:09:55 -0700
Subject: [PATCH 082/111] No HTML-only email please

---
 lib/gitlab/email/html_cleaner.rb           | 135 ---------------------
 lib/gitlab/email/reply_parser.rb           |  24 +---
 spec/fixtures/emails/dutch.eml             |   2 +-
 spec/fixtures/emails/html_only.eml         |  93 --------------
 spec/fixtures/emails/plaintext_only.eml    |  42 +++++++
 spec/lib/gitlab/email/reply_parser_spec.rb |  19 ++-
 6 files changed, 65 insertions(+), 250 deletions(-)
 delete mode 100644 lib/gitlab/email/html_cleaner.rb
 delete mode 100644 spec/fixtures/emails/html_only.eml
 create mode 100644 spec/fixtures/emails/plaintext_only.eml

diff --git a/lib/gitlab/email/html_cleaner.rb b/lib/gitlab/email/html_cleaner.rb
deleted file mode 100644
index e1ae9eee56..0000000000
--- a/lib/gitlab/email/html_cleaner.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# Taken mostly from Discourse's Email::HtmlCleaner
-module Gitlab
-  module Email
-    # 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 HtmlCleaner
-      # Elements to hoist all children out of
-      HTML_HOIST_ELEMENTS = %w(div span font table tbody th tr td)
-      # Node types to always delete
-      HTML_DELETE_ELEMENT_TYPES = [
-        Nokogiri::XML::Node::DTD_NODE,
-        Nokogiri::XML::Node::COMMENT_NODE,
-      ]
-
-      # Private variables:
-      #   @doc - nokogiri document
-      #   @out - same as @doc, but only if trimming has occured
-      def initialize(html)
-        if html.is_a?(String)
-          @doc = Nokogiri::HTML(html)
-        else
-          @doc = html
-        end
-      end
-
-      class << self
-        # HtmlCleaner.trim(inp, opts={})
-        #
-        # Arguments:
-        #   inp - Either a HTML string or a Nokogiri document.
-        # Options:
-        #   :return => :doc, :string
-        #     Specify the desired return type.
-        #     Defaults to the type of the input.
-        #     A value of :string is equivalent to calling get_document_text()
-        #     on the returned document.
-        def trim(inp, opts={})
-          cleaner = HtmlCleaner.new(inp)
-
-          opts[:return] ||= (inp.is_a?(String) ? :string : :doc)
-
-          if opts[:return] == :string
-            cleaner.output_html
-          else
-            cleaner.output_document
-          end
-        end
-
-        # HtmlCleaner.get_document_text(doc)
-        #
-        # Get the body portion of the document, including html, as a string.
-        def get_document_text(doc)
-          body = doc.xpath('//body')
-          if body
-            body.inner_html
-          else
-            doc.inner_html
-          end
-        end
-      end
-
-      def output_document
-        @out ||= begin
-          doc = @doc
-          trim_process_node doc
-          add_newlines doc
-          doc
-        end
-      end
-
-      def output_html
-        HtmlCleaner.get_document_text(output_document)
-      end
-
-      private
-
-      def add_newlines(doc)
-        # Replace <br> tags with a markdown \n
-        doc.xpath('//br').each do |br|
-          br.replace(new_linebreak_node doc, 2)
-        end
-        # Surround <p> tags with newlines, to help with line-wise postprocessing
-        # and ensure markdown paragraphs
-        doc.xpath('//p').each do |p|
-          p.before(new_linebreak_node doc)
-          p.after(new_linebreak_node doc, 2)
-        end
-      end
-
-      def new_linebreak_node(doc, count=1)
-        Nokogiri::XML::Text.new("\n" * count, doc)
-      end
-
-      def trim_process_node(node)
-        if should_hoist?(node)
-          hoisted = trim_hoist_element node
-          hoisted.each { |child| trim_process_node child }
-        elsif should_delete?(node)
-          node.remove
-        else
-          if children = node.children
-            children.each { |child| trim_process_node child }
-          end
-        end
-
-        node
-      end
-
-      def trim_hoist_element(element)
-        hoisted = []
-        element.children.each do |child|
-          element.before(child)
-          hoisted << child
-        end
-        element.remove
-        hoisted
-      end
-
-      def should_hoist?(node)
-        return false unless node.element?
-        HTML_HOIST_ELEMENTS.include? node.name
-      end
-
-      def should_delete?(node)
-        return true if HTML_DELETE_ELEMENT_TYPES.include? node.type
-        return true if node.element? && node.name == 'head'
-        return true if node.text? && node.text.strip.blank?
-
-        false
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/email/reply_parser.rb b/lib/gitlab/email/reply_parser.rb
index 6e768e46a7..6ed36b51f1 100644
--- a/lib/gitlab/email/reply_parser.rb
+++ b/lib/gitlab/email/reply_parser.rb
@@ -23,31 +23,19 @@ module Gitlab
       private
 
       def select_body(message)
-        html = nil
-        text = nil
+        text    = message.text_part if message.multipart?
+        text  ||= message           if message.content_type !~ /text\/html/
 
-        if message.multipart?
-          html = fix_charset(message.html_part)
-          text = fix_charset(message.text_part)
-        elsif message.content_type =~ /text\/html/
-          html = fix_charset(message)
-        end
+        return "" unless text
 
-        # prefer plain text
-        return text if text
-
-        if html
-          body = HtmlCleaner.new(html).output_html
-        else
-          body = fix_charset(message)
-        end
+        text = fix_charset(text)
 
         # Certain trigger phrases that means we didn't parse correctly
-        if body =~ /(Content\-Type\:|multipart\/alternative|text\/plain)/
+        if text =~ /(Content\-Type\:|multipart\/alternative|text\/plain)/
           return ""
         end
 
-        body
+        text
       end
 
       # Force encoding to UTF-8 on a Mail::Message or Mail::Part
diff --git a/spec/fixtures/emails/dutch.eml b/spec/fixtures/emails/dutch.eml
index 7be08dc493..3142bf30c3 100644
--- a/spec/fixtures/emails/dutch.eml
+++ b/spec/fixtures/emails/dutch.eml
@@ -17,4 +17,4 @@ Dit is een antwoord in het Nederlands.
 
 Op 18 juli 2013 10:23 schreef Sander Datema het volgende:
 
-Dit is de originele post.
\ No newline at end of file
+Dit is de originele post.
diff --git a/spec/fixtures/emails/html_only.eml b/spec/fixtures/emails/html_only.eml
deleted file mode 100644
index 561b8db2c7..0000000000
--- a/spec/fixtures/emails/html_only.eml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-Delivered-To: walter@breakingbad.com
-Received: by 10.64.13.41 with SMTP id m9csp29769iec;
-        Thu, 20 Jun 2013 08:53:22 -0700 (PDT)
-X-Received: by 10.252.23.9 with SMTP id p9mr4055675lag.4.1371743601980;
-        Thu, 20 Jun 2013 08:53:21 -0700 (PDT)
-Received: from mail-la0-x229.google.com (mail-la0-x229.google.com [2a00:1450:4010:c03::229])
-        by mx.google.com with ESMTPS id u4si430203lae.48.2013.06.20.08.53.20
-        for <walter@breakingbad.com>
-        (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
-        Thu, 20 Jun 2013 08:53:21 -0700 (PDT)
-X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
-        d=google.com; s=20120113;
-        h=x-forwarded-to:x-forwarded-for:delivered-to:x-return-path
-         :content-type:mime-version:content-transfer-encoding:x-mailer
-         :message-id:date:subject:from:in-reply-to:to:resent-date:resent-from
-         :resent-to:resent-subject:resent-message-id:resent-user-agent
-         :x-scanned-by:x-gm-message-state;
-        bh=9O67r74ofh9WkEaKTRB/frQ3MKOtQlbCac2mz0/MiyY=;
-        b=YVAo2/JDMP53RxDmqDEKNcEMtggtfaVyq2DoseZ6vBAfB7G6NtHC9ZEkRs4oGhk6LU
-         fnyAPe0wnz5d9WINoMAuuTRIhplLxzcqysduSnAJAQ2qqR7mFBnlj9wJeVEKltNwmUME
-         nPwxsf8go20VBzrZCtECPedcLi60wbl32NCXVn0qwt2LvKiy6ktSS5Xgb4zY8i4dfXAP
-         6Y5gu32boooWIb9DkH1TJkn3C0RrEugNlw/DUnXrnkFefgxWF3pt/zcoW/wYRyikOdx+
-         smBClgR9my6QmsS2KsQrMvWJZUva7fddTiZ6FC22e4hW+8Wha0RaZOZu5O7hjg6G4/1g
-         IEyg==
-X-Received: by 10.112.55.9 with SMTP id n9mr5916187lbp.5.1371743600857;
-        Thu, 20 Jun 2013 08:53:20 -0700 (PDT)
-X-Forwarded-To: walter@breakingbad.com
-X-Forwarded-For: walter@breakingbad.com
-Delivered-To: walter@breakingbad.com
-Content-Type: text/html; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: quoted-printable
-X-Mailer: BlackBerry Email (10.1.0.1720)
-Message-ID: <20130619231548.6307981.74194.2379@breakingbad.com>
-Date: Wed, 19 Jun 2013 19:15:48 -0400
-Subject: Re: [Discourse Meta] [PM] re: Regarding your post in "Site
- Customization not working"
-From: aaron@breakingbad.com
-In-Reply-To: <51c238655a394_5f4e3ce6690667bd@tiefighter2.mail>
-To: reply+20c1b0a8bd1a63c0163cc7e7641ca06b@appmail.adventuretime.ooo
-ReSent-Date: Thu, 20 Jun 2013 11:53:08 -0400 (EDT)
-ReSent-From: Aaron <aaron@breakingbad.com>
-ReSent-Subject: Re: [Discourse Meta] [PM] re: Regarding your post in "Site
- Customization not working"
-X-Gm-Message-State: ALoCoQl1BtN83rAX7At808XAPv1yCqUK3Du2IvK7eCyY3jsI77u4e5cak28307pYYHAo1JlO/Eu9
-
-<html><head></head><body data-blackberry-caret-color=3D"#00a8df" style=3D"b=
-ackground-color: rgb(255, 255, 255); line-height: initial;"><div id=3D"BB10=
-_response_div" style=3D"width: 100%; font-size: initial; font-family: Calib=
-ri, 'Slate Pro', sans-serif; color: rgb(31, 73, 125); text-align: initial; =
-background-color: rgb(255, 255, 255);">The EC2 instance - I've seen that th=
-ere tends to be odd and unrecommended settings on the Bitnami installs that=
- I've checked out.</div>                                                   =
-                                                                           =
-       <div id=3D"response_div_spacer" style=3D"width: 100%; font-size: ini=
-tial; font-family: Calibri, 'Slate Pro', sans-serif; color: rgb(31, 73, 125=
-); text-align: initial; background-color: rgb(255, 255, 255);"><br style=3D=
-"display:initial"></div>                                                   =
-                                                                           =
-       <div id=3D"_signaturePlaceholder" style=3D"font-size: initial; font-=
-family: Calibri, 'Slate Pro', sans-serif; color: rgb(31, 73, 125); text-ali=
-gn: initial; background-color: rgb(255, 255, 255);"></div>                 =
-                                                                           =
-                                                                           =
-                 <table width=3D"100%" style=3D"background-color:white;bord=
-er-spacing:0px;"> <tbody><tr><td id=3D"_persistentHeaderContainer" colspan=
-=3D"2" style=3D"font-size: initial; text-align: initial; background-color: =
-rgb(255, 255, 255);">                                              <div id=
-=3D"_persistentHeader" style=3D"border-style: solid none none; border-top-c=
-olor: rgb(181, 196, 223); border-top-width: 1pt; padding: 3pt 0in 0in; font=
--family: Tahoma, 'BB Alpha Sans', 'Slate Pro'; font-size: 10pt;">  <div><b>=
-From: </b>Grizzly B  via Discourse Meta</div><div><b>Sent: </b>Wednesday, J=
-une 19, 2013 19:02</div><div><b>To: </b>aaron@breakingbad.com</div><div><b>=
-Reply To: </b>Grizzly B  via Discourse Meta</div><div><b>Subject: </b>[Disc=
-ourse Meta] [PM] re: Regarding your post in "Site Customization<br> not wor=
-king"</div></div></td></tr></tbody></table><div id=3D"_persistentHeaderEnd"=
- style=3D"border-style: solid none none; border-top-color: rgb(186, 188, 20=
-9); border-top-width: 1pt; font-size: initial; text-align: initial; backgro=
-und-color: rgb(255, 255, 255);"></div><br><div id=3D"_originalContent" styl=
-e=3D""><p>Grizzly B just sent you a private message</p>
-
-<hr><p>Log in to our EC2 instance -or- log into a new Digital Ocean instanc=
-e?</p>
-
-<hr><p>Please visit this link to respond: <a href=3D"http://meta.discourse.=
-org/t/regarding-your-post-in-site-customization-not-working/7641/5">http://=
-meta.discourse.org/t/regarding-your-post-in-site-customization-not-working/=
-7641/5</a></p>
-
-<p>To unsubscribe from these emails, visit your <a href=3D"http://meta.disc=
-ourse.org/user_preferences">user preferences</a>.</p>
-<br><!--end of _originalContent --></div></body></html>
diff --git a/spec/fixtures/emails/plaintext_only.eml b/spec/fixtures/emails/plaintext_only.eml
new file mode 100644
index 0000000000..1bfaec771d
--- /dev/null
+++ b/spec/fixtures/emails/plaintext_only.eml
@@ -0,0 +1,42 @@
+Delivered-To: reply@discourse.org
+Return-Path: <walter.white@googlemail.com>
+MIME-Version: 1.0
+From: <walter.white@googlemail.com>
+To:
+  =?utf-8?Q?Discourse_Meta?=
+   <reply@discourse.org>
+Subject:
+ =?utf-8?Q?Re:_[Discourse_Meta]_[Lounge]_Testing_default_email_replies?=
+Importance: Normal
+Date: Fri, 28 Nov 2014 21:29:10 +0000
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+References:
+ <topic/22638@meta.discourse.org>,<topic/22638/86406@meta.discourse.org>
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: base64
+
+IyMjIHJlcGx5IGZyb20gZGVmYXVsdCBtYWlsIGNsaWVudCBpbiBXaW5kb3dzIDguMSBNZXRybw0K
+DQoNClRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWlj
+ayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gg
+anVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0
+aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cu
+IFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBi
+cm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVt
+cHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUg
+bGF6eSBkb2cuDQoNCg0KVGhpcyBpcyBhICoqYm9sZCoqIHdvcmQgaW4gTWFya2Rvd24NCg0KDQpU
+aGlzIGlzIGEgbGluayBodHRwOi8vZXhhbXBsZS5jb20NCiANCg0KDQoNCg0KDQpGcm9tOiBBcnBp
+dCBKYWxhbg0KU2VudDog4oCORnJpZGF54oCOLCDigI5Ob3ZlbWJlcuKAjiDigI4yOOKAjiwg4oCO
+MjAxNCDigI4xMuKAjjrigI4zNeKAjiDigI5QTQ0KVG86IGplZmYgYXR3b29kDQoNCg0KDQoNCg0K
+DQogdGVjaEFQSg0KTm92ZW1iZXIgMjggDQoNClRlc3QgcmVwbHkuDQoNCkZpcnN0IHBhcmFncmFw
+aC4NCg0KU2Vjb25kIHBhcmFncmFwaC4NCg0KDQoNClRvIHJlc3BvbmQsIHJlcGx5IHRvIHRoaXMg
+ZW1haWwgb3IgdmlzaXQgaHR0cHM6Ly9tZXRhLmRpc2NvdXJzZS5vcmcvdC90ZXN0aW5nLWRlZmF1
+bHQtZW1haWwtcmVwbGllcy8yMjYzOC8zIGluIHlvdXIgYnJvd3Nlci4NCg0KDQoNClByZXZpb3Vz
+IFJlcGxpZXMNCg0KIGNvZGluZ2hvcnJvcg0KTm92ZW1iZXIgMjggDQoNCldlJ3JlIHRlc3Rpbmcg
+dGhlIGxhdGVzdCBHaXRIdWIgZW1haWwgcHJvY2Vzc2luZyBsaWJyYXJ5IHdoaWNoIHdlIGFyZSBp
+bnRlZ3JhdGluZyBub3cuDQoNCmh0dHBzOi8vZ2l0aHViLmNvbS9naXRodWIvZW1haWxfcmVwbHlf
+cGFyc2VyDQoNCkdvIGFoZWFkIGFuZCByZXBseSB0byB0aGlzIHRvcGljIGFuZCBJJ2xsIHJlcGx5
+IGZyb20gdmFyaW91cyBlbWFpbCBjbGllbnRzIGZvciB0ZXN0aW5nLg0KDQoNCg0KDQoNClRvIHJl
+c3BvbmQsIHJlcGx5IHRvIHRoaXMgZW1haWwgb3IgdmlzaXQgaHR0cHM6Ly9tZXRhLmRpc2NvdXJz
+ZS5vcmcvdC90ZXN0aW5nLWRlZmF1bHQtZW1haWwtcmVwbGllcy8yMjYzOC8zIGluIHlvdXIgYnJv
+d3Nlci4NCg0KDQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoZXNlIGVtYWlscywgdmlzaXQgeW91ciB1
+c2VyIHByZWZlcmVuY2VzLg==
diff --git a/spec/lib/gitlab/email/reply_parser_spec.rb b/spec/lib/gitlab/email/reply_parser_spec.rb
index a94c92ad53..7cae1da805 100644
--- a/spec/lib/gitlab/email/reply_parser_spec.rb
+++ b/spec/lib/gitlab/email/reply_parser_spec.rb
@@ -19,9 +19,22 @@ describe Gitlab::Email::ReplyParser do
       expect(test_parse_body(fixture_file("emails/no_content_reply.eml"))).to eq("")
     end
 
-    it "can parse the html section" do
-      expect(test_parse_body(fixture_file("emails/html_only.eml"))).to eq("The EC2 instance - I've seen that there tends to be odd and " +
-          "unrecommended settings on the Bitnami installs that I've checked out.")
+    it "properly renders plaintext-only email" do
+      expect(test_parse_body(fixture_file("emails/plaintext_only.eml"))).
+        to eq(
+          <<-BODY.strip_heredoc.chomp
+            ### reply from default mail client in Windows 8.1 Metro
+
+
+            The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+
+
+            This is a **bold** word in Markdown
+
+
+            This is a link http://example.com
+          BODY
+        )
     end
 
     it "supports a Dutch reply" do

From a9e409179bb6be53e1fb45e930739fc73dbb77ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Valais?= <mael.valais@univ-tlse3.fr>
Date: Fri, 21 Aug 2015 15:05:43 +0200
Subject: [PATCH 083/111] Create cross-reference for closing references on
 commits pushed to non-default branches.

I also revamped the tests on "closing reference commits" (= "Fixes #xxxx" for example).
Now, there are two different contexts:
- when the commits with "closing reference" are pushed to the default branch,
- when the commits with "closing reference" are pushed to a non-default branch.

Closes gitlab-org/gitlab-ce#2190.
---
 CHANGELOG                              |  1 +
 app/services/git_push_service.rb       | 15 ++++--
 spec/services/git_push_service_spec.rb | 63 +++++++++++++++-----------
 3 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index dd5162a53d..fe0992b5a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ v 8.0.0 (unreleased)
   - Allow displaying of archived projects in the admin interface (Artem Sidorenko)
   - Allow configuration of import sources for new projects (Artem Sidorenko)
   - Search for comments should be case insensetive
+  - Create cross-reference for closing references on commits pushed to non-default branches (Maël Valais)
 
 v 7.14.0 (unreleased)
   - Fix bug where non-project members of the target project could set labels on new merge requests.
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 81535450ac..0a73244774 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -78,24 +78,29 @@ class GitPushService
       # For push with 1k commits it prevents 900+ requests in database
       author = nil
 
+      # Keep track of the issues that will be actually closed because they are on a default branch.
+      # Hence, when creating cross-reference notes, the not-closed issues (on non-default branches)
+      # will also have cross-reference.
+      actually_closed_issues = []
+
       if issues_to_close.present? && is_default_branch
         author ||= commit_user(commit)
-
+        actually_closed_issues = issues_to_close
         issues_to_close.each do |issue|
           Issues::CloseService.new(project, author, {}).execute(issue, commit)
         end
       end
 
       if project.default_issues_tracker?
-        create_cross_reference_notes(commit, issues_to_close)
+        create_cross_reference_notes(commit, actually_closed_issues)
       end
     end
   end
 
   def create_cross_reference_notes(commit, issues_to_close)
-    # Create cross-reference notes for any other references. Omit any issues that were referenced in an
-    # issue-closing phrase, or have already been mentioned from this commit (probably from this commit
-    # being pushed to a different branch).
+    # Create cross-reference notes for any other references than those given in issues_to_close.
+    # Omit any issues that were referenced in an issue-closing phrase, or have already been
+    # mentioned from this commit (probably from this commit being pushed to a different branch).
     refs = commit.references(project, user) - issues_to_close
     refs.reject! { |r| commit.has_mentioned?(r) }
 
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index 62cef9db53..c483060fd7 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -197,7 +197,7 @@ describe GitPushService do
     end
   end
 
-  describe "closing issues from pushed commits" do
+  describe "closing issues from pushed commits containing a closing reference" do
     let(:issue) { create :issue, project: project }
     let(:other_issue) { create :issue, project: project }
     let(:commit_author) { create :user }
@@ -215,36 +215,47 @@ describe GitPushService do
         and_return([closing_commit])
     end
 
-    it "closes issues with commit messages" do
-      service.execute(project, user, @oldrev, @newrev, @ref)
-
-      expect(Issue.find(issue.id)).to be_closed
-    end
-
-    it "doesn't create cross-reference notes for a closing reference" do
-      expect do
+    context "to default branches" do
+      it "closes issues" do
         service.execute(project, user, @oldrev, @newrev, @ref)
-      end.not_to change { Note.where(project_id: project.id, system: true, commit_id: closing_commit.id).count }
+        expect(Issue.find(issue.id)).to be_closed
+      end
+
+      it "adds a note indicating that the issue is now closed" do
+        expect(SystemNoteService).to receive(:change_status).with(issue, project, commit_author, "closed", closing_commit)
+        service.execute(project, user, @oldrev, @newrev, @ref)
+      end
+
+      it "doesn't create additional cross-reference notes" do
+        expect(SystemNoteService).not_to receive(:cross_reference)
+        service.execute(project, user, @oldrev, @newrev, @ref)
+      end
+
+      it "doesn't close issues when external issue tracker is in use" do
+        allow(project).to receive(:default_issues_tracker?).and_return(false)
+
+        # The push still shouldn't create cross-reference notes.
+        expect do
+          service.execute(project, user, @oldrev, @newrev, 'refs/heads/hurf')
+        end.not_to change { Note.where(project_id: project.id, system: true).count }
+      end
     end
 
-    it "doesn't close issues when pushed to non-default branches" do
-      allow(project).to receive(:default_branch).and_return('durf')
+    context "to non-default branches" do
+      before do
+        # Make sure the "default" branch is different
+        allow(project).to receive(:default_branch).and_return('not-master')
+      end
 
-      # The push still shouldn't create cross-reference notes.
-      expect do
-        service.execute(project, user, @oldrev, @newrev, 'refs/heads/hurf')
-      end.not_to change { Note.where(project_id: project.id, system: true).count }
+      it "creates cross-reference notes" do
+        expect(SystemNoteService).to receive(:cross_reference).with(issue, closing_commit, commit_author)
+        service.execute(project, user, @oldrev, @newrev, @ref)
+      end
 
-      expect(Issue.find(issue.id)).to be_opened
-    end
-
-    it "doesn't close issues when external issue tracker is in use" do
-      allow(project).to receive(:default_issues_tracker?).and_return(false)
-
-      # The push still shouldn't create cross-reference notes.
-      expect do
-        service.execute(project, user, @oldrev, @newrev, 'refs/heads/hurf')
-      end.not_to change { Note.where(project_id: project.id, system: true).count }
+      it "doesn't close issues" do
+        service.execute(project, user, @oldrev, @newrev, @ref)
+        expect(Issue.find(issue.id)).to be_opened
+      end
     end
   end
 

From cddf03f7179aae5bb7568b2c3def54b19eed1f66 Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytse@gitlab.com>
Date: Sat, 22 Aug 2015 19:11:02 +0000
Subject: [PATCH 084/111] Specify the branch name of the blog post to prevent
 the use of spaces.

---
 doc/release/monthly.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/release/monthly.md b/doc/release/monthly.md
index 12d6a84b68..c1ed9e3b80 100644
--- a/doc/release/monthly.md
+++ b/doc/release/monthly.md
@@ -1,8 +1,9 @@
 # Monthly Release
 
-NOTE: This is a guide used by the GitLab B.V. developers.
+NOTE: This is a guide used by the GitLab the company to release GitLab.
+As an end user you do not need to use this guide.
 
-It starts 7 working days before the release.
+The process starts 7 working days before the release.
 The release manager doesn't have to perform all the work but must ensure someone is assigned.
 The current release manager must schedule the appointment of the next release manager.
 The new release manager should create overall issue to track the progress.
@@ -164,7 +165,7 @@ Tweet about the RC release:
 1. Create a merge request on [GitLab.com](https://gitlab.com/gitlab-com/www-gitlab-com/tree/master)
 1. Assign to one reviewer who will fix spelling issues by editing the branch (either with a git client or by using the online editor)
 1. Comment to the reviewer: '@person Please mention the whole team as soon as you are done (3 workdays before release at the latest)'
-1. Create a complete copy of the [release blog template](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/doc/release_blog_template.md) for the release after this.
+1. Create a new merge request with complete copy of the [release blog template](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/doc/release_blog_template.md) for the next release using the branch name `release-x-x-x`.
 
 ## Create CE, EE, CI stable versions
 

From 97cc91d21d28a6482dc6ab040db31598a786f56c Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 23 Aug 2015 05:44:49 -0700
Subject: [PATCH 085/111] 7.14.0 is released

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index fe0992b5a0..44ffb56d5f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,7 +11,7 @@ v 8.0.0 (unreleased)
   - Search for comments should be case insensetive
   - Create cross-reference for closing references on commits pushed to non-default branches (Maël Valais)
 
-v 7.14.0 (unreleased)
+v 7.14.0
   - Fix bug where non-project members of the target project could set labels on new merge requests.
   - Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller)
   - Fix redirection after sign in when using auto_sign_in_with_provider

From ed1d4fa477789659f9343593bf06d50e70750561 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 7 Aug 2015 00:06:20 -0700
Subject: [PATCH 086/111] Remove user OAuth tokens stored in database for
 Bitbucket, GitHub, and GitLab and request them each session. Pass these
 tokens to the project import data.

This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.

For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:

```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)

NameError (uninitialized constant Import::BitbucketController::Unauthorized):
  app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
  app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```

Closes #1871
---
 CHANGELOG                                     |  1 +
 .../import/bitbucket_controller.rb            | 23 ++++++++++-----
 app/controllers/import/github_controller.rb   | 16 +++++++----
 app/controllers/import/gitlab_controller.rb   | 16 +++++++----
 app/workers/repository_import_worker.rb       |  3 +-
 ...14065925_remove_oauth_tokens_from_users.rb |  8 ++++++
 db/schema.rb                                  |  4 ---
 lib/gitlab/bitbucket_import/importer.rb       | 15 ++++++----
 lib/gitlab/bitbucket_import/key_adder.rb      |  7 +++--
 lib/gitlab/bitbucket_import/key_deleter.rb    |  7 +++--
 .../bitbucket_import/project_creator.rb       | 12 +++++---
 lib/gitlab/github_import/importer.rb          |  4 ++-
 lib/gitlab/github_import/project_creator.rb   | 13 ++++++---
 lib/gitlab/gitlab_import/importer.rb          | 14 ++++++----
 lib/gitlab/gitlab_import/project_creator.rb   | 12 +++++---
 .../import/bitbucket_controller_spec.rb       | 28 ++++++++++++-------
 .../import/github_controller_spec.rb          | 21 ++++++++++----
 .../import/gitlab_controller_spec.rb          | 22 ++++++++++-----
 .../bitbucket_import/project_creator_spec.rb  |  7 +++--
 .../github_import/project_creator_spec.rb     |  6 ++--
 .../gitlab_import/project_creator_spec.rb     |  6 ++--
 21 files changed, 162 insertions(+), 83 deletions(-)
 create mode 100644 db/migrate/20150814065925_remove_oauth_tokens_from_users.rb

diff --git a/CHANGELOG b/CHANGELOG
index 44ffb56d5f..7eb6ab81dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
+  - Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
   - Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
   - Remove satellites
   - Better performance for web editor (switched from satellites to rugged)
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb
index 4e6c0b6663..f84f85a7df 100644
--- a/app/controllers/import/bitbucket_controller.rb
+++ b/app/controllers/import/bitbucket_controller.rb
@@ -13,10 +13,9 @@ class Import::BitbucketController < Import::BaseController
 
     access_token = client.get_token(request_token, params[:oauth_verifier], callback_import_bitbucket_url)
 
-    current_user.bitbucket_access_token = access_token.token
-    current_user.bitbucket_access_token_secret = access_token.secret
+    session[:bitbucket_access_token] = access_token.token
+    session[:bitbucket_access_token_secret] = access_token.secret
 
-    current_user.save
     redirect_to status_import_bitbucket_url
   end
 
@@ -46,19 +45,20 @@ class Import::BitbucketController < Import::BaseController
 
     namespace = get_or_create_namespace || (render and return)
 
-    unless Gitlab::BitbucketImport::KeyAdder.new(repo, current_user).execute
+    unless Gitlab::BitbucketImport::KeyAdder.new(repo, current_user, access_params).execute
       @access_denied = true
       render
       return
     end
 
-    @project = Gitlab::BitbucketImport::ProjectCreator.new(repo, namespace, current_user).execute
+    @project = Gitlab::BitbucketImport::ProjectCreator.new(repo, namespace, current_user, access_params).execute
   end
 
   private
 
   def client
-    @client ||= Gitlab::BitbucketImport::Client.new(current_user.bitbucket_access_token, current_user.bitbucket_access_token_secret)
+    @client ||= Gitlab::BitbucketImport::Client.new(session[:bitbucket_access_token],
+                                                    session[:bitbucket_access_token_secret])
   end
 
   def verify_bitbucket_import_enabled
@@ -66,7 +66,7 @@ class Import::BitbucketController < Import::BaseController
   end
 
   def bitbucket_auth
-    if current_user.bitbucket_access_token.blank?
+    if session[:bitbucket_access_token].blank?
       go_to_bitbucket_for_permissions
     end
   end
@@ -81,4 +81,13 @@ class Import::BitbucketController < Import::BaseController
   def bitbucket_unauthorized
     go_to_bitbucket_for_permissions
   end
+
+  private
+
+  def access_params
+    {
+      bitbucket_access_token: session[:bitbucket_access_token],
+      bitbucket_access_token_secret: session[:bitbucket_access_token_secret]
+    }
+  end
 end
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index b9f99c1b88..f21fbd9ecc 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -5,9 +5,7 @@ class Import::GithubController < Import::BaseController
   rescue_from Octokit::Unauthorized, with: :github_unauthorized
 
   def callback
-    token = client.get_token(params[:code])
-    current_user.github_access_token = token
-    current_user.save
+    session[:github_access_token] = client.get_token(params[:code])
     redirect_to status_import_github_url
   end
 
@@ -39,13 +37,13 @@ class Import::GithubController < Import::BaseController
 
     namespace = get_or_create_namespace || (render and return)
 
-    @project = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, current_user).execute
+    @project = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, current_user, access_params).execute
   end
 
   private
 
   def client
-    @client ||= Gitlab::GithubImport::Client.new(current_user.github_access_token)
+    @client ||= Gitlab::GithubImport::Client.new(session[:github_access_token])
   end
 
   def verify_github_import_enabled
@@ -53,7 +51,7 @@ class Import::GithubController < Import::BaseController
   end
 
   def github_auth
-    if current_user.github_access_token.blank?
+    if session[:github_access_token].blank?
       go_to_github_for_permissions
     end
   end
@@ -65,4 +63,10 @@ class Import::GithubController < Import::BaseController
   def github_unauthorized
     go_to_github_for_permissions
   end
+
+  private
+
+  def access_params
+    { github_access_token: session[:github_access_token] }
+  end
 end
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
index 1b8962d892..27af19f5f6 100644
--- a/app/controllers/import/gitlab_controller.rb
+++ b/app/controllers/import/gitlab_controller.rb
@@ -5,9 +5,7 @@ class Import::GitlabController < Import::BaseController
   rescue_from OAuth2::Error, with: :gitlab_unauthorized
 
   def callback
-    token = client.get_token(params[:code], callback_import_gitlab_url)
-    current_user.gitlab_access_token = token
-    current_user.save
+    session[:gitlab_access_token] = client.get_token(params[:code], callback_import_gitlab_url)
     redirect_to status_import_gitlab_url
   end
 
@@ -36,13 +34,13 @@ class Import::GitlabController < Import::BaseController
 
     namespace = get_or_create_namespace || (render and return)
 
-    @project = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, current_user).execute
+    @project = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, current_user, access_params).execute
   end
 
   private
 
   def client
-    @client ||= Gitlab::GitlabImport::Client.new(current_user.gitlab_access_token)
+    @client ||= Gitlab::GitlabImport::Client.new(session[:gitlab_access_token])
   end
 
   def verify_gitlab_import_enabled
@@ -50,7 +48,7 @@ class Import::GitlabController < Import::BaseController
   end
 
   def gitlab_auth
-    if current_user.gitlab_access_token.blank?
+    if session[:gitlab_access_token].blank?
       go_to_gitlab_for_permissions
     end
   end
@@ -62,4 +60,10 @@ class Import::GitlabController < Import::BaseController
   def gitlab_unauthorized
     go_to_gitlab_for_permissions
   end
+
+  private
+
+  def access_params
+    { gitlab_access_token: session[:gitlab_access_token] }
+  end
 end
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index b546f8777e..f2ba2e15e7 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -25,9 +25,10 @@ class RepositoryImportWorker
                           end
     return project.import_fail unless data_import_result
 
+    Gitlab::BitbucketImport::KeyDeleter.new(project).execute if project.import_type == 'bitbucket'
+
     project.import_finish
     project.save
     ProjectCacheWorker.perform_async(project.id)
-    Gitlab::BitbucketImport::KeyDeleter.new(project).execute if project.import_type == 'bitbucket'
   end
 end
diff --git a/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb b/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb
new file mode 100644
index 0000000000..de2078a926
--- /dev/null
+++ b/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb
@@ -0,0 +1,8 @@
+class RemoveOauthTokensFromUsers < ActiveRecord::Migration
+  def change
+    remove_column :users, :github_access_token, :string
+    remove_column :users, :gitlab_access_token, :string
+    remove_column :users, :bitbucket_access_token, :string
+    remove_column :users, :bitbucket_access_token_secret, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2b9a3e7f01..108c48bf32 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -526,13 +526,9 @@ ActiveRecord::Schema.define(version: 20150818213832) do
     t.string   "unconfirmed_email"
     t.boolean  "hide_no_ssh_key",               default: false
     t.string   "website_url",                   default: "",    null: false
-    t.string   "github_access_token"
-    t.string   "gitlab_access_token"
     t.string   "notification_email"
     t.boolean  "hide_no_password",              default: false
     t.boolean  "password_automatically_set",    default: false
-    t.string   "bitbucket_access_token"
-    t.string   "bitbucket_access_token_secret"
     t.string   "location"
     t.string   "encrypted_otp_secret"
     t.string   "encrypted_otp_secret_iv"
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb
index 42c93707ca..d8a7d29f1b 100644
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
@@ -5,7 +5,10 @@ module Gitlab
 
       def initialize(project)
         @project = project
-        @client = Client.new(project.creator.bitbucket_access_token, project.creator.bitbucket_access_token_secret)
+        import_data = project.import_data.try(:data)
+        bb_session = import_data["bb_session"] if import_data
+        @client = Client.new(bb_session["bitbucket_access_token"],
+                             bb_session["bitbucket_access_token_secret"])
         @formatter = Gitlab::ImportFormatter.new
       end
 
@@ -16,12 +19,12 @@ module Gitlab
 
         #Issues && Comments
         issues = client.issues(project_identifier)
-        
+
         issues["issues"].each do |issue|
           body = @formatter.author_line(issue["reported_by"]["username"], issue["content"])
-          
+
           comments = client.issue_comments(project_identifier, issue["local_id"])
-          
+
           if comments.any?
             body += @formatter.comments_header
           end
@@ -31,13 +34,13 @@ module Gitlab
           end
 
           project.issues.create!(
-            description: body, 
+            description: body,
             title: issue["title"],
             state: %w(resolved invalid duplicate wontfix).include?(issue["status"]) ? 'closed' : 'opened',
             author_id: gl_user_id(project, issue["reported_by"]["username"])
           )
         end
-        
+
         true
       end
 
diff --git a/lib/gitlab/bitbucket_import/key_adder.rb b/lib/gitlab/bitbucket_import/key_adder.rb
index 9931aa7e02..0b63f025d0 100644
--- a/lib/gitlab/bitbucket_import/key_adder.rb
+++ b/lib/gitlab/bitbucket_import/key_adder.rb
@@ -3,14 +3,15 @@ module Gitlab
     class KeyAdder
       attr_reader :repo, :current_user, :client
 
-      def initialize(repo, current_user)
+      def initialize(repo, current_user, access_params)
         @repo, @current_user = repo, current_user
-        @client = Client.new(current_user.bitbucket_access_token, current_user.bitbucket_access_token_secret)
+        @client = Client.new(access_params[:bitbucket_access_token],
+                             access_params[:bitbucket_access_token_secret])
       end
 
       def execute
         return false unless BitbucketImport.public_key.present?
-        
+
         project_identifier = "#{repo["owner"]}/#{repo["slug"]}"
         client.add_deploy_key(project_identifier, BitbucketImport.public_key)
 
diff --git a/lib/gitlab/bitbucket_import/key_deleter.rb b/lib/gitlab/bitbucket_import/key_deleter.rb
index 1a24a86fc3..f4dd393ad2 100644
--- a/lib/gitlab/bitbucket_import/key_deleter.rb
+++ b/lib/gitlab/bitbucket_import/key_deleter.rb
@@ -6,12 +6,15 @@ module Gitlab
       def initialize(project)
         @project = project
         @current_user = project.creator
-        @client = Client.new(current_user.bitbucket_access_token, current_user.bitbucket_access_token_secret)
+        import_data = project.import_data.try(:data)
+        bb_session = import_data["bb_session"] if import_data
+        @client = Client.new(bb_session["bitbucket_access_token"],
+                             bb_session["bitbucket_access_token_secret"])
       end
 
       def execute
         return false unless BitbucketImport.public_key.present?
-        
+
         client.delete_deploy_key(project.import_source, BitbucketImport.public_key)
 
         true
diff --git a/lib/gitlab/bitbucket_import/project_creator.rb b/lib/gitlab/bitbucket_import/project_creator.rb
index 54420e62c9..35e34d033e 100644
--- a/lib/gitlab/bitbucket_import/project_creator.rb
+++ b/lib/gitlab/bitbucket_import/project_creator.rb
@@ -1,16 +1,17 @@
 module Gitlab
   module BitbucketImport
     class ProjectCreator
-      attr_reader :repo, :namespace, :current_user
+      attr_reader :repo, :namespace, :current_user, :session_data
 
-      def initialize(repo, namespace, current_user)
+      def initialize(repo, namespace, current_user, session_data)
         @repo = repo
         @namespace = namespace
         @current_user = current_user
+        @session_data = session_data
       end
 
       def execute
-        ::Projects::CreateService.new(current_user,
+        project = ::Projects::CreateService.new(current_user,
           name: repo["name"],
           path: repo["slug"],
           description: repo["description"],
@@ -18,8 +19,11 @@ module Gitlab
           visibility_level: repo["is_private"] ? Gitlab::VisibilityLevel::PRIVATE : Gitlab::VisibilityLevel::PUBLIC,
           import_type: "bitbucket",
           import_source: "#{repo["owner"]}/#{repo["slug"]}",
-          import_url: "ssh://git@bitbucket.org/#{repo["owner"]}/#{repo["slug"]}.git"
+          import_url: "ssh://git@bitbucket.org/#{repo["owner"]}/#{repo["slug"]}.git",
         ).execute
+
+        project.create_import_data(data: { "bb_session" => session_data } )
+        project
       end
     end
   end
diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb
index 98039a76dc..8c106a6173 100644
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
@@ -5,7 +5,9 @@ module Gitlab
 
       def initialize(project)
         @project = project
-        @client = Client.new(project.creator.github_access_token)
+        import_data = project.import_data.try(:data)
+        github_session = import_data["github_session"] if import_data
+        @client = Client.new(github_session["github_access_token"])
         @formatter = Gitlab::ImportFormatter.new
       end
 
diff --git a/lib/gitlab/github_import/project_creator.rb b/lib/gitlab/github_import/project_creator.rb
index 2723eec933..8c27ebd1ce 100644
--- a/lib/gitlab/github_import/project_creator.rb
+++ b/lib/gitlab/github_import/project_creator.rb
@@ -1,16 +1,18 @@
 module Gitlab
   module GithubImport
     class ProjectCreator
-      attr_reader :repo, :namespace, :current_user
+      attr_reader :repo, :namespace, :current_user, :session_data
 
-      def initialize(repo, namespace, current_user)
+      def initialize(repo, namespace, current_user, session_data)
         @repo = repo
         @namespace = namespace
         @current_user = current_user
+        @session_data = session_data
       end
 
       def execute
-        ::Projects::CreateService.new(current_user,
+        project = ::Projects::CreateService.new(
+          current_user,
           name: repo.name,
           path: repo.name,
           description: repo.description,
@@ -18,8 +20,11 @@ module Gitlab
           visibility_level: repo.private ? Gitlab::VisibilityLevel::PRIVATE : Gitlab::VisibilityLevel::PUBLIC,
           import_type: "github",
           import_source: repo.full_name,
-          import_url: repo.clone_url.sub("https://", "https://#{current_user.github_access_token}@")
+          import_url: repo.clone_url.sub("https://", "https://#{@session_data[:github_access_token]}@")
         ).execute
+
+        project.create_import_data(data: { "github_session" => session_data } )
+        project
       end
     end
   end
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index c5304a0699..50594d2b24 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -5,7 +5,9 @@ module Gitlab
 
       def initialize(project)
         @project = project
-        @client = Client.new(project.creator.gitlab_access_token)
+        import_data = project.import_data.try(:data)
+        gitlab_session = import_data["gitlab_session"] if import_data
+        @client = Client.new(gitlab_session["gitlab_access_token"])
         @formatter = Gitlab::ImportFormatter.new
       end
 
@@ -14,12 +16,12 @@ module Gitlab
 
         #Issues && Comments
         issues = client.issues(project_identifier)
-        
+
         issues.each do |issue|
           body = @formatter.author_line(issue["author"]["name"], issue["description"])
-          
+
           comments = client.issue_comments(project_identifier, issue["id"])
-          
+
           if comments.any?
             body += @formatter.comments_header
           end
@@ -29,13 +31,13 @@ module Gitlab
           end
 
           project.issues.create!(
-            description: body, 
+            description: body,
             title: issue["title"],
             state: issue["state"],
             author_id: gl_user_id(project, issue["author"]["id"])
           )
         end
-        
+
         true
       end
 
diff --git a/lib/gitlab/gitlab_import/project_creator.rb b/lib/gitlab/gitlab_import/project_creator.rb
index f0d7141bf5..d9452de6a5 100644
--- a/lib/gitlab/gitlab_import/project_creator.rb
+++ b/lib/gitlab/gitlab_import/project_creator.rb
@@ -1,16 +1,17 @@
 module Gitlab
   module GitlabImport
     class ProjectCreator
-      attr_reader :repo, :namespace, :current_user
+      attr_reader :repo, :namespace, :current_user, :session_data
 
-      def initialize(repo, namespace, current_user)
+      def initialize(repo, namespace, current_user, session_data)
         @repo = repo
         @namespace = namespace
         @current_user = current_user
+        @session_data = session_data
       end
 
       def execute
-        ::Projects::CreateService.new(current_user,
+        project = ::Projects::CreateService.new(current_user,
           name: repo["name"],
           path: repo["path"],
           description: repo["description"],
@@ -18,8 +19,11 @@ module Gitlab
           visibility_level: repo["visibility_level"],
           import_type: "gitlab",
           import_source: repo["path_with_namespace"],
-          import_url: repo["http_url_to_repo"].sub("://", "://oauth2:#{current_user.gitlab_access_token}@")
+          import_url: repo["http_url_to_repo"].sub("://", "://oauth2:#{@session_data[:gitlab_access_token]}@")
         ).execute
+
+        project.create_import_data(data: { "gitlab_session" => session_data } )
+        project
       end
     end
   end
diff --git a/spec/controllers/import/bitbucket_controller_spec.rb b/spec/controllers/import/bitbucket_controller_spec.rb
index 89e595121a..81c03c9059 100644
--- a/spec/controllers/import/bitbucket_controller_spec.rb
+++ b/spec/controllers/import/bitbucket_controller_spec.rb
@@ -4,7 +4,15 @@ require_relative 'import_spec_helper'
 describe Import::BitbucketController do
   include ImportSpecHelper
 
-  let(:user) { create(:user, bitbucket_access_token: 'asd123', bitbucket_access_token_secret: "sekret") }
+  let(:user) { create(:user) }
+  let(:token) { "asdasd12345" }
+  let(:secret) { "sekrettt" }
+  let(:access_params) { { bitbucket_access_token: token, bitbucket_access_token_secret: secret } }
+
+  def assign_session_tokens
+    session[:bitbucket_access_token] = token
+    session[:bitbucket_access_token_secret] = secret
+  end
 
   before do
     sign_in(user)
@@ -17,8 +25,6 @@ describe Import::BitbucketController do
     end
 
     it "updates access token" do
-      token = "asdasd12345"
-      secret = "sekrettt"
       access_token = double(token: token, secret: secret)
       allow_any_instance_of(Gitlab::BitbucketImport::Client).
         to receive(:get_token).and_return(access_token)
@@ -26,8 +32,8 @@ describe Import::BitbucketController do
 
       get :callback
 
-      expect(user.reload.bitbucket_access_token).to eq(token)
-      expect(user.reload.bitbucket_access_token_secret).to eq(secret)
+      expect(session[:bitbucket_access_token]).to eq(token)
+      expect(session[:bitbucket_access_token_secret]).to eq(secret)
       expect(controller).to redirect_to(status_import_bitbucket_url)
     end
   end
@@ -35,6 +41,7 @@ describe Import::BitbucketController do
   describe "GET status" do
     before do
       @repo = OpenStruct.new(slug: 'vim', owner: 'asd')
+      assign_session_tokens
     end
 
     it "assigns variables" do
@@ -73,17 +80,18 @@ describe Import::BitbucketController do
 
     before do
       allow(Gitlab::BitbucketImport::KeyAdder).
-        to receive(:new).with(bitbucket_repo, user).
+        to receive(:new).with(bitbucket_repo, user, access_params).
         and_return(double(execute: true))
 
       stub_client(user: bitbucket_user, project: bitbucket_repo)
+      assign_session_tokens
     end
 
     context "when the repository owner is the Bitbucket user" do
       context "when the Bitbucket user and GitLab user's usernames match" do
         it "takes the current user's namespace" do
           expect(Gitlab::BitbucketImport::ProjectCreator).
-            to receive(:new).with(bitbucket_repo, user.namespace, user).
+            to receive(:new).with(bitbucket_repo, user.namespace, user, access_params).
             and_return(double(execute: true))
 
           post :create, format: :js
@@ -95,7 +103,7 @@ describe Import::BitbucketController do
 
         it "takes the current user's namespace" do
           expect(Gitlab::BitbucketImport::ProjectCreator).
-            to receive(:new).with(bitbucket_repo, user.namespace, user).
+            to receive(:new).with(bitbucket_repo, user.namespace, user, access_params).
             and_return(double(execute: true))
 
           post :create, format: :js
@@ -116,7 +124,7 @@ describe Import::BitbucketController do
         context "when the namespace is owned by the GitLab user" do
           it "takes the existing namespace" do
             expect(Gitlab::BitbucketImport::ProjectCreator).
-              to receive(:new).with(bitbucket_repo, existing_namespace, user).
+              to receive(:new).with(bitbucket_repo, existing_namespace, user, access_params).
               and_return(double(execute: true))
 
             post :create, format: :js
@@ -150,7 +158,7 @@ describe Import::BitbucketController do
 
         it "takes the new namespace" do
           expect(Gitlab::BitbucketImport::ProjectCreator).
-            to receive(:new).with(bitbucket_repo, an_instance_of(Group), user).
+            to receive(:new).with(bitbucket_repo, an_instance_of(Group), user, access_params).
             and_return(double(execute: true))
 
           post :create, format: :js
diff --git a/spec/controllers/import/github_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb
index 0bc14059a3..766be578f7 100644
--- a/spec/controllers/import/github_controller_spec.rb
+++ b/spec/controllers/import/github_controller_spec.rb
@@ -4,7 +4,13 @@ require_relative 'import_spec_helper'
 describe Import::GithubController do
   include ImportSpecHelper
 
-  let(:user) { create(:user, github_access_token: 'asd123') }
+  let(:user) { create(:user) }
+  let(:token) { "asdasd12345" }
+  let(:access_params) { { github_access_token: token } }
+
+  def assign_session_token
+    session[:github_access_token] = token
+  end
 
   before do
     sign_in(user)
@@ -20,7 +26,7 @@ describe Import::GithubController do
 
       get :callback
 
-      expect(user.reload.github_access_token).to eq(token)
+      expect(session[:github_access_token]).to eq(token)
       expect(controller).to redirect_to(status_import_github_url)
     end
   end
@@ -30,6 +36,7 @@ describe Import::GithubController do
       @repo = OpenStruct.new(login: 'vim', full_name: 'asd/vim')
       @org = OpenStruct.new(login: 'company')
       @org_repo = OpenStruct.new(login: 'company', full_name: 'company/repo')
+      assign_session_token
     end
 
     it "assigns variables" do
@@ -66,13 +73,14 @@ describe Import::GithubController do
 
     before do
       stub_client(user: github_user, repo: github_repo)
+      assign_session_token
     end
 
     context "when the repository owner is the GitHub user" do
       context "when the GitHub user and GitLab user's usernames match" do
         it "takes the current user's namespace" do
           expect(Gitlab::GithubImport::ProjectCreator).
-            to receive(:new).with(github_repo, user.namespace, user).
+            to receive(:new).with(github_repo, user.namespace, user, access_params).
             and_return(double(execute: true))
 
           post :create, format: :js
@@ -84,7 +92,7 @@ describe Import::GithubController do
 
         it "takes the current user's namespace" do
           expect(Gitlab::GithubImport::ProjectCreator).
-            to receive(:new).with(github_repo, user.namespace, user).
+            to receive(:new).with(github_repo, user.namespace, user, access_params).
             and_return(double(execute: true))
 
           post :create, format: :js
@@ -97,6 +105,7 @@ describe Import::GithubController do
 
       before do
         github_repo.owner = OpenStruct.new(login: other_username)
+        assign_session_token
       end
 
       context "when a namespace with the GitHub user's username already exists" do
@@ -105,7 +114,7 @@ describe Import::GithubController do
         context "when the namespace is owned by the GitLab user" do
           it "takes the existing namespace" do
             expect(Gitlab::GithubImport::ProjectCreator).
-              to receive(:new).with(github_repo, existing_namespace, user).
+              to receive(:new).with(github_repo, existing_namespace, user, access_params).
               and_return(double(execute: true))
 
             post :create, format: :js
@@ -139,7 +148,7 @@ describe Import::GithubController do
 
         it "takes the new namespace" do
           expect(Gitlab::GithubImport::ProjectCreator).
-            to receive(:new).with(github_repo, an_instance_of(Group), user).
+            to receive(:new).with(github_repo, an_instance_of(Group), user, access_params).
             and_return(double(execute: true))
 
           post :create, format: :js
diff --git a/spec/controllers/import/gitlab_controller_spec.rb b/spec/controllers/import/gitlab_controller_spec.rb
index 4bc67c8670..198d006af7 100644
--- a/spec/controllers/import/gitlab_controller_spec.rb
+++ b/spec/controllers/import/gitlab_controller_spec.rb
@@ -4,7 +4,13 @@ require_relative 'import_spec_helper'
 describe Import::GitlabController do
   include ImportSpecHelper
 
-  let(:user) { create(:user, gitlab_access_token: 'asd123') }
+  let(:user) { create(:user) }
+  let(:token) { "asdasd12345" }
+  let(:access_params) { { gitlab_access_token: token } }
+
+  def assign_session_token
+    session[:gitlab_access_token] = token
+  end
 
   before do
     sign_in(user)
@@ -13,14 +19,13 @@ describe Import::GitlabController do
 
   describe "GET callback" do
     it "updates access token" do
-      token = "asdasd12345"
       allow_any_instance_of(Gitlab::GitlabImport::Client).
         to receive(:get_token).and_return(token)
       stub_omniauth_provider('gitlab')
 
       get :callback
 
-      expect(user.reload.gitlab_access_token).to eq(token)
+      expect(session[:gitlab_access_token]).to eq(token)
       expect(controller).to redirect_to(status_import_gitlab_url)
     end
   end
@@ -28,6 +33,7 @@ describe Import::GitlabController do
   describe "GET status" do
     before do
       @repo = OpenStruct.new(path: 'vim', path_with_namespace: 'asd/vim')
+      assign_session_token
     end
 
     it "assigns variables" do
@@ -67,13 +73,14 @@ describe Import::GitlabController do
 
     before do
       stub_client(user: gitlab_user, project: gitlab_repo)
+      assign_session_token
     end
 
     context "when the repository owner is the GitLab.com user" do
       context "when the GitLab.com user and GitLab server user's usernames match" do
         it "takes the current user's namespace" do
           expect(Gitlab::GitlabImport::ProjectCreator).
-            to receive(:new).with(gitlab_repo, user.namespace, user).
+            to receive(:new).with(gitlab_repo, user.namespace, user, access_params).
             and_return(double(execute: true))
 
           post :create, format: :js
@@ -85,7 +92,7 @@ describe Import::GitlabController do
 
         it "takes the current user's namespace" do
           expect(Gitlab::GitlabImport::ProjectCreator).
-            to receive(:new).with(gitlab_repo, user.namespace, user).
+            to receive(:new).with(gitlab_repo, user.namespace, user, access_params).
             and_return(double(execute: true))
 
           post :create, format: :js
@@ -98,6 +105,7 @@ describe Import::GitlabController do
 
       before do
         gitlab_repo["namespace"]["path"] = other_username
+        assign_session_token
       end
 
       context "when a namespace with the GitLab.com user's username already exists" do
@@ -106,7 +114,7 @@ describe Import::GitlabController do
         context "when the namespace is owned by the GitLab server user" do
           it "takes the existing namespace" do
             expect(Gitlab::GitlabImport::ProjectCreator).
-              to receive(:new).with(gitlab_repo, existing_namespace, user).
+              to receive(:new).with(gitlab_repo, existing_namespace, user, access_params).
               and_return(double(execute: true))
 
             post :create, format: :js
@@ -140,7 +148,7 @@ describe Import::GitlabController do
 
         it "takes the new namespace" do
           expect(Gitlab::GitlabImport::ProjectCreator).
-            to receive(:new).with(gitlab_repo, an_instance_of(Group), user).
+            to receive(:new).with(gitlab_repo, an_instance_of(Group), user, access_params).
             and_return(double(execute: true))
 
           post :create, format: :js
diff --git a/spec/lib/gitlab/bitbucket_import/project_creator_spec.rb b/spec/lib/gitlab/bitbucket_import/project_creator_spec.rb
index f8958c9bab..0e826a319e 100644
--- a/spec/lib/gitlab/bitbucket_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/project_creator_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::BitbucketImport::ProjectCreator do
-  let(:user) { create(:user, bitbucket_access_token: "asdffg", bitbucket_access_token_secret: "sekret") }
+  let(:user) { create(:user) }
   let(:repo) do
     {
       name: 'Vim',
@@ -11,6 +11,9 @@ describe Gitlab::BitbucketImport::ProjectCreator do
     }.with_indifferent_access
   end
   let(:namespace){ create(:group, owner: user) }
+  let(:token) { "asdasd12345" }
+  let(:secret) { "sekrettt" }
+  let(:access_params) { { bitbucket_access_token: token, bitbucket_access_token_secret: secret } }
 
   before do
     namespace.add_owner(user)
@@ -19,7 +22,7 @@ describe Gitlab::BitbucketImport::ProjectCreator do
   it 'creates project' do
     allow_any_instance_of(Project).to receive(:add_import_job)
 
-    project_creator = Gitlab::BitbucketImport::ProjectCreator.new(repo, namespace, user)
+    project_creator = Gitlab::BitbucketImport::ProjectCreator.new(repo, namespace, user, access_params)
     project = project_creator.execute
 
     expect(project.import_url).to eq("ssh://git@bitbucket.org/asd/vim.git")
diff --git a/spec/lib/gitlab/github_import/project_creator_spec.rb b/spec/lib/gitlab/github_import/project_creator_spec.rb
index 4fe7bd3b77..ca61d3c523 100644
--- a/spec/lib/gitlab/github_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/github_import/project_creator_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::GithubImport::ProjectCreator do
-  let(:user) { create(:user, github_access_token: "asdffg") }
+  let(:user) { create(:user) }
   let(:repo) do
     OpenStruct.new(
       login: 'vim',
@@ -13,6 +13,8 @@ describe Gitlab::GithubImport::ProjectCreator do
     )
   end
   let(:namespace){ create(:group, owner: user) }
+  let(:token) { "asdffg" }
+  let(:access_params) { { github_access_token: token } }
 
   before do
     namespace.add_owner(user)
@@ -21,7 +23,7 @@ describe Gitlab::GithubImport::ProjectCreator do
   it 'creates project' do
     allow_any_instance_of(Project).to receive(:add_import_job)
 
-    project_creator = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, user)
+    project_creator = Gitlab::GithubImport::ProjectCreator.new(repo, namespace, user, access_params)
     project = project_creator.execute
 
     expect(project.import_url).to eq("https://asdffg@gitlab.com/asd/vim.git")
diff --git a/spec/lib/gitlab/gitlab_import/project_creator_spec.rb b/spec/lib/gitlab/gitlab_import/project_creator_spec.rb
index 938d08396f..2d8923d14b 100644
--- a/spec/lib/gitlab/gitlab_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/gitlab_import/project_creator_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::GitlabImport::ProjectCreator do
-  let(:user) { create(:user, gitlab_access_token: "asdffg") }
+  let(:user) { create(:user) }
   let(:repo) do
     {
       name: 'vim',
@@ -13,6 +13,8 @@ describe Gitlab::GitlabImport::ProjectCreator do
     }.with_indifferent_access
   end
   let(:namespace){ create(:group, owner: user) }
+  let(:token) { "asdffg" }
+  let(:access_params) { { gitlab_access_token: token } }
 
   before do
     namespace.add_owner(user)
@@ -21,7 +23,7 @@ describe Gitlab::GitlabImport::ProjectCreator do
   it 'creates project' do
     allow_any_instance_of(Project).to receive(:add_import_job)
 
-    project_creator = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, user)
+    project_creator = Gitlab::GitlabImport::ProjectCreator.new(repo, namespace, user, access_params)
     project = project_creator.execute
 
     expect(project.import_url).to eq("https://oauth2:asdffg@gitlab.com/asd/vim.git")

From 4016a4577c6f41354e9261e08fe94d917bc9edc2 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 23 Aug 2015 13:31:02 -0700
Subject: [PATCH 087/111] Only include base URL in OmniAuth full_host parameter

Closes #2335
---
 CHANGELOG                         |  1 +
 config/initializers/1_settings.rb | 26 ++++++++++++++++++--------
 config/initializers/7_omniauth.rb |  2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 44ffb56d5f..ae7a8dba9d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
+  - Only include base URL in OmniAuth full_host parameter (Stan Hu)
   - Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
   - Remove satellites
   - Better performance for web editor (switched from satellites to rugged)
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index bd26ac1da2..c47e5dab27 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -8,7 +8,7 @@ class Settings < Settingslogic
     def gitlab_on_standard_port?
       gitlab.port.to_i == (gitlab.https ? 443 : 80)
     end
-    
+
     # get host without www, thanks to http://stackoverflow.com/a/6674363/1233435
     def get_host_without_www(url)
       url = URI.encode(url)
@@ -32,14 +32,12 @@ class Settings < Settingslogic
       end
     end
 
+    def build_base_gitlab_url
+      base_gitlab_url.join('')
+    end
+
     def build_gitlab_url
-      custom_port = gitlab_on_standard_port? ? nil : ":#{gitlab.port}"
-      [ gitlab.protocol,
-        "://",
-        gitlab.host,
-        custom_port,
-        gitlab.relative_url_root
-      ].join('')
+      (base_gitlab_url + [gitlab.relative_url_root]).join('')
     end
 
     # check that values in `current` (string or integer) is a contant in `modul`.
@@ -64,6 +62,17 @@ class Settings < Settingslogic
       end
       value
     end
+
+    private
+
+    def base_gitlab_url
+      custom_port = gitlab_on_standard_port? ? nil : ":#{gitlab.port}"
+      [ gitlab.protocol,
+        "://",
+        gitlab.host,
+        custom_port
+      ]
+    end
   end
 end
 
@@ -123,6 +132,7 @@ Settings.gitlab['email_enabled'] ||= true if Settings.gitlab['email_enabled'].ni
 Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
 Settings.gitlab['email_display_name'] ||= "GitLab"
 Settings.gitlab['email_reply_to'] ||= "noreply@#{Settings.gitlab.host}"
+Settings.gitlab['base_url']   ||= Settings.send(:build_base_gitlab_url)
 Settings.gitlab['url']        ||= Settings.send(:build_gitlab_url)
 Settings.gitlab['user']       ||= 'git'
 Settings.gitlab['user_home']  ||= begin
diff --git a/config/initializers/7_omniauth.rb b/config/initializers/7_omniauth.rb
index 7f73546ac8..70ed10e827 100644
--- a/config/initializers/7_omniauth.rb
+++ b/config/initializers/7_omniauth.rb
@@ -11,7 +11,7 @@ if Gitlab::LDAP::Config.enabled?
   end
 end
 
-OmniAuth.config.full_host = Settings.gitlab['url']
+OmniAuth.config.full_host = Settings.gitlab['base_url']
 OmniAuth.config.allowed_request_methods = [:post]
 #In case of auto sign-in, the GET method is used (users don't get to click on a button)
 OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present?

From 6318a7631131074d5d65775f92097b9c1e3f04d6 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sun, 23 Aug 2015 16:52:29 -0700
Subject: [PATCH 088/111] Upgrade browser gem to 1.0.0 to avoid warning in IE11
 compatibilty mode

Closes #2271
---
 CHANGELOG    | 1 +
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7eb6ab81dd..99df3c7a83 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
+  - Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode (Stan Hu)
   - Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
   - Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
   - Remove satellites
diff --git a/Gemfile b/Gemfile
index 3aa3c72e08..fa54a72f02 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'rqrcode-rails3'
 gem 'attr_encrypted', '1.3.4'
 
 # Browser detection
-gem "browser", '~> 0.8.0'
+gem "browser", '~> 1.0.0'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
diff --git a/Gemfile.lock b/Gemfile.lock
index 5278fe243a..a7cfe6b751 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -76,7 +76,7 @@ GEM
       ruby_parser (~> 3.5.0)
       sass (~> 3.0)
       terminal-table (~> 1.4)
-    browser (0.8.0)
+    browser (1.0.0)
     builder (3.2.2)
     byebug (3.2.0)
       columnize (~> 0.8)
@@ -755,7 +755,7 @@ DEPENDENCIES
   binding_of_caller
   bootstrap-sass (~> 3.0)
   brakeman
-  browser (~> 0.8.0)
+  browser (~> 1.0.0)
   byebug
   cal-heatmap-rails (~> 0.0.1)
   capybara (~> 2.4.0)

From 56527b63e8a09e0fe4967eabf08638d853e6b2b5 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Thu, 13 Aug 2015 17:48:21 +0300
Subject: [PATCH 089/111] Ability to search milestones

---
 CHANGELOG                                     |  1 +
 app/controllers/search_controller.rb          |  4 ++--
 app/models/milestone.rb                       |  9 ++++++++-
 app/views/search/_category.html.haml          | 14 ++++++++++++++
 app/views/search/results/_milestone.html.haml |  9 +++++++++
 features/search.feature                       | 15 +++++++++++++++
 features/steps/search.rb                      | 11 +++++++++++
 lib/gitlab/search_results.rb                  | 14 +++++++++++++-
 8 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 app/views/search/results/_milestone.html.haml

diff --git a/CHANGELOG b/CHANGELOG
index 7eb6ab81dd..7ec1dabcf9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ v 8.0.0 (unreleased)
   - Allow configuration of import sources for new projects (Artem Sidorenko)
   - Search for comments should be case insensetive
   - Create cross-reference for closing references on commits pushed to non-default branches (Maël Valais)
+  - Ability to search milestones
 
 v 7.14.0
   - Fix bug where non-project members of the target project could set labels on new merge requests.
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 4e2ea6c571..eb0408a95e 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -23,7 +23,7 @@ class SearchController < ApplicationController
 
     @search_results =
       if @project
-        unless %w(blobs notes issues merge_requests wiki_blobs).
+        unless %w(blobs notes issues merge_requests milestones wiki_blobs).
           include?(@scope)
           @scope = 'blobs'
         end
@@ -36,7 +36,7 @@ class SearchController < ApplicationController
 
         Search::SnippetService.new(current_user, params).execute
       else
-        unless %w(projects issues merge_requests).include?(@scope)
+        unless %w(projects issues merge_requests milestones).include?(@scope)
           @scope = 'projects'
         end
         Search::GlobalService.new(current_user, params).execute
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index d28f3c8d3f..c6aff6f709 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -47,6 +47,13 @@ class Milestone < ActiveRecord::Base
     state :active
   end
 
+  class << self
+    def search(query)
+      query = "%#{query}%"
+      where("title like ? or description like ?", query, query)
+    end
+  end
+
   def expired?
     if due_date
       due_date.past?
@@ -54,7 +61,7 @@ class Milestone < ActiveRecord::Base
       false
     end
   end
-
+  
   def open_items_count
     self.issues.opened.count + self.merge_requests.opened.count
   end
diff --git a/app/views/search/_category.html.haml b/app/views/search/_category.html.haml
index 154332cb9a..a75cd7bd80 100644
--- a/app/views/search/_category.html.haml
+++ b/app/views/search/_category.html.haml
@@ -21,6 +21,13 @@
           Merge requests
           %span.badge
             = @search_results.merge_requests_count
+    %li{class: ("active" if @scope == 'milestones')}
+      = link_to search_filter_path(scope: 'milestones') do
+        = icon('clock-o fw')
+        %span
+          Milestones
+          %span.badge
+            = @search_results.milestones_count
     %li{class: ("active" if @scope == 'notes')}
       = link_to search_filter_path(scope: 'notes') do
         = icon('comments fw')
@@ -74,4 +81,11 @@
           Merge requests
           %span.badge
             = @search_results.merge_requests_count
+    %li{class: ("active" if @scope == 'milestones')}
+      = link_to search_filter_path(scope: 'milestones') do
+        = icon('clock-o fw')
+        %span
+          Milestones
+          %span.badge
+            = @search_results.milestones_count
 
diff --git a/app/views/search/results/_milestone.html.haml b/app/views/search/results/_milestone.html.haml
new file mode 100644
index 0000000000..e0b18733d7
--- /dev/null
+++ b/app/views/search/results/_milestone.html.haml
@@ -0,0 +1,9 @@
+.search-result-row
+  %h4
+    = link_to [milestone.project.namespace.becomes(Namespace), milestone.project, milestone] do
+      %span.term.str-truncated= milestone.title
+
+  - if milestone.description.present?
+    .description.term
+      = preserve do
+        = search_md_sanitize(markdown(milestone.description))
\ No newline at end of file
diff --git a/features/search.feature b/features/search.feature
index 1608e82467..a9234c1a61 100644
--- a/features/search.feature
+++ b/features/search.feature
@@ -23,6 +23,13 @@ Feature: Search
     Then I should see "Foo" link in the search results
     And I should not see "Bar" link in the search results
 
+  Scenario: I should see milestones I am looking for
+    And project has milestones
+    When I search for "Foo"
+    When I click "Milestones" link
+    Then I should see "Foo" link in the search results
+    And I should not see "Bar" link in the search results
+
   Scenario: I should see project code I am looking for
     When I click project "Shop" link
     And I search for "rspec"
@@ -44,6 +51,14 @@ Feature: Search
     Then I should see "Foo" link in the search results
     And I should not see "Bar" link in the search results
 
+  Scenario: I should see project milestones
+    And project has milestones
+    When I click project "Shop" link
+    And I search for "Foo"
+    And I click "Milestones" link
+    Then I should see "Foo" link in the search results
+    And I should not see "Bar" link in the search results
+
   Scenario: I should see Wiki blobs
     And project has Wiki content
     When I click project "Shop" link
diff --git a/features/steps/search.rb b/features/steps/search.rb
index 87893aa020..79273cbad9 100644
--- a/features/steps/search.rb
+++ b/features/steps/search.rb
@@ -41,6 +41,12 @@ class Spinach::Features::Search < Spinach::FeatureSteps
     end
   end
 
+  step 'I click "Milestones" link' do
+    page.within '.search-filter' do
+      click_link 'Milestones'
+    end
+  end
+
   step 'I click "Wiki" link' do
     page.within '.search-filter' do
       click_link 'Wiki'
@@ -72,6 +78,11 @@ class Spinach::Features::Search < Spinach::FeatureSteps
     create(:merge_request, :simple, title: "Bar", source_project: project, target_project: project)
   end
 
+  step 'project has milestones' do
+    create(:milestone, title: "Foo", project: project)
+    create(:milestone, title: "Bar", project: project)
+  end
+
   step 'I should see "Foo" link in the search results' do
     page.within('.results') do
       find(:css, '.search-results').should have_link 'Foo'
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index 06245374bc..2ab2d4af79 100644
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -19,13 +19,15 @@ module Gitlab
         issues.page(page).per(per_page)
       when 'merge_requests'
         merge_requests.page(page).per(per_page)
+      when 'milestones'
+        milestones.page(page).per(per_page)
       else
         Kaminari.paginate_array([]).page(page).per(per_page)
       end
     end
 
     def total_count
-      @total_count ||= projects_count + issues_count + merge_requests_count
+      @total_count ||= projects_count + issues_count + merge_requests_count + milestones_count
     end
 
     def projects_count
@@ -40,6 +42,10 @@ module Gitlab
       @merge_requests_count ||= merge_requests.count
     end
 
+    def milestones_count
+      @milestones_count ||= milestones.count
+    end
+
     def empty?
       total_count.zero?
     end
@@ -60,6 +66,12 @@ module Gitlab
       issues.order('updated_at DESC')
     end
 
+    def milestones
+      milestones = Milestone.where(project_id: limit_project_ids)
+      milestones = milestones.search(query)
+      milestones.order('updated_at DESC')
+    end
+
     def merge_requests
       merge_requests = MergeRequest.in_projects(limit_project_ids)
       if query =~ /[#!](\d+)\z/

From 19f478e00d1508728d0170ac60defed0535a0789 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 24 Aug 2015 07:46:06 -0700
Subject: [PATCH 090/111] Fix Error 500 in API when accessing a group that has
 an avatar

Closes #2340
---
 CHANGELOG                        | 1 +
 app/models/group.rb              | 1 +
 spec/requests/api/groups_spec.rb | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7eb6ab81dd..72b7317a9c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
+  - Fix Error 500 in API when accessing a group that has an avatar (Stan Hu)
   - Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
   - Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
   - Remove satellites
diff --git a/app/models/group.rb b/app/models/group.rb
index 4ff610f8e9..9cd146bb73 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -17,6 +17,7 @@ require 'carrierwave/orm/activerecord'
 require 'file_size_validator'
 
 class Group < Namespace
+  include Gitlab::ConfigHelper
   include Referable
 
   has_many :group_members, dependent: :destroy, as: :source, class_name: 'GroupMember'
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 1d5b4f6f36..13cced8187 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -7,7 +7,8 @@ describe API::API, api: true  do
   let(:user2) { create(:user) }
   let(:user3) { create(:user) }
   let(:admin) { create(:admin) }
-  let!(:group1) { create(:group) }
+  let(:avatar_file_path) { File.join(Rails.root, 'spec', 'fixtures', 'banana_sample.gif') }
+  let!(:group1) { create(:group, avatar: File.open(avatar_file_path)) }
   let!(:group2) { create(:group) }
 
   before do

From 208888038375d48cc91cf481a3f8509d63d8e1ad Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Mon, 24 Aug 2015 10:57:35 -0700
Subject: [PATCH 091/111] Ignore empty incoming messages.

---
 app/mailers/email_rejection_mailer.rb | 2 ++
 app/workers/email_receiver_worker.rb  | 2 ++
 config/mail_room.yml.example          | 2 ++
 doc/reply_by_email/README.md          | 4 ++++
 4 files changed, 10 insertions(+)

diff --git a/app/mailers/email_rejection_mailer.rb b/app/mailers/email_rejection_mailer.rb
index 89aceda82d..883f1c73ad 100644
--- a/app/mailers/email_rejection_mailer.rb
+++ b/app/mailers/email_rejection_mailer.rb
@@ -3,6 +3,8 @@ class EmailRejectionMailer < BaseMailer
     @reason = reason
     @original_message = Mail::Message.new(original_raw)
 
+    return unless @original_message.from
+
     headers = {
       to: @original_message.from,
       subject: "[Rejected] #{@original_message.subject}"
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb
index a588a1f45e..8cfb96ef37 100644
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
@@ -18,6 +18,8 @@ class EmailReceiverWorker
   def handle_failure(raw, e)
     Rails.logger.warn("Email can not be processed: #{e}\n\n#{raw}")
 
+    return unless raw.present?
+
     can_retry = false
     reason = nil
 
diff --git a/config/mail_room.yml.example b/config/mail_room.yml.example
index 28366eb739..dd8edfc42e 100644
--- a/config/mail_room.yml.example
+++ b/config/mail_room.yml.example
@@ -14,6 +14,8 @@
     # :name: "inbox"
     # # Always "sidekiq".
     # :delivery_method: sidekiq
+    # # Always true.
+    # :delete_after_delivery: true
     # :delivery_options:
     #   # The URL to the Redis server used by Sidekiq. Should match the URL in config/resque.yml.
     #   :redis_url: redis://localhost:6379
diff --git a/doc/reply_by_email/README.md b/doc/reply_by_email/README.md
index 91eea956e5..5d36f5121d 100644
--- a/doc/reply_by_email/README.md
+++ b/doc/reply_by_email/README.md
@@ -59,6 +59,8 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`. If you'
         :name: "inbox"
         # Always "sidekiq".
         :delivery_method: sidekiq
+        # Always true.
+        :delete_after_delivery: true
         :delivery_options:
           # The URL to the Redis server used by Sidekiq. Should match the URL in config/resque.yml.
           :redis_url: redis://localhost:6379
@@ -144,6 +146,8 @@ TODO
         :name: "inbox"
         # Always "sidekiq".
         :delivery_method: sidekiq
+        # Always true.
+        :delete_after_delivery: true
         :delivery_options:
           # The URL to the Redis server used by Sidekiq. Should match the URL in config/resque.yml.
           :redis_url: redis://localhost:6379

From eeac2aafbc444b1fe5ada430b15058b30628b364 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 24 Aug 2015 12:07:14 -0700
Subject: [PATCH 092/111] Move full_host fix changelog entry to 7.14.1

[ci skip]
---
 CHANGELOG | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index f22c337b72..5137879d31 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,6 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.0.0 (unreleased)
   - Fix Error 500 in API when accessing a group that has an avatar (Stan Hu)
   - Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
-  - Only include base URL in OmniAuth full_host parameter (Stan Hu)
   - Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
   - Remove satellites
   - Better performance for web editor (switched from satellites to rugged)
@@ -15,6 +14,9 @@ v 8.0.0 (unreleased)
   - Create cross-reference for closing references on commits pushed to non-default branches (Maël Valais)
   - Ability to search milestones
 
+v 7.14.1 (unreleased)
+  - Only include base URL in OmniAuth full_host parameter (Stan Hu)
+
 v 7.14.0
   - Fix bug where non-project members of the target project could set labels on new merge requests.
   - Update default robots.txt rules to disallow crawling of irrelevant pages (Ben Bodenmiller)

From 451873963a4c41e0edeb066545cafcb9a0df9c19 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 24 Aug 2015 12:27:02 -0700
Subject: [PATCH 093/111] Move changelog entry to 7.14.1

[ci skip]
---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5137879d31..5940d586d8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,6 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
-  - Fix Error 500 in API when accessing a group that has an avatar (Stan Hu)
   - Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
   - Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
   - Remove satellites
@@ -16,6 +15,7 @@ v 8.0.0 (unreleased)
 
 v 7.14.1 (unreleased)
   - Only include base URL in OmniAuth full_host parameter (Stan Hu)
+  - Fix Error 500 in API when accessing a group that has an avatar (Stan Hu)
 
 v 7.14.0
   - Fix bug where non-project members of the target project could set labels on new merge requests.

From 646c1f0324650c5736e85db0deb55dceb943fa7a Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 24 Aug 2015 18:56:01 -0700
Subject: [PATCH 094/111] Re-enable the "links with adjacent text"
 UserReferenceFilter spec

---
 spec/lib/gitlab/markdown/user_reference_filter_spec.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
index a5405e14a7..02d923b036 100644
--- a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
@@ -121,7 +121,6 @@ module Gitlab::Markdown
     end
 
     it 'links with adjacent text' do
-      skip "TODO (rspeicher): Re-enable when usernames can't end in periods."
       doc = filter("Mention me (#{reference}.)")
       expect(doc.to_html).to match(/\(<a.+>#{reference}<\/a>\.\)/)
     end

From 3bee4a6712a654abeba4ce07eb17235c3240b487 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 24 Aug 2015 23:35:26 -0700
Subject: [PATCH 095/111] Fix "Reload with full diff" URL button in compare
 branch view

This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
---
 CHANGELOG                                   | 1 +
 app/views/projects/diffs/_warning.html.haml | 2 +-
 features/project/commits/commits.feature    | 1 +
 features/steps/project/commits/commits.rb   | 6 ++++++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7eb6ab81dd..4e16536269 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
+  - Fix "Reload with full diff" URL button in compare branch view (Stan Hu)
   - Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
   - Only show recent push event if the branch still exists or a recent merge request has not been created (Stan Hu)
   - Remove satellites
diff --git a/app/views/projects/diffs/_warning.html.haml b/app/views/projects/diffs/_warning.html.haml
index caed0e69dc..f99bc9a85e 100644
--- a/app/views/projects/diffs/_warning.html.haml
+++ b/app/views/projects/diffs/_warning.html.haml
@@ -3,7 +3,7 @@
     Too many changes to show.
     .pull-right
       - unless diff_hard_limit_enabled?
-        = link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: :html)), class: "btn btn-sm btn-warning"
+        = link_to "Reload with full diff", url_for(params.merge(force_show_diff: true, format: nil)), class: "btn btn-sm btn-warning"
 
       - if current_controller?(:commit) or current_controller?(:merge_requests)
         - if current_controller?(:commit)
diff --git a/features/project/commits/commits.feature b/features/project/commits/commits.feature
index c4b206edc9..3ebc8a39aa 100644
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
@@ -41,6 +41,7 @@ Feature: Project Commits
   Scenario: I browse big commit
     Given I visit big commit page
     Then I see big commit warning
+    And I see "Reload with full diff" link
 
   Scenario: I browse a commit with an image
     Given I visit a commit with an image that changed
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index e6330ec457..a8532cc18d 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -79,6 +79,12 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
     expect(page).to have_content "Too many changes"
   end
 
+  step 'I see "Reload with full diff" link' do
+    link = find_link('Reload with full diff')
+    expect(link[:href]).to end_with('?force_show_diff=true')
+    expect(link[:href]).not_to include('.html')
+  end
+
   step 'I visit a commit with an image that changed' do
     visit namespace_project_commit_path(@project.namespace, @project, sample_image_commit.id)
   end

From e02b7bf4435d0ff151239ac790849994066c0bc1 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 25 Aug 2015 10:52:10 +0200
Subject: [PATCH 096/111] Improve abuse reports management

* Link to user profile instead of user admin page
* One button for remove user and report
* Remove user and report with page reloading

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/javascripts/application.js.coffee          |  6 ++++++
 app/controllers/admin/abuse_reports_controller.rb     |  9 +++++++--
 app/views/admin/abuse_reports/_abuse_report.html.haml | 11 +++++++----
 app/views/admin/abuse_reports/index.html.haml         |  2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index bb0a0c51fd..c263912b7e 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -116,6 +116,12 @@ $ ->
   $('.remove-row').bind 'ajax:success', ->
     $(this).closest('li').fadeOut()
 
+  $('.js-remove-tr').bind 'ajax:before', ->
+    $(this).hide()
+
+  $('.js-remove-tr').bind 'ajax:success', ->
+    $(this).closest('tr').fadeOut()
+
   # Initialize select2 selects
   $('select.select2').select2(width: 'resolve', dropdownAutoWidth: true)
 
diff --git a/app/controllers/admin/abuse_reports_controller.rb b/app/controllers/admin/abuse_reports_controller.rb
index 34f37bca4a..38a5a9fca0 100644
--- a/app/controllers/admin/abuse_reports_controller.rb
+++ b/app/controllers/admin/abuse_reports_controller.rb
@@ -4,8 +4,13 @@ class Admin::AbuseReportsController < Admin::ApplicationController
   end
 
   def destroy
-    AbuseReport.find(params[:id]).destroy
+    abuse_report = AbuseReport.find(params[:id])
 
-    redirect_to admin_abuse_reports_path, notice: 'Report was removed'
+    if params[:remove_user]
+      abuse_report.user.destroy
+    end
+
+    abuse_report.destroy
+    render nothing: true
   end
 end
diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml
index 4449721ae3..785ce4b759 100644
--- a/app/views/admin/abuse_reports/_abuse_report.html.haml
+++ b/app/views/admin/abuse_reports/_abuse_report.html.haml
@@ -3,7 +3,7 @@
 %tr
   %td
     - if reporter
-      = link_to reporter.name, [:admin, reporter]
+      = link_to reporter.name, reporter
     - else
       (removed)
   %td
@@ -12,12 +12,15 @@
     = abuse_report.message
   %td
     - if user
-      = link_to user.name, [:admin, user]
+      = link_to user.name, user
     - else
       (removed)
   %td
     - if user
-      = link_to 'Block', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs btn-warning"
-      = link_to 'Remove user', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-xs btn-remove"
+      = link_to 'Remove user & report', admin_abuse_report_path(abuse_report, remove_user: true),
+        data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" }, remote: true, method: :delete, class: "btn btn-xs btn-remove js-remove-tr"
+
   %td
+    - if user
+      = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs btn-warning"
     = link_to 'Remove report', [:admin, abuse_report], method: :delete, class: "btn btn-xs btn-close"
diff --git a/app/views/admin/abuse_reports/index.html.haml b/app/views/admin/abuse_reports/index.html.haml
index 4a25848f15..2e8746146d 100644
--- a/app/views/admin/abuse_reports/index.html.haml
+++ b/app/views/admin/abuse_reports/index.html.haml
@@ -9,7 +9,7 @@
         %th Reported at
         %th Message
         %th User
-        %th
+        %th Primary action
         %th
     = render @abuse_reports
   = paginate @abuse_reports

From 13f8fc97843d3bb0f8c498835f740e44b1306395 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 25 Aug 2015 10:57:56 +0200
Subject: [PATCH 097/111] Fix remove report button

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG                                             | 1 +
 app/views/admin/abuse_reports/_abuse_report.html.haml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5940d586d8..40b8ccb62f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.0.0 (unreleased)
   - Search for comments should be case insensetive
   - Create cross-reference for closing references on commits pushed to non-default branches (Maël Valais)
   - Ability to search milestones
+  - Improve abuse reports management from admin area
 
 v 7.14.1 (unreleased)
   - Only include base URL in OmniAuth full_host parameter (Stan Hu)
diff --git a/app/views/admin/abuse_reports/_abuse_report.html.haml b/app/views/admin/abuse_reports/_abuse_report.html.haml
index 785ce4b759..d3afc658cd 100644
--- a/app/views/admin/abuse_reports/_abuse_report.html.haml
+++ b/app/views/admin/abuse_reports/_abuse_report.html.haml
@@ -22,5 +22,5 @@
 
   %td
     - if user
-      = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs btn-warning"
-    = link_to 'Remove report', [:admin, abuse_report], method: :delete, class: "btn btn-xs btn-close"
+      = link_to 'Block user', block_admin_user_path(user), data: {confirm: 'USER WILL BE BLOCKED! Are you sure?'}, method: :put, class: "btn btn-xs"
+    = link_to 'Remove report', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-xs btn-close js-remove-tr"

From 8f68c38746639d8714ff5aa12fe9a0fd362f4419 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 25 Aug 2015 14:13:04 +0200
Subject: [PATCH 098/111] Dashboard activity as separate page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/javascripts/dispatcher.js.coffee |  1 +
 app/controllers/dashboard_controller.rb     | 22 ++++++++++++++-------
 app/views/dashboard/activity.html.haml      |  6 ++++++
 app/views/dashboard/show.html.haml          |  9 +--------
 app/views/layouts/nav/_dashboard.html.haml  |  7 ++++++-
 config/routes.rb                            |  1 +
 6 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 app/views/dashboard/activity.html.haml

diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index 81e7379927..539041c286 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -51,6 +51,7 @@ class Dispatcher
         MergeRequests.init()
       when 'dashboard:show', 'root:show'
         new Dashboard()
+      when 'dashboard:activity'
         new Activities()
       when 'dashboard:projects:starred'
         new Activities()
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index d2f0c43929..d745131694 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -1,6 +1,6 @@
 class DashboardController < Dashboard::ApplicationController
   before_action :load_projects
-  before_action :event_filter, only: :show
+  before_action :event_filter, only: :activity
 
   respond_to :html
 
@@ -10,13 +10,8 @@ class DashboardController < Dashboard::ApplicationController
 
     respond_to do |format|
       format.html
-
-      format.json do
-        load_events
-        pager_json("events/_events", @events.count)
-      end
-
       format.atom do
+        event_filter
         load_events
         render layout: false
       end
@@ -40,6 +35,19 @@ class DashboardController < Dashboard::ApplicationController
     end
   end
 
+  def activity
+    @last_push = current_user.recent_push
+
+    respond_to do |format|
+      format.html
+
+      format.json do
+        load_events
+        pager_json("events/_events", @events.count)
+      end
+    end
+  end
+
   protected
 
   def load_projects
diff --git a/app/views/dashboard/activity.html.haml b/app/views/dashboard/activity.html.haml
new file mode 100644
index 0000000000..7a5a093add
--- /dev/null
+++ b/app/views/dashboard/activity.html.haml
@@ -0,0 +1,6 @@
+= content_for :meta_tags do
+  - if current_user
+    = auto_discovery_link_tag(:atom, dashboard_url(format: :atom, private_token: current_user.private_token), title: "All activity")
+
+%section.activities
+  = render 'activities'
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index a3a32b6932..1b6ea3d596 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -5,13 +5,6 @@
 = render 'dashboard/projects_head'
 
 - if @projects.any?
-  = render 'shared/show_aside'
-
-  .dashboard.row
-    %section.activities.col-md-8
-      = render 'activities'
-    %aside.col-md-4
-      = render 'sidebar'
-
+  = render 'sidebar'
 - else
   = render "zero_authorized_projects"
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 8f010196d1..154fd41839 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -1,9 +1,14 @@
 %ul.nav.nav-sidebar
   = nav_link(path: ['dashboard#show', 'root#show', 'projects#trending', 'projects#starred', 'projects#index'], html_options: {class: 'home'}) do
     = link_to (current_user ? root_path : explore_root_path), title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
-      = icon('dashboard fw')
+      = icon('home fw')
       %span
         Projects
+  = nav_link(path: 'dashboard#activity') do
+    = link_to activity_dashboard_path, title: 'Activity', data: {placement: 'right'} do
+      = icon('dashboard fw')
+      %span
+        Activity
   = nav_link(controller: :groups) do
     = link_to (current_user ? dashboard_groups_path : explore_groups_path), title: 'Groups', data: {placement: 'right'} do
       = icon('group fw')
diff --git a/config/routes.rb b/config/routes.rb
index d7307a61ed..8ba439f08b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -261,6 +261,7 @@ Gitlab::Application.routes.draw do
     member do
       get :issues
       get :merge_requests
+      get :activity
     end
 
     scope module: :dashboard do

From c11e43145f87436062f3840d16a9fcf97286265a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 25 Aug 2015 15:23:25 +0200
Subject: [PATCH 099/111] Make some visual improvements to dashboard page after
 we moved activity

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 .../javascripts/projects_list.js.coffee       |  2 +-
 app/assets/stylesheets/pages/dashboard.scss   | 38 +------------------
 app/assets/stylesheets/pages/projects.scss    | 31 +++++++++++++++
 app/views/dashboard/_projects.html.haml       |  9 +++--
 app/views/dashboard/show.html.haml            |  2 +-
 app/views/groups/_projects.html.haml          |  2 +-
 app/views/shared/_project.html.haml           |  6 ++-
 7 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/app/assets/javascripts/projects_list.js.coffee b/app/assets/javascripts/projects_list.js.coffee
index c0e36d1ccc..db5faf71fa 100644
--- a/app/assets/javascripts/projects_list.js.coffee
+++ b/app/assets/javascripts/projects_list.js.coffee
@@ -8,7 +8,7 @@ class @ProjectsList
 
     $(".projects-list-filter").keyup ->
       terms = $(this).val()
-      uiBox = $(this).closest('.panel')
+      uiBox = $(this).closest('.projects-list-holder')
       if terms == "" || terms == undefined
         uiBox.find(".projects-list li").show()
       else
diff --git a/app/assets/stylesheets/pages/dashboard.scss b/app/assets/stylesheets/pages/dashboard.scss
index 9a3b543ad1..c1103a1c2e 100644
--- a/app/assets/stylesheets/pages/dashboard.scss
+++ b/app/assets/stylesheets/pages/dashboard.scss
@@ -23,41 +23,6 @@
   }
 }
 
-.project-row, .group-row {
-  padding: 0 !important;
-  font-size: 14px;
-  line-height: 24px;
-
-  a {
-    display: block;
-    padding: 8px 15px;
-  }
-
-  .project-name, .group-name {
-    font-weight: 500;
-  }
-
-  .arrow {
-    float: right;
-    margin: 0;
-    font-size: 20px;
-  }
-
-  .last-activity {
-    float: right;
-    font-size: 12px;
-    color: #AAA;
-    display: block;
-    .date {
-      color: #777;
-    }
-  }
-}
-
-.project-description {
-  overflow: hidden;
-}
-
 .project-access-icon {
   margin-left: 10px;
   float: left;
@@ -73,10 +38,9 @@
   float: left;
 
   .avatar {
-    margin-top: -8px;
-    margin-left: -15px;
     @include border-radius(0px);
   }
+
   .identicon {
     line-height: 40px;
   }
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 29d3dbc25e..1e138651d5 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -316,3 +316,34 @@ table.table.protected-branches-list tr.no-border {
 pre.light-well {
   border-color: #f1f1f1;
 }
+
+.projects-search-form {
+  max-width: 600px;
+  margin: 0 auto;
+  margin-bottom: 20px;
+
+  input {
+    border-color: #BBB;
+  }
+}
+
+.project-row {
+  .project-full-name {
+    font-weight: bold;
+    font-size: 15px;
+  }
+
+  .project-description {
+    color: #888;
+    font-size: 13px;
+
+    p {
+      margin-bottom: 0;
+      color: #888;
+    }
+  }
+}
+
+.my-projects .project-row {
+  padding: 10px 0;
+}
diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml
index d676576067..dc83d5343f 100644
--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
@@ -1,5 +1,5 @@
-.panel.panel-default
-  .panel-heading.clearfix
+.projects-list-holder
+  .projects-search-form
     .input-group
       = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control'
       - if current_user.can_create_project?
@@ -7,4 +7,7 @@
           = link_to new_project_path, class: 'btn btn-success' do
             New project
 
-  = render 'shared/projects_list', projects: @projects, projects_limit: 20
+  %ul.projects-list.bordered-list.my-projects
+    - @projects.each do |project|
+      %li.project-row
+        = render partial: 'shared/project', locals: { project: project, avatar: true, stars: true }
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index 1b6ea3d596..44372b921c 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -5,6 +5,6 @@
 = render 'dashboard/projects_head'
 
 - if @projects.any?
-  = render 'sidebar'
+  = render 'projects'
 - else
   = render "zero_authorized_projects"
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 4f8aec1c67..2ae51a1c8c 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -1,4 +1,4 @@
-.panel.panel-default
+.panel.panel-default.projects-list-holder
   .panel-heading.clearfix
     .input-group
       = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control'
diff --git a/app/views/shared/_project.html.haml b/app/views/shared/_project.html.haml
index 6bd61455d2..15df97b133 100644
--- a/app/views/shared/_project.html.haml
+++ b/app/views/shared/_project.html.haml
@@ -3,7 +3,7 @@
     - if avatar
       .dash-project-avatar
         = project_icon(project, alt: '', class: 'avatar project-avatar s40')
-    %span.str-truncated
+    %span.str-truncated.project-full-name
       %span.namespace-name
         - if project.namespace
           = project.namespace.human_name
@@ -14,3 +14,7 @@
       %span.pull-right.light
         %i.fa.fa-star
         = project.star_count
+  - if project.description.present?
+    .project-description
+      .str-truncated
+        = markdown(project.description, pipeline: :description)

From 7569010bc3918af0098e00eb56fce1a18d8ca72e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 25 Aug 2015 16:36:54 +0200
Subject: [PATCH 100/111] Fix tests and last push widget

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG                                      | 1 +
 app/views/dashboard/projects/starred.html.haml | 2 +-
 app/views/dashboard/show.html.haml             | 3 +++
 app/views/events/_event_last_push.html.haml    | 2 +-
 features/dashboard/dashboard.feature           | 8 ++++++--
 features/dashboard/event_filters.feature       | 8 ++++----
 features/steps/shared/paths.rb                 | 4 ++++
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 35b5803d34..cf3ce803e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ v 8.0.0 (unreleased)
   - Create cross-reference for closing references on commits pushed to non-default branches (Maël Valais)
   - Ability to search milestones
   - Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries (Stan Hu)
+  - Move dashboard activity to separate page
 
 v 7.14.1 (unreleased)
   - Only include base URL in OmniAuth full_host parameter (Stan Hu)
diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml
index 98b8cde476..027387028b 100644
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
@@ -8,7 +8,7 @@
     %section.activities.col-md-8
       = render 'dashboard/activities'
     %aside.col-md-4
-      .panel.panel-default
+      .panel.panel-default.projects-list-holder
         .panel-heading.clearfix
           .input-group
             = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control'
diff --git a/app/views/dashboard/show.html.haml b/app/views/dashboard/show.html.haml
index 44372b921c..4cf2feb9aa 100644
--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -4,6 +4,9 @@
 
 = render 'dashboard/projects_head'
 
+- if @last_push
+  = render "events/event_last_push", event: @last_push
+
 - if @projects.any?
   = render 'projects'
 - else
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml
index 501412642d..6a0c6cba41 100644
--- a/app/views/events/_event_last_push.html.haml
+++ b/app/views/events/_event_last_push.html.haml
@@ -9,6 +9,6 @@
       #{time_ago_with_tooltip(event.created_at)}
 
     .pull-right
-      = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-sm" do
+      = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-info btn-sm" do
         Create Merge Request
   %hr
diff --git a/features/dashboard/dashboard.feature b/features/dashboard/dashboard.feature
index 1959d32708..392d4235ef 100644
--- a/features/dashboard/dashboard.feature
+++ b/features/dashboard/dashboard.feature
@@ -10,6 +10,10 @@ Feature: Dashboard
   Scenario: I should see projects list
     Then I should see "New Project" link
     Then I should see "Shop" project link
+
+  @javascript
+  Scenario: I should see activity list
+    And I visit dashboard activity page
     Then I should see project "Shop" activity feed
 
   Scenario: I should see groups list
@@ -26,12 +30,12 @@ Feature: Dashboard
   @javascript
   Scenario: I should see User joined Project event
     Given user with name "John Doe" joined project "Shop"
-    When I visit dashboard page
+    When I visit dashboard activity page
     Then I should see "John Doe joined project Shop" event
 
   @javascript
   Scenario: I should see User left Project event
     Given user with name "John Doe" joined project "Shop"
     And user with name "John Doe" left project "Shop"
-    When I visit dashboard page
+    When I visit dashboard activity page
     Then I should see "John Doe left project Shop" event
diff --git a/features/dashboard/event_filters.feature b/features/dashboard/event_filters.feature
index ec5680caba..96399ea21a 100644
--- a/features/dashboard/event_filters.feature
+++ b/features/dashboard/event_filters.feature
@@ -6,7 +6,7 @@ Feature: Event Filters
     And this project has push event
     And this project has new member event
     And this project has merge request event
-    And I visit dashboard page
+    And I visit dashboard activity page
 
   @javascript
   Scenario: I should see all events
@@ -16,7 +16,7 @@ Feature: Event Filters
 
   @javascript
   Scenario: I should see only pushed events
-    When I click "push" event filter 
+    When I click "push" event filter
     Then I should see push event
     And I should not see new member event
     And I should not see merge request event
@@ -38,11 +38,11 @@ Feature: Event Filters
   @javascript
   Scenario: I should see only selected events while page reloaded
     When I click "push" event filter
-    And I visit dashboard page
+    And I visit dashboard activity page
     Then I should see push event
     And I should not see new member event
     When I click "team" event filter
-    And I visit dashboard page
+    And I visit dashboard activity page
     Then I should see push event
     And I should see new member event
     And I should not see merge request event
diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb
index ca8fbb4910..b4deccb652 100644
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
@@ -71,6 +71,10 @@ module SharedPaths
     visit dashboard_path
   end
 
+  step 'I visit dashboard activity page' do
+    visit activity_dashboard_path
+  end
+
   step 'I visit dashboard projects page' do
     visit projects_dashboard_path
   end

From 4a4d9fe16e371c4c5d4423a285758abe1d04d84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Tue, 25 Aug 2015 17:58:29 +0200
Subject: [PATCH 101/111] UI Improvement for the project page

This commit improves the positioning of the dropdown menu on the project page.
---
 CHANGELOG                                      | 1 +
 app/assets/stylesheets/pages/projects.scss     | 4 ++++
 app/views/projects/buttons/_dropdown.html.haml | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index a66e898652..8048ca1373 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
+  - Improve dropdown positioning on the project home page (Hannes Rosenögger)
   - Upgrade browser gem to 1.0.0 to avoid warning in IE11 compatibilty mode (Stan Hu)
   - Fix "Reload with full diff" URL button in compare branch view (Stan Hu)
   - Remove user OAuth tokens from the database and request new tokens each session (Stan Hu)
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 29d3dbc25e..505b93b3bc 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -30,6 +30,10 @@
     }
   }
 
+  .project-home-dropdown {
+    margin: 11px 3px 0;
+  }
+
   .project-home-desc {
     h1 {
       margin: 0;
diff --git a/app/views/projects/buttons/_dropdown.html.haml b/app/views/projects/buttons/_dropdown.html.haml
index cade930c8c..bc7625e898 100644
--- a/app/views/projects/buttons/_dropdown.html.haml
+++ b/app/views/projects/buttons/_dropdown.html.haml
@@ -2,7 +2,7 @@
   %span.dropdown
     %a.dropdown-toggle.btn.btn-new{href: '#', "data-toggle" => "dropdown"}
       = icon('plus')
-    %ul.dropdown-menu
+    %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
       - if can?(current_user, :create_issue, @project)
         %li
           = link_to url_for_new_issue do

From 084da5253b699b0734e17839f6ffebd4dc414320 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 25 Aug 2015 18:20:06 +0200
Subject: [PATCH 102/111] Re-use project partial for rendering explore projects

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/explore/projects/_project.html.haml | 24 -------------------
 .../explore/projects/_projects.html.haml      |  6 +++++
 app/views/explore/projects/index.html.haml    |  9 ++-----
 app/views/explore/projects/starred.html.haml  |  5 +---
 app/views/explore/projects/trending.html.haml |  4 +---
 app/views/layouts/nav/_dashboard.html.haml    |  2 +-
 6 files changed, 11 insertions(+), 39 deletions(-)
 delete mode 100644 app/views/explore/projects/_project.html.haml
 create mode 100644 app/views/explore/projects/_projects.html.haml

diff --git a/app/views/explore/projects/_project.html.haml b/app/views/explore/projects/_project.html.haml
deleted file mode 100644
index 1e8a89e366..0000000000
--- a/app/views/explore/projects/_project.html.haml
+++ /dev/null
@@ -1,24 +0,0 @@
-%li
-  %h4.project-title
-    .project-access-icon
-      = visibility_level_icon(project.visibility_level)
-    = link_to project.name_with_namespace, [project.namespace.becomes(Namespace), project]
-    %span.pull-right
-      %i.fa.fa-star
-      = project.star_count
-
-  .project-info
-    - if project.description.present?
-      .project-description.str-truncated
-        = markdown(project.description, pipeline: :description)
-
-    .repo-info
-      - unless project.empty_repo?
-        = link_to pluralize(round_commit_count(project), 'commit'), namespace_project_commits_path(project.namespace, project, project.default_branch)
-        &middot;
-        = link_to pluralize(project.repository.branch_names.count, 'branch'), namespace_project_branches_path(project.namespace, project)
-        &middot;
-        = link_to pluralize(project.repository.tag_names.count, 'tag'), namespace_project_tags_path(project.namespace, project)
-      - else
-        %i.fa.fa-exclamation-triangle
-        Empty repository
diff --git a/app/views/explore/projects/_projects.html.haml b/app/views/explore/projects/_projects.html.haml
new file mode 100644
index 0000000000..22cc541115
--- /dev/null
+++ b/app/views/explore/projects/_projects.html.haml
@@ -0,0 +1,6 @@
+%ul.projects-list.bordered-list.my-projects.public-projects
+  - projects.each do |project|
+    %li.project-row
+      = render partial: 'shared/project', locals: { project: project, avatar: true, stars: true }
+- unless projects.present?
+  .nothing-here-block No such projects
diff --git a/app/views/explore/projects/index.html.haml b/app/views/explore/projects/index.html.haml
index 4956081e1e..0cfdf5cfd1 100644
--- a/app/views/explore/projects/index.html.haml
+++ b/app/views/explore/projects/index.html.haml
@@ -4,10 +4,5 @@
 .clearfix
   = render 'filter'
 %br
-.public-projects
-  %ul.bordered-list.top-list
-    = render @projects
-    - unless @projects.present?
-      .nothing-here-block No public projects
-
-  = paginate @projects, theme: "gitlab"
+= render 'projects', projects: @projects
+= paginate @projects, theme: "gitlab"
diff --git a/app/views/explore/projects/starred.html.haml b/app/views/explore/projects/starred.html.haml
index fdccbe5692..4a9fcae4be 100644
--- a/app/views/explore/projects/starred.html.haml
+++ b/app/views/explore/projects/starred.html.haml
@@ -7,8 +7,5 @@
     See most starred projects
     .pull-right
       = render 'explore/projects/dropdown'
-  .public-projects
-    %ul.bordered-list
-      = render @starred_projects
-
+  = render 'projects', projects: @starred_projects
   = paginate @starred_projects, theme: 'gitlab'
diff --git a/app/views/explore/projects/trending.html.haml b/app/views/explore/projects/trending.html.haml
index 98a4174b42..4c7e7d4473 100644
--- a/app/views/explore/projects/trending.html.haml
+++ b/app/views/explore/projects/trending.html.haml
@@ -13,6 +13,4 @@
     See most discussed projects for last month
     .pull-right
       = render 'explore/projects/dropdown'
-  .public-projects
-    %ul.bordered-list
-      = render @trending_projects
+  = render 'projects', projects: @trending_projects
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 154fd41839..d620c02227 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -34,7 +34,7 @@
           %span.count= current_user.assigned_merge_requests.opened.count
   = nav_link(controller: :snippets) do
     = link_to (current_user ? user_snippets_path(current_user) : snippets_path), title: 'Your snippets', data: {placement: 'right'} do
-      = icon('dashboard fw')
+      = icon('clipboard fw')
       %span
         Snippets
   - if current_user

From ad85f1f560224a3f276e57dcf638a6e41eb231eb Mon Sep 17 00:00:00 2001
From: Josef Kufner <josef@kufner.cz>
Date: Wed, 13 May 2015 12:51:47 +0200
Subject: [PATCH 103/111] Change plots to bar graphs

---
 app/views/projects/graphs/commits.html.haml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/views/projects/graphs/commits.html.haml b/app/views/projects/graphs/commits.html.haml
index 141acbdcf7..a357736bf5 100644
--- a/app/views/projects/graphs/commits.html.haml
+++ b/app/views/projects/graphs/commits.html.haml
@@ -50,39 +50,42 @@
     datasets : [{
       fillColor : "rgba(220,220,220,0.5)",
       strokeColor : "rgba(220,220,220,1)",
-      pointColor : "rgba(220,220,220,1)",
-      pointStrokeColor : "#EEE",
+      barStrokeWidth: 1,
+      barValueSpacing: 1,
+      barDatasetSpacing: 1,
       data : #{@commits_per_time.values.to_json}
     }]
   }
 
   ctx = $("#hour-chart").get(0).getContext("2d");
-  new Chart(ctx).Line(data,{"scaleOverlay": true, responsive: true, pointHitDetectionRadius: 2})
+  new Chart(ctx).Bar(data,{"scaleOverlay": true, responsive: true, pointHitDetectionRadius: 2})
 
   data = {
     labels : #{@commits_per_week_days.keys.to_json},
     datasets : [{
       fillColor : "rgba(220,220,220,0.5)",
       strokeColor : "rgba(220,220,220,1)",
-      pointColor : "rgba(220,220,220,1)",
-      pointStrokeColor : "#EEE",
+      barStrokeWidth: 1,
+      barValueSpacing: 1,
+      barDatasetSpacing: 1,
       data : #{@commits_per_week_days.values.to_json}
     }]
   }
 
   ctx = $("#weekday-chart").get(0).getContext("2d");
-  new Chart(ctx).Line(data,{"scaleOverlay": true, responsive: true, pointHitDetectionRadius: 2})
+  new Chart(ctx).Bar(data,{"scaleOverlay": true, responsive: true, pointHitDetectionRadius: 2})
 
   data = {
     labels : #{@commits_per_month.keys.to_json},
     datasets : [{
       fillColor : "rgba(220,220,220,0.5)",
       strokeColor : "rgba(220,220,220,1)",
-      pointColor : "rgba(220,220,220,1)",
-      pointStrokeColor : "#EEE",
+      barStrokeWidth: 1,
+      barValueSpacing: 1,
+      barDatasetSpacing: 1,
       data : #{@commits_per_month.values.to_json}
     }]
   }
 
   ctx = $("#month-chart").get(0).getContext("2d");
-  new Chart(ctx).Line(data, {"scaleOverlay": true, responsive: true, pointHitDetectionRadius: 2})
+  new Chart(ctx).Bar(data, {"scaleOverlay": true, responsive: true, pointHitDetectionRadius: 2})

From fa65db9aa876289bcb5974edfdd15f181c9a1ac5 Mon Sep 17 00:00:00 2001
From: Josef Kufner <josef@kufner.cz>
Date: Mon, 24 Aug 2015 23:51:50 +0200
Subject: [PATCH 104/111] Add changelog entry

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 5222ab1e3e..3ccb096214 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -306,6 +306,7 @@ v 7.11.0
   - Protect OmniAuth request phase against CSRF.
   - Don't send notifications to mentioned users that don't have access to the project in question.
   - Add search issues/MR by number
+  - Change plots to bar graphs in commit statistics screen
   - Move snippets UI to fluid layout
   - Improve UI for sidebar. Increase separation between navigation and content
   - Improve new project command options (Ben Bodenmiller)

From 02e7b00a54ebfebc51acab0a7f7e15adc93f4bb0 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 25 Aug 2015 12:03:58 -0700
Subject: [PATCH 105/111] Fix init script for Reply by email

---
 lib/support/init.d/gitlab | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/support/init.d/gitlab b/lib/support/init.d/gitlab
index 41a2f254db..457bd31e23 100755
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
@@ -288,7 +288,7 @@ print_status() {
   fi
   if [ "$mail_room_enabled" = true ]; then
     if [ "$mail_room_status" = "0" ]; then
-        echo "The GitLab MailRoom email processor with pid $spid is running."
+        echo "The GitLab MailRoom email processor with pid $mpid is running."
     else
         printf "The GitLab MailRoom email processor is \033[31mnot running\033[0m.\n"
     fi

From 5ddf38e1881b515149738647e42f2d0a96d8df14 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 26 Aug 2015 10:21:51 +0200
Subject: [PATCH 106/111] Improve project name/description look on project page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/pages/projects.scss | 3 +++
 app/views/projects/_home_panel.html.haml   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 1e138651d5..6e40cbdd02 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -35,9 +35,12 @@
       margin: 0;
       margin-bottom: 10px;
       font-size: 26px;
+      font-weight: bold;
     }
 
     p {
+      font-size: 18px;
+      color: #666;
       display: inline;
     }
   }
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index bec40ec27a..b93036e78e 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -2,7 +2,7 @@
 .project-home-panel.clearfix{:class => ("empty-project" if empty_repo)}
   .project-identicon-holder
     = project_icon(@project, alt: '', class: 'project-avatar avatar s90')
-  .project-home-desc.lead
+  .project-home-desc
     %h1= @project.name
     - if @project.description.present?
       = markdown(@project.description, pipeline: :description)

From 735978388f62787dc69c97cd267359693fde6415 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 26 Aug 2015 10:36:08 +0200
Subject: [PATCH 107/111] Increase width of sidebar for several pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/dashboard/projects/starred.html.haml | 4 ++--
 app/views/groups/show.html.haml                | 4 ++--
 app/views/users/show.html.haml                 | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml
index 027387028b..6dcfd497ed 100644
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
@@ -5,9 +5,9 @@
   = render 'shared/show_aside'
 
   .dashboard.row
-    %section.activities.col-md-8
+    %section.activities.col-md-7
       = render 'dashboard/activities'
-    %aside.col-md-4
+    %aside.col-md-5
       .panel.panel-default.projects-list-holder
         .panel-heading.clearfix
           .input-group
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index d31dae7d64..0577f4ec14 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -17,7 +17,7 @@
   = render 'shared/show_aside'
 
   .row
-    %section.activities.col-md-8
+    %section.activities.col-md-7
       .hidden-xs
         - if current_user
           = render "events/event_last_push", event: @last_push
@@ -33,5 +33,5 @@
 
       .content_list
       = spinner
-    %aside.side.col-md-4
+    %aside.side.col-md-5
       = render "projects", projects: @projects
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index 64b7f25ad3..aa4e8722fb 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -7,7 +7,7 @@
 = render 'shared/show_aside'
 
 .row
-  %section.col-md-8
+  %section.col-md-7
     .header-with-avatar
       = link_to avatar_icon(@user.email, 400), target: '_blank' do
         = image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
@@ -59,7 +59,7 @@
 
     .content_list
     = spinner
-  %aside.col-md-4
+  %aside.col-md-5
     = render 'profile', user: @user
     = render 'projects', projects: @projects, contributed_projects: @contributed_projects
 

From 0276e9032a5c31548844e76e913d9c50039cf054 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 26 Aug 2015 11:51:28 +0200
Subject: [PATCH 108/111] Limit content width for big screens except certain
 pages

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/base/layout.scss           |  5 +++++
 app/assets/stylesheets/base/variables.scss        |  2 +-
 app/assets/stylesheets/pages/issuable.scss        |  6 ------
 app/assets/stylesheets/pages/tree.scss            |  1 -
 app/helpers/page_layout_helper.rb                 |  8 ++++++++
 app/views/layouts/_page.html.haml                 |  2 +-
 app/views/layouts/header/_default.html.haml       | 12 ------------
 app/views/projects/deploy_keys/index.html.haml    |  1 +
 app/views/projects/diffs/_diffs.html.haml         |  3 +++
 app/views/projects/merge_requests/_show.html.haml |  3 +++
 10 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/base/layout.scss b/app/assets/stylesheets/base/layout.scss
index 690d89a5c1..734b95e26c 100644
--- a/app/assets/stylesheets/base/layout.scss
+++ b/app/assets/stylesheets/base/layout.scss
@@ -20,3 +20,8 @@ html {
 .navless-container {
   margin-top: 30px;
 }
+
+
+.container-limited {
+  max-width: $fixed-layout-width;
+}
diff --git a/app/assets/stylesheets/base/variables.scss b/app/assets/stylesheets/base/variables.scss
index cb439a0e0b..26d0a1e536 100644
--- a/app/assets/stylesheets/base/variables.scss
+++ b/app/assets/stylesheets/base/variables.scss
@@ -13,7 +13,7 @@ $code_line_height: 1.5;
 $border-color: #E5E5E5;
 $background-color: #f5f5f5;
 $header-height: 50px;
-$readable-width: 1100px;
+$fixed-layout-width: 1200px;
 
 
 /*
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 3f617e72b0..586e7b5f8d 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -45,9 +45,3 @@
 
   .btn { font-size: 13px; }
 }
-
-.issuable-details {
-  .description {
-    max-width: $readable-width;
-  }
-}
diff --git a/app/assets/stylesheets/pages/tree.scss b/app/assets/stylesheets/pages/tree.scss
index 5f1a3db4fb..81e2aa7bb9 100644
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
@@ -117,7 +117,6 @@
 
 .readme-holder {
   margin: 0 auto;
-  max-width: $readable-width;
 
   .readme-file-title {
     font-size: 14px;
diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 01b6a63552..8473d6d75d 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -23,4 +23,12 @@ module PageLayoutHelper
       @sidebar
     end
   end
+
+  def fluid_layout(enabled = false)
+    if @fluid_layout.nil?
+      @fluid_layout = enabled
+    else
+      @fluid_layout
+    end
+  end
 end
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 96e15783a3..3d58f993ca 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -13,7 +13,7 @@
         .username
           = current_user.username
   .content-wrapper
-    .container-fluid
+    %div{ class: fluid_layout ? "container-fluid" : "container-fluid container-limited" }
       .content
         = render "layouts/flash"
         .clearfix
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 12ddbe6f1b..6086f36f07 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -17,15 +17,6 @@
           %li.visible-sm.visible-xs
             = link_to search_path, title: 'Search', data: {toggle: 'tooltip', placement: 'bottom'} do
               = icon('search')
-          -#%li.hidden-xs
-            = link_to help_path, title: 'Help', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('question-circle fw')
-          -#%li
-            = link_to explore_root_path, title: 'Explore', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('globe fw')
-          -#%li
-            = link_to user_snippets_path(current_user), title: 'Your snippets', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('clipboard fw')
           - if current_user.is_admin?
             %li
               = link_to admin_root_path, title: 'Admin area', data: {toggle: 'tooltip', placement: 'bottom'} do
@@ -34,9 +25,6 @@
             %li.hidden-xs
               = link_to new_project_path, title: 'New project', data: {toggle: 'tooltip', placement: 'bottom'} do
                 = icon('plus fw')
-          -#%li
-            = link_to profile_path, title: 'Profile settings', data: {toggle: 'tooltip', placement: 'bottom'} do
-              = icon('cog fw')
           %li
             = link_to destroy_user_session_path, class: 'logout', method: :delete, title: 'Sign out', data: {toggle: 'tooltip', placement: 'bottom'} do
               = icon('sign-out')
diff --git a/app/views/projects/deploy_keys/index.html.haml b/app/views/projects/deploy_keys/index.html.haml
index 2e9c5dc08c..8e24c778b7 100644
--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
@@ -1,4 +1,5 @@
 - page_title "Deploy Keys"
+
 %h3.page-title
   Deploy keys allow read-only access to the repository
 
diff --git a/app/views/projects/diffs/_diffs.html.haml b/app/views/projects/diffs/_diffs.html.haml
index 52c1e03040..30943f49bb 100644
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -1,3 +1,6 @@
+- if params[:view] == 'parallel'
+  - fluid_layout true
+
 .prepend-top-20.append-bottom-20
   .pull-right
     .btn-group
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml
index 007f6c6a78..ec1838eb48 100644
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -1,4 +1,7 @@
 - page_title "#{@merge_request.title} (##{@merge_request.iid})", "Merge Requests"
+- if params[:view] == 'parallel'
+  - fluid_layout true
+
 .merge-request{'data-url' => merge_request_path(@merge_request)}
   .merge-request-details.issuable-details
     = render "projects/merge_requests/show/mr_title"

From 2fa560d658ec7c49df97daadae443568bc72bdce Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 26 Aug 2015 13:15:02 +0200
Subject: [PATCH 109/111] Align header with content container

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 CHANGELOG                                     |  1 +
 app/assets/stylesheets/generic/header.scss    | 66 ++-----------------
 app/assets/stylesheets/generic/sidebar.scss   | 43 ++++++++++++
 .../stylesheets/themes/gitlab-theme.scss      | 26 ++++----
 app/views/layouts/_page.html.haml             |  5 ++
 app/views/layouts/header/_default.html.haml   |  7 +-
 6 files changed, 67 insertions(+), 81 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5222ab1e3e..5ab0b5c3fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 8.0.0 (unreleased)
   - Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries (Stan Hu)
   - Improve abuse reports management from admin area
   - Move dashboard activity to separate page
+  - Limit content width to 1200px for most of pages to improve readability on big screens
 
 v 7.14.1 (unreleased)
   - Only include base URL in OmniAuth full_host parameter (Stan Hu)
diff --git a/app/assets/stylesheets/generic/header.scss b/app/assets/stylesheets/generic/header.scss
index 31e2ad8669..6a29b32e19 100644
--- a/app/assets/stylesheets/generic/header.scss
+++ b/app/assets/stylesheets/generic/header.scss
@@ -20,16 +20,16 @@ header {
   }
 
   &.navbar-gitlab {
+    padding: 0 20px;
     z-index: 100;
     margin-bottom: 0;
     min-height: $header-height;
     border: none;
-    width: 100%;
+    border-bottom: 1px solid #EEE;
 
-    .container {
+    .container-fluid {
       background: #FFF;
       width: 100% !important;
-      padding: 0;
       filter: none;
 
       .nav > li > a {
@@ -64,55 +64,11 @@ header {
     }
   }
 
-  .header-logo {
-    border-bottom: 1px solid transparent;
-    float: left;
-    height: $header-height;
-    width: $sidebar_width;
-    overflow: hidden;
-    transition-duration: .3s;
-
-    a {
-      float: left;
-      height: $header-height;
-      width: 100%;
-      padding: ($header-height - 36 ) / 2 8px;
-      overflow: hidden;
-
-      img {
-        width: 36px;
-        height: 36px;
-        float: left;
-      }
-
-      .gitlab-text-container {
-        width: 230px;
-
-        h3 {
-          width: 158px;
-          float: left;
-          margin: 0;
-          margin-left: 14px;
-          font-size: 18px;
-          line-height: $header-height - 14;
-          font-weight: normal;
-        }
-      }
-    }
-
-    &:hover {
-      background-color: #EEE;
-    }
-  }
-
   .header-content {
-    border-bottom: 1px solid #EEE;
-    padding-right: 35px;
     height: $header-height;
 
     .title {
       margin: 0;
-      padding: 0 15px 0 35px;
       overflow: hidden;
       font-size: 18px;
       line-height: $header-height;
@@ -168,15 +124,7 @@ header {
 }
 
 @mixin collapsed-header {
-  .header-logo {
-    width: $sidebar_collapsed_width;
-  }
-
-  .header-content {
-    .title {
-      margin-left: 30px;
-    }
-  }
+  margin-left: $sidebar_collapsed_width;
 }
 
 @media (max-width: $screen-md-max) {
@@ -191,16 +139,14 @@ header {
   }
 
   .header-expanded {
+    margin-left: $sidebar_width;
   }
 }
 
 @media (max-width: $screen-xs-max) {
-  header .container {
+  header .container-fluid {
     font-size: 18px;
 
-    .title {
-    }
-
     .navbar-nav {
       margin: 0px;
       float: none !important;
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss
index b96664d30d..320bdb1c76 100644
--- a/app/assets/stylesheets/generic/sidebar.scss
+++ b/app/assets/stylesheets/generic/sidebar.scss
@@ -188,3 +188,46 @@
     width: $sidebar_width - 2 * 10px;
   }
 }
+
+.sidebar-wrapper {
+  .header-logo {
+    border-bottom: 1px solid transparent;
+    float: left;
+    height: $header-height;
+    width: $sidebar_width;
+    overflow: hidden;
+    transition-duration: .3s;
+
+    a {
+      float: left;
+      height: $header-height;
+      width: 100%;
+      padding: ($header-height - 36 ) / 2 8px;
+      overflow: hidden;
+
+      img {
+        width: 36px;
+        height: 36px;
+        float: left;
+      }
+
+      .gitlab-text-container {
+        width: 230px;
+
+        h3 {
+          width: 158px;
+          float: left;
+          margin: 0;
+          margin-left: 14px;
+          font-size: 18px;
+          line-height: $header-height - 14;
+          font-weight: normal;
+        }
+      }
+    }
+
+    &:hover {
+      background-color: #EEE;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss
index 3589cb88d0..77b62c3153 100644
--- a/app/assets/stylesheets/themes/gitlab-theme.scss
+++ b/app/assets/stylesheets/themes/gitlab-theme.scss
@@ -7,27 +7,23 @@
  * $color-dark   -
  */
 @mixin gitlab-theme($color-light, $color, $color-darker, $color-dark) {
-  header {
-    &.navbar-gitlab {
-      .header-logo {
-        background-color: $color-darker;
-        border-color: $color-darker;
+  .page-with-sidebar {
+    .header-logo {
+      background-color: $color-darker;
+      border-color: $color-darker;
 
+      a {
+        color: $color-light;
+      }
+
+      &:hover {
+        background-color: $color-dark;
         a {
-          color: $color-light;
-        }
-
-        &:hover {
-          background-color: $color-dark;
-          a {
-            color: #FFF;
-          }
+          color: #FFF;
         }
       }
     }
-  }
 
-  .page-with-sidebar {
     .collapse-nav a {
       color: #FFF;
       background: $color;
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 3d58f993ca..0104d7198d 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -1,6 +1,11 @@
 .page-with-sidebar{ class: nav_sidebar_class }
   = render "layouts/broadcast"
   .sidebar-wrapper.nicescroll
+    .header-logo
+      = link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home', data: {toggle: 'tooltip', placement: 'bottom'} do
+        = brand_header_logo
+        .gitlab-text-container
+          %h3 GitLab
     - if defined?(sidebar) && sidebar
       = render "layouts/nav/#{sidebar}"
     - elsif current_user
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 6086f36f07..0b630b55c7 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -1,10 +1,5 @@
 %header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
-  .container
-    .header-logo
-      = link_to root_path, class: 'home', title: 'Dashboard', id: 'js-shortcuts-home', data: {toggle: 'tooltip', placement: 'bottom'} do
-        = brand_header_logo
-        .gitlab-text-container
-          %h3 GitLab
+  %div{ class: fluid_layout ? "container-fluid" : "container-fluid container-limited" }
     .header-content
       %button.navbar-toggle{type: 'button'}
         %span.sr-only Toggle navigation

From 99b2be7625fe7849aa0559356beef86c1840fb65 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Wed, 26 Aug 2015 16:39:55 +0300
Subject: [PATCH 110/111] Improve perofrmance of git blame

---
 CHANGELOG                               | 1 +
 app/views/projects/blame/show.html.haml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index be99941b4c..dc1d88bf61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -18,6 +18,7 @@ v 8.0.0 (unreleased)
   - Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries (Stan Hu)
   - Improve abuse reports management from admin area
   - Move dashboard activity to separate page
+  - Improve performance of git blame
 
 v 7.14.1 (unreleased)
   - Only include base URL in OmniAuth full_host parameter (Stan Hu)
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml
index a3ff7ce2f1..c1ec42aefc 100644
--- a/app/views/projects/blame/show.html.haml
+++ b/app/views/projects/blame/show.html.haml
@@ -27,7 +27,7 @@
                 .light
                   = commit_author_link(commit, avatar: false)
                   authored
-                  #{time_ago_with_tooltip(commit.committed_date)}
+                  #{time_ago_with_tooltip(commit.committed_date, skip_js: true)}
             %td.lines.blame-numbers
               %pre
                 - line_count = blame_group[:lines].count

From 468d29251da81bb3a16380b4465becf35db2ba23 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 26 Aug 2015 16:00:37 +0200
Subject: [PATCH 111/111] Fix header for anonymous users too

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/views/layouts/header/_public.html.haml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/views/layouts/header/_public.html.haml b/app/views/layouts/header/_public.html.haml
index 15c2e292be..af4b9ba58f 100644
--- a/app/views/layouts/header/_public.html.haml
+++ b/app/views/layouts/header/_public.html.haml
@@ -1,10 +1,5 @@
 %header.navbar.navbar-fixed-top.navbar-gitlab{ class: nav_header_class }
-  .container
-    .header-logo
-      = link_to explore_root_path, class: "home" do
-        = brand_header_logo
-        .gitlab-text-container
-          %h3 GitLab
+  %div{ class: fluid_layout ? "container-fluid" : "container-fluid container-limited" }
     .header-content
       - unless current_controller?('sessions')
         .pull-right