Merge branch 'master' into 8-0-stable

49 files changed, 419 insertions, 226 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 4733b28e50d..ceebdc12d0f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.0.0 (unreleased)
+  - Fix Markdown links not showing up in dashboard activity feed (Stan Hu)
+  - Remove milestones from merge requests when milestones are deleted (Stan Hu)
   - Fix HTML link that was improperly escaped in new user e-mail (Stan Hu)
   - Fix broken sort in merge request API (Stan Hu)
   - Bump rouge to 1.10.1 to remove warning noise and fix other syntax highlighting bugs (Stan Hu)
@@ -50,6 +52,7 @@ v 8.0.0 (unreleased)
   - Add support for Crowd
   - Global Labels that are available to all projects
   - Fix highlighting of deleted lines in diffs.
+  - Project notification level can be set on the project page itself
   - Added service API endpoint to retrieve service parameters (Petheő Bence)
   - Add FogBugz project import (Jared Szechy)
   - Sort users autocomplete lists by user (Allister Antosik)
diff --git a/app/assets/javascripts/project.js.coffee b/app/assets/javascripts/project.js.coffee
index 39a433dfc91..0ea8fffce07 100644
--- a/app/assets/javascripts/project.js.coffee
+++ b/app/assets/javascripts/project.js.coffee
@@ -24,3 +24,19 @@ class @Project
       $.cookie('hide_no_password_message', 'false', { path: path })
       $(@).parents('.no-password-message').remove()
       e.preventDefault()
+
+    $('.update-notification').on 'click', (e) ->
+      e.preventDefault()
+      notification_level = $(@).data 'notification-level'
+      $('#notification_level').val(notification_level)
+      $('#notification-form').submit()
+      label = null
+      switch notification_level
+        when 0 then label = ' Disabled '
+        when 1 then label = ' Participating '
+        when 2 then label = ' Watching '
+        when 3 then label = ' Global '
+        when 4 then label = ' On Mention '
+      $('#notifications-button').empty().append("<i class='fa fa-bell'></i>" + label + "<i class='fa fa-angle-down'></i>")
+      $(@).parents('ul').find('li.active').removeClass 'active'
+      $(@).parent().addClass 'active'
\ No newline at end of file
diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss
index 73034c84f9a..d5f0d86a307 100644
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -89,6 +89,10 @@ a > code {
   }
 }
 
+.md-area {
+  @include md-typography;
+}
+
 .md {
   @include md-typography;
 }
@@ -101,6 +105,10 @@ textarea.js-gfm-input {
   font-family: $monospace_font;
 }
 
+.md-preview {
+  font-family: $monospace_font;
+}
+
 .strikethrough {
   text-decoration: line-through;
 }
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index b311d26d675..fdc2c3332df 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -109,7 +109,7 @@
 
 .note-edit-form {
   display: none;
-  font-size: 13px;
+  font-size: 15px;
 
   .form-actions {
     padding-left: 20px;
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 53004fca350..a986fafff07 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -329,3 +329,7 @@ pre.light-well {
     margin-top: -1px;
   }
 }
+
+.inline-form {
+  display: inline-block;
+}
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index f3054881daf..c1231994f25 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -7,6 +7,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   before_action :closes_issues, only: [:edit, :update, :show, :diffs, :commits]
   before_action :validates_merge_request, only: [:show, :diffs, :commits]
   before_action :define_show_vars, only: [:show, :diffs, :commits]
+  before_action :ensure_ref_fetched, only: [:show, :commits, :diffs]
 
   # Allow read any merge_request
   before_action :authorize_read_merge_request!
@@ -277,4 +278,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
       :state_event, :description, :task_num, label_ids: []
     )
   end
+
+  # Make sure merge requests created before 8.0
+  # have head file in refs/merge-requests/
+  def ensure_ref_fetched
+    @merge_request.ensure_ref_fetched
+  end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f4d1a828aab..213c2a7173b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -86,6 +86,10 @@ class ProjectsController < ApplicationController
           if @project.empty_repo?
             render 'projects/empty'
           else
+            if current_user
+              @membership = @project.project_member_by_id(current_user.id)
+            end
+
             render :show
           end
         else
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 1ebfd92f119..78bf25f55e7 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -45,7 +45,7 @@ module GitlabMarkdownHelper
   end
 
   def markdown(text, context = {})
-    context.merge!(
+    context.reverse_merge!(
       current_user: current_user,
       path:         @path,
       project:      @project,
@@ -59,7 +59,7 @@ module GitlabMarkdownHelper
   # TODO (rspeicher): Remove all usages of this helper and just call `markdown`
   # with a custom pipeline depending on the content being rendered
   def gfm(text, options = {})
-    options.merge!(
+    options.reverse_merge!(
       current_user: current_user,
       path:         @path,
       project:      @project,
diff --git a/app/helpers/notifications_helper.rb b/app/helpers/notifications_helper.rb
index 2f8e64c375f..cf11f8e5320 100644
--- a/app/helpers/notifications_helper.rb
+++ b/app/helpers/notifications_helper.rb
@@ -12,4 +12,49 @@ module NotificationsHelper
       icon('circle-o', class: 'ns-default')
     end
   end
+
+  def notification_list_item(notification_level, user_membership)
+    case notification_level
+    when Notification::N_DISABLED
+      content_tag(:li, class: active_level_for(user_membership, Notification::N_DISABLED)) do
+        link_to '#', class: 'update-notification', data: { notification_level: Notification::N_DISABLED } do
+          icon('microphone-slash fw', text: 'Disabled')
+        end
+      end
+    when Notification::N_PARTICIPATING
+      content_tag(:li, class: active_level_for(user_membership, Notification::N_PARTICIPATING)) do
+        link_to '#', class: 'update-notification', data: { notification_level: Notification::N_PARTICIPATING } do
+          icon('volume-up fw', text: 'Participate')
+        end
+      end
+    when Notification::N_WATCH
+      content_tag(:li, class: active_level_for(user_membership, Notification::N_WATCH)) do
+        link_to '#', class: 'update-notification', data: { notification_level: Notification::N_WATCH } do
+          icon('eye fw', text: 'Watch')
+        end
+      end
+    when Notification::N_MENTION
+      content_tag(:li, class: active_level_for(user_membership, Notification::N_MENTION)) do
+        link_to '#', class: 'update-notification', data: { notification_level: Notification::N_MENTION }  do
+          icon('at fw', text: 'On mention')
+        end
+      end
+    when Notification::N_GLOBAL
+      content_tag(:li, class: active_level_for(user_membership, Notification::N_GLOBAL)) do
+        link_to '#', class: 'update-notification', data: { notification_level: Notification::N_GLOBAL } do
+          icon('globe fw', text: 'Global')
+        end
+      end
+    else
+      # do nothing
+    end
+  end
+
+  def notification_label(user_membership)
+    Notification.new(user_membership).to_s
+  end
+
+  def active_level_for(user_membership, level)
+    'active' if user_membership.notification_level == level
+  end
 end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a2b83c50c2e..7b4747ce3d7 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -156,8 +156,8 @@ module ProjectsHelper
     end
   end
 
-  def repository_size(project = nil)
-    "#{(project || @project).repository_size} MB"
+  def repository_size(project = @project)
+    "#{project.repository_size} MB"
   rescue
     # In order to prevent 500 error
     # when application cannot allocate memory
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index f196ffd53f3..db2f9654e14 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -110,7 +110,7 @@ class Notify < BaseMailer
     if reply_key
       headers['X-GitLab-Reply-Key'] = reply_key
 
-      address = Mail::Address.new(Gitlab::ReplyByEmail.reply_address(reply_key))
+      address = Mail::Address.new(Gitlab::IncomingEmail.reply_address(reply_key))
       address.display_name = @project.name_with_namespace
 
       headers['Reply-To'] = address
@@ -150,6 +150,6 @@ class Notify < BaseMailer
   end
 
   def reply_key
-    @reply_key ||= Gitlab::ReplyByEmail.reply_key
+    @reply_key ||= SentNotification.reply_key
   end
 end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 93faa133875..eb468c6cd53 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -433,10 +433,22 @@ class MergeRequest < ActiveRecord::Base
     target_project.repository.fetch_ref(
       source_project.repository.path_to_repo,
       "refs/heads/#{source_branch}",
-      "refs/merge-requests/#{iid}/head"
+      ref_path
     )
   end
 
+  def ref_path
+    "refs/merge-requests/#{iid}/head"
+  end
+
+  def ref_is_fetched?
+    File.exists?(File.join(project.repository.path_to_repo, ref_path))
+  end
+
+  def ensure_ref_fetched
+    fetch_ref unless ref_is_fetched?
+  end
+
   def in_locked_state
     begin
       lock_mr
diff --git a/app/models/notification.rb b/app/models/notification.rb
index 1395274173d..171b8df45c2 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -12,7 +12,7 @@ class Notification
 
   class << self
     def notification_levels
-      [N_DISABLED, N_PARTICIPATING, N_WATCH, N_MENTION]
+      [N_DISABLED, N_MENTION, N_PARTICIPATING, N_WATCH]
     end
 
     def options_with_labels
@@ -26,7 +26,7 @@ class Notification
     end
 
     def project_notification_levels
-      [N_DISABLED, N_PARTICIPATING, N_WATCH, N_GLOBAL, N_MENTION]
+      [N_DISABLED, N_MENTION, N_PARTICIPATING, N_WATCH, N_GLOBAL]
     end
   end
 
@@ -57,4 +57,21 @@ class Notification
   def level
     target.notification_level
   end
+  
+  def to_s
+    case level
+    when N_DISABLED
+      'Disabled'
+    when N_PARTICIPATING
+      'Participating'
+    when N_WATCH
+      'Watching'
+    when N_MENTION
+      'On mention'
+    when N_GLOBAL
+      'Global'
+    else
+      # do nothing      
+    end
+  end
 end
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index 820dd3f567c..9e2b3bcd873 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -46,7 +46,9 @@ class GitlabCiService < CiService
     end
 
     ci_project = Ci::Project.find_by(gitlab_id: project.id)
-    Ci::CreateCommitService.new.execute(ci_project, data)
+    if ci_project
+      Ci::CreateCommitService.new.execute(ci_project, data)
+    end
   end
 
   def get_ci_commit(sha, ref)
@@ -85,7 +87,9 @@ class GitlabCiService < CiService
   end
 
   def build_page(sha, ref)
-    Ci::RoutesHelper.ci_project_ref_commits_path(project.gitlab_ci_project, ref, sha)
+    if project.gitlab_ci_project.present?
+      Ci::RoutesHelper.ci_project_ref_commits_path(project.gitlab_ci_project, ref, sha)
+    end
   end
 
   def title
diff --git a/app/models/sent_notification.rb b/app/models/sent_notification.rb
index 03425389dd3..3eed5c16e45 100644
--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -25,6 +25,12 @@ class SentNotification < ActiveRecord::Base
   validates :line_code, format: { with: /\A[a-z0-9]+_\d+_\d+\Z/ }, allow_blank: true
 
   class << self
+    def reply_key
+      return nil unless Gitlab::IncomingEmail.enabled?
+
+      SecureRandom.hex(16)
+    end
+
     def for(reply_key)
       find_by(reply_key: reply_key)
     end
diff --git a/app/services/milestones/destroy_service.rb b/app/services/milestones/destroy_service.rb
index 7ce7d259d0b..2414966505b 100644
--- a/app/services/milestones/destroy_service.rb
+++ b/app/services/milestones/destroy_service.rb
@@ -4,10 +4,15 @@ module Milestones
 
       Milestone.transaction do
         update_params = { milestone: nil }
+
         milestone.issues.each do |issue|
           Issues::UpdateService.new(project, current_user, update_params).execute(issue)
         end
 
+        milestone.merge_requests.each do |merge_request|
+          MergeRequests::UpdateService.new(project, current_user, update_params).execute(merge_request)
+        end
+
         event_service.destroy_milestone(milestone, current_user)
 
         Event.for_milestone_id(milestone.id).each do |event|
diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml
index 54191aadda6..8657d2c71fe 100644
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@ -58,7 +58,7 @@
       %p
         Reply by email
         %span.light.pull-right
-          = boolean_to_icon Gitlab::ReplyByEmail.enabled?
+          = boolean_to_icon Gitlab::IncomingEmail.enabled?
     .col-md-4
       %h4
         Components
diff --git a/app/views/layouts/ci/_nav_admin.html.haml b/app/views/layouts/ci/_nav_admin.html.haml
index e9974c85733..af2545a22d8 100644
--- a/app/views/layouts/ci/_nav_admin.html.haml
+++ b/app/views/layouts/ci/_nav_admin.html.haml
@@ -8,26 +8,26 @@
   %li.separate-item
   = nav_link path: 'projects#index' do
     = link_to ci_admin_projects_path do
-      %i.fa.fa-list-alt
+      = icon('list-alt fw')
       Projects
   = nav_link path: 'events#index' do
     = link_to ci_admin_events_path do
-      %i.fa.fa-book
+      = icon('book fw')
       Events
   = nav_link path: ['runners#index', 'runners#show'] do
     = link_to ci_admin_runners_path do
-      %i.fa.fa-cog
+      = icon('cog fw')
       Runners
       %small.pull-right
         = Ci::Runner.count(:all)
   = nav_link path: 'builds#index' do
     = link_to ci_admin_builds_path do
-      %i.fa.fa-link
+      = icon('link fw')
       Builds
       %small.pull-right
         = Ci::Build.count(:all)
   = nav_link(controller: :application_settings, html_options: { class: 'separate-item'}) do
     = link_to ci_admin_application_settings_path do
-      %i.fa.fa-cogs
+      = icon('cogs fw')
       %span
         Settings
diff --git a/app/views/layouts/ci/_nav_project.html.haml b/app/views/layouts/ci/_nav_project.html.haml
index d747679c8cf..b7e997be108 100644
--- a/app/views/layouts/ci/_nav_project.html.haml
+++ b/app/views/layouts/ci/_nav_project.html.haml
@@ -6,48 +6,48 @@
   %li.separate-item
   = nav_link path: ['projects#show', 'commits#show', 'builds#show'] do
     = link_to ci_project_path(@project) do
-      %i.fa.fa-list-alt
+      = icon('list-alt fw')
       %span
         Commits
-        %small.pull-right= @project.commits.count
+        %span.count= @project.commits.count
   = nav_link path: 'charts#show' do
     = link_to ci_project_charts_path(@project) do
-      %i.fa.fa-bar-chart
+      = icon('bar-chart fw')
       %span
         Charts
   = nav_link path: ['runners#index', 'runners#show', 'runners#edit'] do
     = link_to ci_project_runners_path(@project) do
-      %i.fa.fa-cog
+      = icon('cog fw')
       %span
         Runners
   = nav_link path: 'variables#show' do
     = link_to ci_project_variables_path(@project) do
-      %i.fa.fa-code
+      = icon('code fw')
       %span
         Variables
   = nav_link path: 'web_hooks#index' do
     = link_to ci_project_web_hooks_path(@project) do
-      %i.fa.fa-link
+      = icon('link fw')
       %span
         Web Hooks
   = nav_link path: 'triggers#index' do
     = link_to ci_project_triggers_path(@project) do
-      %i.fa.fa-retweet
+      = icon('retweet fw')
       %span
         Triggers
   = nav_link path: ['services#index', 'services#edit'] do
     = link_to ci_project_services_path(@project) do
-      %i.fa.fa-share
+      = icon('share fw')
       %span
         Services
   = nav_link path: 'events#index' do
     = link_to ci_project_events_path(@project) do
-      %i.fa.fa-book
+      = icon('book fw')
       %span
         Events
   %li.separate-item
   = nav_link path: 'projects#edit' do
     = link_to edit_ci_project_path(@project) do
-      %i.fa.fa-cogs
+      = icon('cogs fw')
       %span
         Settings
diff --git a/app/views/profiles/notifications/show.html.haml b/app/views/profiles/notifications/show.html.haml
index ea4e5f3e182..8eebd96b674 100644
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -33,7 +33,7 @@
         = f.label :notification_level, value: Notification::N_MENTION do
           = f.radio_button :notification_level, Notification::N_MENTION
           .level-title
-            Mention
+            On Mention
           %p You will receive notifications only for comments in which you were @mentioned
 
       .radio
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index b347846c932..6e53f55b0ab 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -26,10 +26,8 @@
           = icon('download fw')
           Download
 
-    = render 'projects/buttons/dropdown'
+    = render 'projects/buttons/notifications'
 
-    - if @project.gitlab_ci?
-      = link_to ci_project_path(@project.gitlab_ci_project), class: 'btn btn-default' do
-        CI
+    = render 'projects/buttons/dropdown'
 
   = render "shared/clone_panel"
diff --git a/app/views/projects/buttons/_notifications.html.haml b/app/views/projects/buttons/_notifications.html.haml
new file mode 100644
index 00000000000..57f764178d5
--- /dev/null
+++ b/app/views/projects/buttons/_notifications.html.haml
@@ -0,0 +1,14 @@
+- return unless @membership
+
+= form_tag profile_notifications_path, method: :put, remote: true, class: 'inline-form', id: 'notification-form' do
+  = hidden_field_tag :notification_type, 'project'
+  = hidden_field_tag :notification_id, @membership.id
+  = hidden_field_tag :notification_level
+  %span.dropdown
+    %a.dropdown-toggle.btn.btn-new#notifications-button{href: '#', "data-toggle" => "dropdown"}
+      = icon('bell')
+      = notification_label(@membership)
+      = icon('angle-down')
+    %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
+      - Notification.project_notification_levels.each do |level|
+        = notification_list_item(level, @membership)
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index 4d4e2f68f61..10640f746f0 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -10,7 +10,8 @@
         %span CI build #{status}
         for #{@merge_request.last_commit_short_sha}.
         %span.ci-coverage
-        = link_to "View build details", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
+        - if ci_build_details_path(@merge_request)
+          = link_to "View build details", ci_build_details_path(@merge_request), :"data-no-turbolink" => "data-no-turbolink"
 
     .ci_widget
       = icon("spinner spin")
diff --git a/app/views/projects/notes/_edit_form.html.haml b/app/views/projects/notes/_edit_form.html.haml
index 8f7d2e84c70..a0e26f9827e 100644
--- a/app/views/projects/notes/_edit_form.html.haml
+++ b/app/views/projects/notes/_edit_form.html.haml
@@ -1,7 +1,7 @@
 .note-edit-form
   = form_for note, url: namespace_project_note_path(@project.namespace, @project, note), method: :put, remote: true, authenticity_token: true do |f|
     = note_target_fields(note)
-    = render layout: 'projects/md_preview', locals: { preview_class: 'note-text' } do
+    = render layout: 'projects/md_preview', locals: { preview_class: 'md-preview' } do
       = render 'projects/zen', f: f, attr: :note, classes: 'note_text js-note-text js-task-list-field'
       = render 'projects/notes/hints'
 
diff --git a/app/views/projects/notes/_form.html.haml b/app/views/projects/notes/_form.html.haml
index 3be8f44b282..d99445da59a 100644
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
@@ -7,7 +7,7 @@
   = f.hidden_field :noteable_id
   = f.hidden_field :noteable_type
 
-  = render layout: 'projects/md_preview', locals: { preview_class: "note-text", referenced_users: true } do
+  = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do
     = render 'projects/zen', f: f, attr: :note, classes: 'note_text js-note-text'
     = render 'projects/notes/hints'
     .error-alert
diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml
index aa5914e3ed9..6a5fc689803 100644
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
@@ -24,7 +24,7 @@
         = pluralize(number_with_delimiter(@repository.tag_names.count), 'tag')
 
     %li
-      = link_to namespace_project_path(@project.namespace, @project) do
+      = link_to project_files_path(@project) do
         = repository_size
 
     - if !prefer_readme? && @repository.readme
diff --git a/app/workers/email_receiver_worker.rb b/app/workers/email_receiver_worker.rb
index 8cfb96ef376..5a921a73fe9 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::ReplyByEmail.enabled?
+    return unless Gitlab::IncomingEmail.enabled?
 
     begin
       Gitlab::Email::Receiver.new(raw).execute
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 69cdf497a84..15930fc9079 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -4,7 +4,7 @@
 #
 ###########################  NOTE  #####################################
 # This file should not receive new settings. All configuration options #
-# that do not require application restart are being moved to           #
+# that do not require an application restart are being moved to        #
 # ApplicationSetting model!                                            #
 # If you change this file in a Merge Request, please also create       #
 # a MR on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests  #
@@ -96,10 +96,10 @@ production: &base
 
   ## 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.html
-  reply_by_email:
+  # For documentation on how to set this up, see http://doc.gitlab.com/ce/incoming_email/README.html
+  incoming_email:
     enabled: false
-    address: "replies+%{reply_key}@gitlab.example.com"
+    address: "incoming+%{key}@gitlab.example.com"
 
   ## Gravatar
   ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index ddc9bbf5dfd..48601b67335 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -187,8 +187,8 @@ Settings.gitlab_ci['builds_path']         = File.expand_path(Settings.gitlab_ci[
 #
 # Reply by email
 #
-Settings['reply_by_email'] ||= Settingslogic.new({})
-Settings.reply_by_email['enabled'] = false if Settings.reply_by_email['enabled'].nil?
+Settings['incoming_email'] ||= Settingslogic.new({})
+Settings.incoming_email['enabled'] = false if Settings.incoming_email['enabled'].nil?
 
 #
 # Gravatar
diff --git a/db/migrate/20150918161719_remove_invalid_milestones_from_merge_requests.rb b/db/migrate/20150918161719_remove_invalid_milestones_from_merge_requests.rb
new file mode 100644
index 00000000000..0aad6fe5e6e
--- /dev/null
+++ b/db/migrate/20150918161719_remove_invalid_milestones_from_merge_requests.rb
@@ -0,0 +1,5 @@
+class RemoveInvalidMilestonesFromMergeRequests < ActiveRecord::Migration
+  def up
+    execute("UPDATE merge_requests SET milestone_id = NULL where milestone_id NOT IN (SELECT id FROM milestones)")
+  end
+end
diff --git a/doc/README.md b/doc/README.md
index f5f1f56b1e2..5f38086b8e3 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -46,7 +46,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.
+- [Reply by email](incoming_email/README.md) Allow users to comment on issues and merge requests by replying to notification emails.
 - [Migrate GitLab CI to CE/EE](migrate_ci_to_ce/README.md) Follow this guide to migrate your existing GitLab CI data to GitLab CE/EE.
 
 ### Administrator documentation
diff --git a/doc/reply_by_email/README.md b/doc/incoming_email/README.md
index e9187298d79..c94e25bd4cc 100644
--- a/doc/reply_by_email/README.md
+++ b/doc/incoming_email/README.md
@@ -12,24 +12,24 @@ To set up a basic Postfix mail server with IMAP access on Ubuntu, follow [these
 
 ## Set it up
 
-In this example, we'll use the Gmail address `gitlab-replies@gmail.com`.
+In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
 
 ### Omnibus package installations
 
-1. Find the `reply_by_email` section in `/etc/gitlab/gitlab.rb`, enable the feature, enter the email address including a placeholder for the `reply_key` and fill in the details for your specific IMAP server and email account:
+1. Find the `incoming_email` section in `/etc/gitlab/gitlab.rb`, enable the feature, enter the email address including a placeholder for the `key` that references the item being replied to and fill in the details for your specific IMAP server and email account:
 
     ```ruby
-    gitlab_rails['reply_by_email_enabled'] = true
-    gitlab_rails['reply_by_email_address'] = "gitlab-replies+%{reply_key}@gmail.com"
-    gitlab_rails['reply_by_email_host'] = "imap.gmail.com" # IMAP server host
-    gitlab_rails['reply_by_email_port'] = 993 # IMAP server port
-    gitlab_rails['reply_by_email_ssl'] = true # Whether the IMAP server uses SSL
-    gitlab_rails['reply_by_email_email'] = "gitlab-replies@gmail.com"  # Email account username. Usually the full email address.
-    gitlab_rails['reply_by_email_password'] = "password" # Email account password
-    gitlab_rails['reply_by_email_mailbox_name'] = "inbox" # The name of the mailbox where incoming mail will end up. Usually "inbox".
+    gitlab_rails['incoming_email_enabled'] = true
+    gitlab_rails['incoming_email_address'] = "gitlab-incoming+%{key}@gmail.com"
+    gitlab_rails['incoming_email_host'] = "imap.gmail.com" # IMAP server host
+    gitlab_rails['incoming_email_port'] = 993 # IMAP server port
+    gitlab_rails['incoming_email_ssl'] = true # Whether the IMAP server uses SSL
+    gitlab_rails['incoming_email_email'] = "gitlab-incoming@gmail.com"  # Email account username. Usually the full email address.
+    gitlab_rails['incoming_email_password'] = "password" # Email account password
+    gitlab_rails['incoming_email_mailbox_name'] = "inbox" # The name of the mailbox where incoming mail will end up. Usually "inbox".
     ```
 
-    As mentioned, the part after `+` in the address is ignored, and any email sent here will end up in the mailbox for `gitlab-replies@gmail.com`.
+    As mentioned, the part after `+` in the address is ignored, and any email sent here will end up in the mailbox for `gitlab-incoming@gmail.com`.
 
 1. Reconfigure GitLab for the changes to take effect:
 
@@ -40,7 +40,7 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`.
 1. Verify that everything is configured correctly:
 
     ```sh
-    sudo gitlab-rake gitlab:reply_by_email:check
+    sudo gitlab-rake gitlab:incoming_email:check
     ```
 
 1. Reply by email should now be working.
@@ -53,19 +53,19 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`.
     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`:
+1. Find the `incoming_email` section in `config/gitlab.yml`, enable the feature and enter the email address including a placeholder for the `key` that references the item being replied to:
 
     ```sh
     sudo editor config/gitlab.yml
     ```
 
     ```yaml
-    reply_by_email:
+    incoming_email:
       enabled: true
-      address: "gitlab-replies+%{reply_key}@gmail.com"
+      address: "gitlab-incoming+%{key}@gmail.com"
     ```
 
-    As mentioned, the part after `+` in the address is ignored, and any email sent here will end up in the mailbox for `gitlab-replies@gmail.com`.
+    As mentioned, the part after `+` in the address is ignored, and any email sent here will end up in the mailbox for `gitlab-incoming@gmail.com`.
 
 2. Copy `config/mail_room.yml.example` to `config/mail_room.yml`:
 
@@ -89,7 +89,7 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`.
         # Whether the IMAP server uses SSL
         :ssl: true
         # Email account username. Usually the full email address.
-        :email: "gitlab-replies@gmail.com"
+        :email: "gitlab-incoming@gmail.com"
         # Email account password
         :password: "[REDACTED]"
         # The name of the mailbox where incoming mail will end up. Usually "inbox".
@@ -125,7 +125,7 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`.
 7. Verify that everything is configured correctly:
 
     ```sh
-    sudo -u git -H bundle exec rake gitlab:reply_by_email:check RAILS_ENV=production
+    sudo -u git -H bundle exec rake gitlab:incoming_email:check RAILS_ENV=production
     ```
 
 8. Reply by email should now be working.
@@ -134,15 +134,15 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`.
 
 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`:
+1. Find the `incoming_email` section in `config/gitlab.yml`, enable the feature and enter the email address including a placeholder for the `key` that references the item being replied to:
 
     ```yaml
-    reply_by_email:
+    incoming_email:
       enabled: true
-      address: "gitlab-replies+%{reply_key}@gmail.com"
+      address: "gitlab-incoming+%{key}@gmail.com"
     ```
 
-    As mentioned, the part after `+` is ignored, and this will end up in the mailbox for `gitlab-replies@gmail.com`.
+    As mentioned, the part after `+` is ignored, and this will end up in the mailbox for `gitlab-incoming@gmail.com`.
 
 2. Copy `config/mail_room.yml.example` to `config/mail_room.yml`:
 
@@ -162,7 +162,7 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`.
         # Whether the IMAP server uses SSL
         :ssl: true
         # Email account username. Usually the full email address.
-        :email: "gitlab-replies@gmail.com"
+        :email: "gitlab-incoming@gmail.com"
         # Email account password
         :password: "[REDACTED]"
         # The name of the mailbox where incoming mail will end up. Usually "inbox".
@@ -197,7 +197,7 @@ In this example, we'll use the Gmail address `gitlab-replies@gmail.com`.
 7. Verify that everything is configured correctly:
 
     ```sh
-    bundle exec rake gitlab:reply_by_email:check RAILS_ENV=development
+    bundle exec rake gitlab:incoming_email:check RAILS_ENV=development
     ```
 
 8. Reply by email should now be working.
diff --git a/doc/reply_by_email/postfix.md b/doc/incoming_email/postfix.md
index c0ac59bb922..18bf3db1744 100644
--- a/doc/reply_by_email/postfix.md
+++ b/doc/incoming_email/postfix.md
@@ -2,7 +2,7 @@
 
 This document will take you through the steps of setting up a basic Postfix mail server with IMAP authentication on Ubuntu, to be used with Reply by email.
 
-The instructions make the assumption that you will be using the email address `replies@gitlab.example.com`, that is, username `replies` on host `gitlab.example.com`. Don't forget to change it to your actual host when executing the example code snippets.
+The instructions make the assumption that you will be using the email address `incoming@gitlab.example.com`, that is, username `incoming` on host `gitlab.example.com`. Don't forget to change it to your actual host when executing the example code snippets.
 
 ## Configure your server firewall
 
@@ -27,16 +27,16 @@ The instructions make the assumption that you will be using the email address `r
 
 ## Create user
 
-1. Create a user for replies.
+1. Create a user for incoming email.
 
     ```sh
-    sudo useradd -m -s /bin/bash replies
+    sudo useradd -m -s /bin/bash incoming
     ```
 
 1. Set a password for this user.
 
     ```sh
-    sudo passwd replies
+    sudo passwd incoming
     ```
 
     Be sure not to forget this, you'll need it later.
@@ -70,12 +70,12 @@ The instructions make the assumption that you will be using the email address `r
     sudo postfix start
     ```
 
-1. Send the new `replies` user a dummy email to test SMTP, by entering the following into the SMTP prompt:
+1. Send the new `incoming` user a dummy email to test SMTP, by entering the following into the SMTP prompt:
     
     ```
     ehlo localhost
     mail from: root@localhost
-    rcpt to: replies@localhost
+    rcpt to: incoming@localhost
     data
     Subject: Re: Some issue
 
@@ -86,17 +86,17 @@ The instructions make the assumption that you will be using the email address `r
 
     (Note: The `.` is a literal period on its own line)
 
-1. Check if the `replies` user received the email:
+1. Check if the `incoming` user received the email:
     
     ```sh
-    su - replies
+    su - incoming
     mail
     ```
 
     You should see output like this:
 
     ```
-    "/var/mail/replies": 1 message 1 unread
+    "/var/mail/incoming": 1 message 1 unread
     >U   1 root@localhost                           59/2842  Re: Some issue
     ```
 
@@ -106,7 +106,7 @@ The instructions make the assumption that you will be using the email address `r
     q
     ```
 
-1. Log out of the `replies` account and go back to being `root`:
+1. Log out of the `incoming` account and go back to being `root`:
 
     ```sh
     logout
@@ -131,18 +131,18 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 1. Test the new setup:
     
     1. Follow steps 1 and 2 of _[Test the out-of-the-box setup](#test-the-out-of-the-box-setup)_.
-    2. Check if the `replies` user received the email:
+    2. Check if the `incoming` user received the email:
     
         ```sh
-        su - replies
-        MAIL=/home/replies/Maildir
+        su - incoming
+        MAIL=/home/incoming/Maildir
         mail
         ```
 
         You should see output like this:
 
         ```
-        "/home/replies/Maildir": 1 message 1 unread
+        "/home/incoming/Maildir": 1 message 1 unread
         >U   1 root@localhost                           59/2842  Re: Some issue
         ```
 
@@ -152,7 +152,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
         q
         ```
 
-1. Log out of the `replies` account and go back to being `root`:
+1. Log out of the `incoming` account and go back to being `root`:
 
     ```sh
     logout
@@ -221,12 +221,12 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
         If you get a `Connection refused` error instead, make sure your firewall is setup to allow inbound traffic on port 25.
 
-    1. Send the `replies` user a dummy email to test SMTP, by entering the following into the SMTP prompt:
+    1. Send the `incoming` user a dummy email to test SMTP, by entering the following into the SMTP prompt:
         
         ```
         ehlo gitlab.example.com
         mail from: root@gitlab.example.com
-        rcpt to: replies@gitlab.example.com
+        rcpt to: incoming@gitlab.example.com
         data
         Subject: Re: Some issue
 
@@ -237,18 +237,18 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
 
         (Note: The `.` is a literal period on its own line)
 
-    1. Check if the `replies` user received the email:
+    1. Check if the `incoming` user received the email:
     
         ```sh
-        su - replies
-        MAIL=/home/replies/Maildir
+        su - incoming
+        MAIL=/home/incoming/Maildir
         mail
         ```
 
         You should see output like this:
 
         ```
-        "/home/replies/Maildir": 1 message 1 unread
+        "/home/incoming/Maildir": 1 message 1 unread
         >U   1 root@gitlab.example.com                           59/2842  Re: Some issue
         ```
 
@@ -258,7 +258,7 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
         q
         ```
 
-    1. Log out of the `replies` account and go back to being `root`:
+    1. Log out of the `incoming` account and go back to being `root`:
 
         ```sh
         logout
@@ -281,13 +281,13 @@ Courier, which we will install later to add IMAP authentication, requires mailbo
         - OK [CAPABILITY IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA IDLE ACL ACL2=UNION] Courier-IMAP ready. Copyright 1998-2011 Double Precision, Inc.  See COPYING for distribution information.
         ```
 
-    1. Sign in as the `replies` user to test IMAP, by entering the following into the IMAP prompt:
+    1. Sign in as the `incoming` user to test IMAP, by entering the following into the IMAP prompt:
 
         ```
-        a login replies PASSWORD
+        a login incoming PASSWORD
         ```
 
-        Replace PASSWORD with the password you set on the `replies` user earlier.
+        Replace PASSWORD with the password you set on the `incoming` user earlier.
 
         You should see output like this:
 
@@ -307,4 +307,4 @@ If all the tests were successful, Postfix is all set up and ready to receive ema
 
 ---------
 
-_This document was adapted from https://help.ubuntu.com/community/PostfixBasicSetupHowto, by contributors to the Ubuntu documentation wiki._
\ No newline at end of file
+_This document was adapted from https://help.ubuntu.com/community/PostfixBasicSetupHowto, by contributors to the Ubuntu documentation wiki._
diff --git a/features/project/project.feature b/features/project/project.feature
index 089ffcba14a..b3fb0794547 100644
--- a/features/project/project.feature
+++ b/features/project/project.feature
@@ -74,3 +74,9 @@ Feature: Project
     Given I disable snippets in project
     When I visit project "Shop" page
     Then I should not see "Snippets" button
+
+  @javascript
+  Scenario: I edit Project Notifications
+    Given I click notifications drop down button
+    When I choose Mention setting
+    Then I should see Notification saved message
diff --git a/features/steps/project/project.rb b/features/steps/project/project.rb
index 079a190e356..15f77734cb2 100644
--- a/features/steps/project/project.rb
+++ b/features/steps/project/project.rb
@@ -130,4 +130,18 @@ class Spinach::Features::Project < Spinach::FeatureSteps
   step 'I should see back to group button' do
     expect(page).to have_content 'Back to group'
   end
+
+  step 'I click notifications drop down button' do
+    click_link 'notifications-button'
+  end
+
+  step 'I choose Mention setting' do
+    click_link 'On mention'
+  end
+
+  step 'I should see Notification saved message' do
+    page.within '.flash-container' do
+      expect(page).to have_content 'Notification settings saved'
+    end
+  end
 end
diff --git a/lib/ci/migrate/builds.rb b/lib/ci/migrate/builds.rb
index fdc143cfad5..c4f62e55295 100644
--- a/lib/ci/migrate/builds.rb
+++ b/lib/ci/migrate/builds.rb
@@ -13,7 +13,7 @@ module Ci
         backup_existing_builds_dir
 
         FileUtils.mkdir_p(app_builds_dir, mode: 0700)
-        unless system('tar', '-C', app_builds_dir, '-zxvf', backup_builds_tarball)
+        unless system('tar', '-C', app_builds_dir, '-zxf', backup_builds_tarball)
           abort 'Restore failed'.red
         end
       end
diff --git a/lib/ci/migrate/manager.rb b/lib/ci/migrate/manager.rb
index 4205809368d..e5e4fb784eb 100644
--- a/lib/ci/migrate/manager.rb
+++ b/lib/ci/migrate/manager.rb
@@ -1,6 +1,8 @@
 module Ci
   module Migrate
     class Manager
+      CI_IMPORT_PREFIX = '8.0' # Only allow imports from CI 8.0.x
+
       def cleanup
         $progress.print "Deleting tmp directories ... "
 
@@ -48,7 +50,7 @@ module Ci
         ENV["VERSION"] = "#{settings[:db_version]}" if settings[:db_version].to_i > 0
 
         # restoring mismatching backups can lead to unexpected problems
-        if settings[:gitlab_version] != GitlabCi::VERSION
+        if !settings[:gitlab_version].start_with?(CI_IMPORT_PREFIX)
           puts "GitLab CI version mismatch:".red
           puts "  Your current GitLab CI version (#{GitlabCi::VERSION}) differs from the GitLab CI (#{settings[:gitlab_version]}) version in the backup!".red
           exit 1
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index 341b557858f..2b252b32887 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -65,7 +65,7 @@ module Gitlab
       def reply_key
         reply_key = nil
         message.to.each do |address|
-          reply_key = Gitlab::ReplyByEmail.reply_key_from_address(address)
+          reply_key = Gitlab::IncomingEmail.key_from_address(address)
           break if reply_key
         end
 
diff --git a/lib/gitlab/reply_by_email.rb b/lib/gitlab/incoming_email.rb
index c3fe6778f06..856ccc71084 100644
--- a/lib/gitlab/reply_by_email.rb
+++ b/lib/gitlab/incoming_email.rb
@@ -1,5 +1,5 @@
 module Gitlab
-  module ReplyByEmail
+  module IncomingEmail
     class << self
       def enabled?
         config.enabled && address_formatted_correctly?
@@ -7,20 +7,14 @@ module Gitlab
 
       def address_formatted_correctly?
         config.address &&
-          config.address.include?("%{reply_key}")
+          config.address.include?("%{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)
+      def reply_address(key)
+        config.address.gsub('%{key}', key)
       end
 
-      def reply_key_from_address(address)
+      def key_from_address(address)
         regex = address_regex
         return unless regex
 
@@ -33,7 +27,7 @@ module Gitlab
       private
 
       def config
-        Gitlab.config.reply_by_email
+        Gitlab.config.incoming_email
       end
 
       def address_regex
@@ -41,7 +35,7 @@ module Gitlab
         return nil unless wildcard_address
 
         regex = Regexp.escape(wildcard_address)
-        regex = regex.gsub(Regexp.escape('%{reply_key}'), "(.+)")
+        regex = regex.gsub(Regexp.escape('%{key}'), "(.+)")
         Regexp.new(regex).freeze
       end
     end
diff --git a/lib/gitlab/markdown/relative_link_filter.rb b/lib/gitlab/markdown/relative_link_filter.rb
index 8c5cf51bfe1..6ee3d1ce039 100644
--- a/lib/gitlab/markdown/relative_link_filter.rb
+++ b/lib/gitlab/markdown/relative_link_filter.rb
@@ -59,25 +59,43 @@ module Gitlab
       end
 
       def relative_file_path(path)
-        nested_path = build_nested_path(path, context[:requested_path])
+        nested_path = build_relative_path(path, context[:requested_path])
         file_exists?(nested_path) ? nested_path : path
       end
 
-      # Covering a special case, when the link is referencing file in the same
-      # directory.
-      # If we are at doc/api/README.md and the README.md contains relative
-      # links like [Users](users.md), this takes the request
-      # path(doc/api/README.md) and replaces the README.md with users.md so the
-      # path looks like doc/api/users.md.
-      # If we are at doc/api and the README.md shown in below the tree view
-      # this takes the request path(doc/api) and adds users.md so the path
-      # looks like doc/api/users.md
-      def build_nested_path(path, request_path)
+      # Convert a relative path into its correct location based on the currently
+      # requested path
+      #
+      # path         - Relative path String
+      # request_path - Currently-requested path String
+      #
+      # Examples:
+      #
+      #   # File in the same directory as the current path
+      #   build_relative_path("users.md", "doc/api/README.md")
+      #   # => "doc/api/users.md"
+      #
+      #   # File in the same directory, which is also the current path
+      #   build_relative_path("users.md", "doc/api")
+      #   # => "doc/api/users.md"
+      #
+      #   # Going up one level to a different directory
+      #   build_relative_path("../update/7.14-to-8.0.md", "doc/api/README.md")
+      #   # => "doc/update/7.14-to-8.0.md"
+      #
+      # Returns a String
+      def build_relative_path(path, request_path)
         return request_path if path.empty?
         return path unless request_path
 
         parts = request_path.split('/')
         parts.pop if path_type(request_path) != 'tree'
+
+        while parts.length > 1 && path.start_with?('../')
+          parts.pop
+          path.sub!('../', '')
+        end
+
         parts.push(path).join('/')
       end
 
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index b8eb13a4fea..c8222f8ce11 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -2,7 +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:incoming_email:check
                  gitlab:ldap:check
                  gitlab:app:check}
 
@@ -634,13 +634,13 @@ namespace :gitlab do
   end
 
 
-  namespace :reply_by_email do
+  namespace :incoming_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
+      if Gitlab.config.incoming_email.enabled
         check_address_formatted_correctly
         check_mail_room_config_exists
         check_imap_authentication
@@ -665,12 +665,12 @@ namespace :gitlab do
     def check_address_formatted_correctly
       print "Address formatted correctly? ... "
 
-      if Gitlab::ReplyByEmail.address_formatted_correctly?
+      if Gitlab::IncomingEmail.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."
+          "Make sure that the address in config/gitlab.yml includes the '%{key}' placeholder."
         )
         fix_and_rerun
       end
@@ -689,7 +689,7 @@ namespace :gitlab do
           "Enable mail_room in the init.d configuration."
         )
         for_more_information(
-          "doc/reply_by_email/README.md"
+          "doc/incoming_email/README.md"
         )
         fix_and_rerun
       end
@@ -708,7 +708,7 @@ namespace :gitlab do
           "Enable mail_room in your Procfile."
         )
         for_more_information(
-          "doc/reply_by_email/README.md"
+          "doc/incoming_email/README.md"
         )
         fix_and_rerun
       end
@@ -753,7 +753,7 @@ namespace :gitlab do
           "Check that the information in config/mail_room.yml is correct"
         )
         for_more_information(
-          "doc/reply_by_email/README.md"
+          "doc/incoming_email/README.md"
         )
         fix_and_rerun
       end
@@ -789,7 +789,7 @@ namespace :gitlab do
           "Check that the information in config/mail_room.yml is correct"
         )
         for_more_information(
-          "doc/reply_by_email/README.md"
+          "doc/incoming_email/README.md"
         )
         fix_and_rerun
       end
diff --git a/spec/controllers/projects/milestones_controller_spec.rb b/spec/controllers/projects/milestones_controller_spec.rb
index 35446640929..8127efabe6e 100644
--- a/spec/controllers/projects/milestones_controller_spec.rb
+++ b/spec/controllers/projects/milestones_controller_spec.rb
@@ -5,6 +5,7 @@ describe Projects::MilestonesController do
   let(:user)    { create(:user) }
   let(:milestone) { create(:milestone, project: project) }
   let(:issue) { create(:issue, project: project, milestone: milestone) }
+  let(:merge_request) { create(:merge_request, source_project: project, target_project: project, milestone: milestone) }
 
   before do
     sign_in(user)
@@ -14,6 +15,7 @@ describe Projects::MilestonesController do
 
   describe "#destroy" do
     it "should remove milestone" do
+      merge_request.reload
       expect(issue.milestone_id).to eq(milestone.id)
 
       delete :destroy, namespace_id: project.namespace.id, project_id: project.id, id: milestone.id, format: :js
@@ -24,6 +26,10 @@ describe Projects::MilestonesController do
       expect { Milestone.find(milestone.id) }.to raise_exception(ActiveRecord::RecordNotFound)
       issue.reload
       expect(issue.milestone_id).to eq(nil)
+
+      merge_request.reload
+      expect(merge_request.milestone_id).to eq(nil)
+
       # Check system note left for milestone removal
       last_note = project.issues.find(issue.id).notes[-1].note
       expect(last_note).to eq('Milestone removed')
diff --git a/spec/helpers/gitlab_markdown_helper_spec.rb b/spec/helpers/gitlab_markdown_helper_spec.rb
index 5639b3db913..b8101ae77ec 100644
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
@@ -38,6 +38,17 @@ describe GitlabMarkdownHelper do
         expect(markdown(actual)).to match(expected)
       end
     end
+
+    describe "override default project" do
+      let(:actual) { issue.to_reference }
+      let(:second_project) { create(:project) }
+      let(:second_issue) { create(:issue, project: second_project) }
+
+      it 'should link to the issue' do
+        expected = namespace_project_issue_path(second_project.namespace, second_project, second_issue)
+        expect(markdown(actual, project: second_project)).to match(expected)
+      end
+    end
   end
 
   describe '#link_to_gfm' do
diff --git a/spec/lib/gitlab/email/receiver_spec.rb b/spec/lib/gitlab/email/receiver_spec.rb
index 1cc80f35f98..e470b7cd5f5 100644
--- a/spec/lib/gitlab/email/receiver_spec.rb
+++ b/spec/lib/gitlab/email/receiver_spec.rb
@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Gitlab::Email::Receiver do
   before do
-    stub_reply_by_email_setting(enabled: true, address: "reply+%{reply_key}@appmail.adventuretime.ooo")
+    stub_incoming_email_setting(enabled: true, address: "reply+%{key}@appmail.adventuretime.ooo")
   end
 
   let(:reply_key) { "59d8df8370b7e95c5a49fbf86aeb2c93" }
diff --git a/spec/lib/gitlab/incoming_email_spec.rb b/spec/lib/gitlab/incoming_email_spec.rb
new file mode 100644
index 00000000000..5fdb9c723b1
--- /dev/null
+++ b/spec/lib/gitlab/incoming_email_spec.rb
@@ -0,0 +1,61 @@
+require "spec_helper"
+
+describe Gitlab::IncomingEmail do
+  describe "self.enabled?" do
+    context "when reply by email is enabled" do
+      before do
+        stub_incoming_email_setting(enabled: true)
+      end
+
+      context "when the address is valid" do
+        before do
+          stub_incoming_email_setting(address: "replies+%{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
+          stub_incoming_email_setting(address: "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
+        stub_incoming_email_setting(enabled: false)
+      end
+
+      it "returns false" do
+        expect(described_class.enabled?).to be_falsey
+      end
+    end
+  end
+
+  context "self.reply_address" do
+    before do
+      stub_incoming_email_setting(address: "replies+%{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.key_from_address" do
+    before do
+      stub_incoming_email_setting(address: "replies+%{key}@example.com")
+    end
+
+    it "returns reply key" do
+      expect(described_class.key_from_address("replies+key@example.com")).to eq("key")
+    end
+  end
+end
diff --git a/spec/lib/gitlab/markdown/relative_link_filter_spec.rb b/spec/lib/gitlab/markdown/relative_link_filter_spec.rb
index 7f4d67e403f..027336ceb73 100644
--- a/spec/lib/gitlab/markdown/relative_link_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/relative_link_filter_spec.rb
@@ -4,14 +4,16 @@ require 'spec_helper'
 
 module Gitlab::Markdown
   describe RelativeLinkFilter do
-    def filter(doc)
-      described_class.call(doc, {
+    def filter(doc, contexts = {})
+      contexts.reverse_merge!({
         commit:         project.commit,
         project:        project,
         project_wiki:   project_wiki,
         ref:            ref,
         requested_path: requested_path
       })
+
+      described_class.call(doc, contexts)
     end
 
     def image(path)
@@ -75,6 +77,22 @@ module Gitlab::Markdown
           to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
       end
 
+      it 'rebuilds relative URL for a file in the repo up one directory' do
+        relative_link = link('../api/README.md')
+        doc = filter(relative_link, requested_path: 'doc/update/7.14-to-8.0.md')
+
+        expect(doc.at_css('a')['href']).
+          to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
+      end
+
+      it 'rebuilds relative URL for a file in the repo up multiple directories' do
+        relative_link = link('../../../api/README.md')
+        doc = filter(relative_link, requested_path: 'doc/foo/bar/baz/README.md')
+
+        expect(doc.at_css('a')['href']).
+          to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
+      end
+
       it 'rebuilds relative URL for a file in the repo with an anchor' do
         doc = filter(link('README.md#section'))
         expect(doc.at_css('a')['href']).
@@ -108,8 +126,8 @@ module Gitlab::Markdown
         escaped = Addressable::URI.escape(path)
 
         # Stub these methods so the file doesn't actually need to be in the repo
-        allow_any_instance_of(described_class).to receive(:file_exists?).
-          and_return(true)
+        allow_any_instance_of(described_class).
+          to receive(:file_exists?).and_return(true)
         allow_any_instance_of(described_class).
           to receive(:image?).with(path).and_return(true)
 
diff --git a/spec/lib/gitlab/reply_by_email_spec.rb b/spec/lib/gitlab/reply_by_email_spec.rb
deleted file mode 100644
index a678c7e1a76..00000000000
--- a/spec/lib/gitlab/reply_by_email_spec.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require "spec_helper"
-
-describe Gitlab::ReplyByEmail do
-  describe "self.enabled?" do
-    context "when reply by email is enabled" do
-      before do
-        stub_reply_by_email_setting(enabled: true)
-      end
-
-      context "when the address is valid" do
-        before do
-          stub_reply_by_email_setting(address: "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
-          stub_reply_by_email_setting(address: "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
-        stub_reply_by_email_setting(enabled: 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
-      stub_reply_by_email_setting(address: "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
-      stub_reply_by_email_setting(address: "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
diff --git a/spec/support/stub_configuration.rb b/spec/support/stub_configuration.rb
index ef3a120d44a..f40ee862df8 100644
--- a/spec/support/stub_configuration.rb
+++ b/spec/support/stub_configuration.rb
@@ -17,8 +17,8 @@ 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)
+  def stub_incoming_email_setting(messages)
+    allow(Gitlab.config.incoming_email).to receive_messages(messages)
   end
 
   private
diff --git a/spec/workers/email_receiver_worker_spec.rb b/spec/workers/email_receiver_worker_spec.rb
index e8f1bd2fa2f..65a8d7d9197 100644
--- a/spec/workers/email_receiver_worker_spec.rb
+++ b/spec/workers/email_receiver_worker_spec.rb
@@ -5,7 +5,7 @@ describe EmailReceiverWorker do
 
   context "when reply by email is enabled" do
     before do
-      allow(Gitlab::ReplyByEmail).to receive(:enabled?).and_return(true)
+      allow(Gitlab::IncomingEmail).to receive(:enabled?).and_return(true)
     end
 
     it "calls the email receiver" do
@@ -33,7 +33,7 @@ describe EmailReceiverWorker do
 
   context "when reply by email is disabled" do
     before do
-      allow(Gitlab::ReplyByEmail).to receive(:enabled?).and_return(false)
+      allow(Gitlab::IncomingEmail).to receive(:enabled?).and_return(false)
     end
 
     it "doesn't call the email receiver" do