Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993

fe86c8df · Douwe Maan · d92f4280 · a429eb4d · fe86c8df · fe86c8df
Commit fe86c8df authored Aug 29, 2015 by Douwe Maan
226 changed files
--- 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

--- a/CHANGELOG
+++ b/CHANGELOG
 Please view this file on the master branch, on stable branches it's out of date.

 v 8.0.0 (unreleased)
+  - Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files (Stan Hu)
+  - Prevent too many redirects upon login when home page URL is set to external_url (Stan Hu)
+  - 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)
+  - 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)
@@ -9,8 +14,26 @@ 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
-
-v 7.14.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
+  - Improve performance of git blame
+  - Limit content width to 1200px for most of pages to improve readability on big screens
+  - Fix 500 error when submit project snippet without body
+  - Improve search page usability
+  - Bring more UI consistency in way how projects, snippets and groups lists are rendered
+  - Make all profiles public
+
+v 7.14.1
+  - Improve abuse reports management from admin area
+  - Fix "Reload with full diff" URL button in compare branch view (Stan Hu)
+  - 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)
+  - Ability to enable SSL verification for Webhooks
+
+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
  - Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules (Stan Hu)
@@ -294,6 +317,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)

--- a/Gemfile
+++ b/Gemfile
@@ -34,11 +34,11 @@ 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
-gem "gitlab_git", '~> 7.2.14'
+gem "gitlab_git", '~> 7.2.15'

 # Ruby/Rack Git Smart-HTTP Server Handler
 # GitLab fork with a lot of changes (improved thread-safety, better memory usage etc)
@@ -272,3 +272,7 @@ end
 gem "newrelic_rpm"

 gem 'octokit', '3.7.0'
+
+gem "mail_room", "~> 0.4.1"
+
+gem 'email_reply_parser'
--- 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)
@@ -156,6 +156,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)
@@ -275,7 +276,7 @@ GEM
      mime-types (~> 1.19)
    gitlab_emoji (0.1.0)
      gemojione (~> 2.0)
-    gitlab_git (7.2.14)
+    gitlab_git (7.2.15)
      activesupport (~> 4.0)
      charlock_holmes (~> 0.6)
      gitlab-linguist (~> 3.0)
@@ -371,6 +372,7 @@ GEM
      systemu (~> 2.6.2)
    mail (2.6.3)
      mime-types (>= 1.16, < 3)
+    mail_room (0.4.1)
    method_source (0.8.2)
    mime-types (1.25.1)
    mimemagic (0.3.0)
@@ -753,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)
@@ -773,6 +775,7 @@ DEPENDENCIES
  diffy (~> 3.0.3)
  doorkeeper (= 2.1.3)
  dropzonejs-rails
+  email_reply_parser
  email_spec (~> 1.6.0)
  enumerize
  factory_girl_rails
@@ -787,7 +790,7 @@ DEPENDENCIES
  gitlab-grack (~> 2.0.2)
  gitlab-linguist (~> 3.0.1)
  gitlab_emoji (~> 0.1)
-  gitlab_git (~> 7.2.14)
+  gitlab_git (~> 7.2.15)
  gitlab_meta (= 7.0)
  gitlab_omniauth-ldap (= 1.2.1)
  gollum-lib (~> 4.0.2)
@@ -805,6 +808,7 @@ DEPENDENCIES
  jquery-ui-rails
  kaminari (~> 0.15.1)
  letter_opener
+  mail_room (~> 0.4.1)
  minitest (~> 5.3.0)
  mousetrap-rails
  mysql2

--- a/Procfile
+++ b/Procfile
 web: bundle exec unicorn_rails -p ${PORT:="3000"} -E ${RAILS_ENV:="development"} -c ${UNICORN_CONFIG:="config/unicorn.rb"}
-worker: bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q common -q default
+worker: bundle exec sidekiq -q post_receive -q mailer -q archive_repo -q system_hook -q project_web_hook -q gitlab_shell -q incoming_email -q common -q default
+# mail_room: bundle exec mail_room -q -c config/mail_room.yml
--- a/app/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)


--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -51,10 +51,10 @@ class Dispatcher
        MergeRequests.init()
      when 'dashboard:show', 'root:show'
        new Dashboard()
+      when 'dashboard:activity'
        new Activities()
      when 'dashboard:projects:starred'
        new Activities()
-        new ProjectsList()
      when 'projects:commit:show'
        new Commit()
        new Diff()
@@ -69,7 +69,6 @@ class Dispatcher
      when 'groups:show'
        new Activities()
        shortcut_handler = new ShortcutsNavigation()
-        new ProjectsList()
      when 'groups:group_members:index'
        new GroupMembers()
        new UsersSelect()
@@ -95,8 +94,6 @@ class Dispatcher
      when 'users:show'
        new User()
        new Activities()
-      when 'admin:users:show'
-        new ProjectsList()

    switch path.first()
      when 'admin'

--- 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

--- a/app/assets/javascripts/syntax_highlight.coffee
+++ b/app/assets/javascripts/syntax_highlight.coffee
+# Applies a syntax highlighting color scheme CSS class to any element with the
+# `js-syntax-highlight` class
+#
+# ### Example Markup
+#
+#   <div class="js-syntax-highlight"></div>
+#
+$(document).on 'ready page:load', ->
+  $('.js-syntax-highlight').addClass(gon.user_color_scheme)
--- 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)

--- 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;
+}
--- a/app/assets/stylesheets/base/mixins.scss
+++ b/app/assets/stylesheets/base/mixins.scss
@@ -157,3 +157,41 @@
  white-space: nowrap;
  max-width: $max_width;
 }
+
+/*
+ * Base mixin for lists in GitLab
+ */
+@mixin basic-list {
+  margin: 5px 0px;
+  padding: 0px;
+  list-style: none;
+
+  li {
+    padding: 10px 0;
+    border-bottom: 1px solid #EEE;
+    overflow: hidden;
+    display: block;
+    margin: 0px;
+
+    &:last-child {
+      border:none
+    }
+
+    &.active {
+      background: #f9f9f9;
+      a {
+        font-weight: bold;
+      }
+    }
+
+    &.hide {
+      display: none;
+    }
+
+    &.light {
+      a {
+        color: #777;
+      }
+    }
+  }
+}
--- 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;


 /*

--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -132,10 +132,6 @@ p.time {
  text-shadow: none;
 }

-.highlight_word {
-  background: #fafe3d;
-}
-
 .thin_area{
  height: 150px;
 }
@@ -375,9 +371,9 @@ table {
 }

 .center-top-menu {
-  border-bottom: 1px solid #EEE;
  list-style: none;
  text-align: center;
+  margin-top: 5px;
  padding-bottom: 15px;
  margin-bottom: 15px;

@@ -385,7 +381,7 @@ table {
    display: inline-block;

    a {
-      padding: 10px;
+      padding: 15px;
    }

    &.active a {

--- 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;

--- a/app/assets/stylesheets/generic/lists.scss
+++ b/app/assets/stylesheets/generic/lists.scss
@@ -93,28 +93,12 @@ ol, ul {

 /** light list with border-bottom between li **/
 ul.bordered-list {
-  margin: 5px 0px;
-  padding: 0px;
-  li {
-    padding: 5px 0;
-    border-bottom: 1px solid #EEE;
-    overflow: hidden;
-    display: block;
-    margin: 0px;
-    &:last-child { border:none }
-    &.active {
-      background: #f9f9f9;
-      a { font-weight: bold; }
-    }
-
-    &.light {
-      a { color: #777; }
-    }
-  }
+  @include basic-list;

  &.top-list {
    li:first-child {
      padding-top: 0;
+
      h4, h5 {
        margin-top: 0;
      }

--- 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;
+    }
+  }
+}
--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
@@ -21,6 +21,12 @@ pre.code.highlight.dark,
    background-color: #557 !important;
  }

+  // Search result highlight
+  span.highlight_word {
+    background: #ffe792;
+    color: #000000;
+  }
+
  .hll { background-color: #373b41 }
  .c { color: #969896 } /* Comment */
  .err { color: #cc6666 } /* Error */

--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
@@ -21,6 +21,12 @@ pre.code.monokai,
    background-color: #49483e !important;
  }

+  // Search result highlight
+  span.highlight_word {
+    background: #ffe792;
+    color: #000000;
+  }
+
  .hll { background-color: #49483e }
  .c { color: #75715e } /* Comment */
  .err { color: #960050; background-color: #1e0010 } /* Error */

--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
@@ -21,6 +21,11 @@ pre.code.highlight.solarized-dark,
    background-color: #174652 !important;
  }

+  // Search result highlight
+  span.highlight_word {
+    background: #094554;
+  }
+
  /* Solarized Dark

  For use with Jekyll and Pygments

--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
@@ -21,6 +21,11 @@ pre.code.highlight.solarized-light,
    background-color: #ddd8c5 !important;
  }

+  // Search result highlight
+  span.highlight_word {
+    background: #eee8d5;
+  }
+
  /* Solarized Light

  For use with Jekyll and Pygments

--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -21,6 +21,11 @@ pre.code.highlight.white,
    background-color: #f8eec7 !important;
  }

+  // Search result highlight
+  span.highlight_word {
+    background: #fafe3d;
+  }
+
  .hll { background-color: #f8f8f8 }
  .c { color: #999988; font-style: italic; }
  .err { color: #a61717; background-color: #e3d2d2; }

--- 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;
  }

--- 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;
-  }
-}
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -30,14 +30,21 @@
    }
  }

+  .project-home-dropdown {
+    margin: 11px 3px 0;
+  }
+
  .project-home-desc {
    h1 {
      margin: 0;
      margin-bottom: 10px;
      font-size: 26px;
+      font-weight: bold;
    }

    p {
+      font-size: 18px;
+      color: #666;
      display: inline;
    }
  }
@@ -155,78 +162,6 @@ ul.nav.nav-projects-tabs {
  margin: 0px;
 }

-.my-projects,
-.public-projects {
-  li {
-    .project-info {
-      margin-bottom: 10px;
-      overflow: hidden;
-    }
-
-    .access-icon {
-      color: #AAA;
-      margin-left: 10px;
-      i {
-        color: #AAA;
-      }
-    }
-  }
-}
-
-.public-clone {
-  background: #EEE;
-  color: #777;
-  padding: 6px 10px;
-  margin: 1px;
-  font-weight: normal;
-}
-
-.public-projects .repo-info {
-  color: #777;
-
-  a {
-    color: #777;
-  }
-}
-
-.project-side {
-  .project-fork-icon {
-    float: left;
-    font-size: 26px;
-    margin-right: 10px;
-    line-height: 1.5;
-  }
-
-  .panel {
-    @include border-radius(3px);
-
-    .panel-heading, .panel-footer {
-      font-weight: normal;
-      background-color: transparent;
-      color: #666;
-      border-color: #EEE;
-    }
-
-    .actions {
-      margin-top: 10px;
-    }
-
-    .nav-pills a {
-      padding: 10px;
-      font-weight: bold;
-      color: $gl-link-color;
-    }
-
-    .nav {
-      margin-bottom: 15px;
-    }
-  }
-
-  .ci-status-image {
-    max-height: 22px;
-  }
-}
-
 .transfer-project .select2-container {
  min-width: 200px;
 }
@@ -316,3 +251,43 @@ 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;
+  }
+}
+
+/*
+ * Projects list rendered on dashboard and user page
+ */
+.projects-list {
+  @include basic-list;
+
+  .project-row {
+    .project-full-name {
+      @include str-truncated;
+      font-weight: bold;
+      font-size: 15px;
+    }
+
+    .project-description {
+      color: #888;
+      font-size: 13px;
+
+      p {
+        @include str-truncated;
+        margin-bottom: 0;
+        color: #888;
+      }
+    }
+  }
+}
+
+.panel .projects-list li {
+  padding: 10px 15px;
+}
--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
 .search-results {
  .search-result-row {
-    border-bottom: 1px solid #EEE;
-    padding-bottom: 10px;
-    margin-bottom: 10px;
+    border-bottom: 1px solid #DDD;
+    padding-bottom: 15px;
+    margin-bottom: 15px;
  }
 }
+
+.search-holder {
+  max-width: 600px;
+  margin: 0 auto;
+  margin-bottom: 20px;
+
+  input {
+    border-color: #BBB;
+    font-weight: bold;
+  }
+}
+
--- a/app/assets/stylesheets/pages/snippets.scss
+++ b/app/assets/stylesheets/pages/snippets.scss
@@ -6,3 +6,27 @@
 .snippet-form-holder .file-holder .file-title {
  padding: 2px;
 }
+
+
+.snippet-row {
+  .snippet-title {
+    font-size: 15px;
+    font-weight: bold;
+    line-height: 20px;
+    margin-bottom: 2px;
+
+    .monospace {
+      font-weight: normal;
+    }
+  }
+
+  .snippet-info {
+    color: #888;
+    font-size: 13px;
+    line-height: 24px;
+
+    a {
+      color: #888;
+    }
+  }
+}
--- 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;

--- 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;
-        }
+      a {
+        color: $color-light;
+      }

-        &:hover {
-          background-color: $color-dark;
-          a {
-            color: #FFF;
-          }
+      &:hover {
+        background-color: $color-dark;
+        a {
+          color: #FFF;
        }
      }
    }
-  }

-  .page-with-sidebar {
    .collapse-nav a {
      color: #FFF;
      background: $color;

--- 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
--- a/app/controllers/admin/hooks_controller.rb
+++ b/app/controllers/admin/hooks_controller.rb
@@ -39,6 +39,6 @@ class Admin::HooksController < Admin::ApplicationController
  end

  def hook_params
-    params.require(:hook).permit(:url)
+    params.require(:hook).permit(:url, :enable_ssl_verification)
  end
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -55,7 +55,9 @@ class ApplicationController < ActionController::Base

  def authenticate_user!(*args)
    # If user is not signed-in and tries to access root_path - redirect him to landing page
-    if current_application_settings.home_page_url.present?
+    # Don't redirect to the default URL to prevent endless redirections
+    if current_application_settings.home_page_url.present? &&
+        current_application_settings.home_page_url.chomp('/') != Gitlab.config.gitlab['url'].chomp('/')
      if current_user.nil? && root_path == request.path
        redirect_to current_application_settings.home_page_url and return
      end
@@ -190,11 +192,12 @@ class ApplicationController < ActionController::Base
  end

  def add_gon_variables
+    gon.api_version            = API::API.version
+    gon.default_avatar_url     = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s
    gon.default_issues_tracker = Project.new.default_issue_tracker.to_param
-    gon.api_version = API::API.version
-    gon.relative_url_root = Gitlab.config.gitlab.relative_url_root
-    gon.default_avatar_url = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s
-    gon.max_file_size = current_application_settings.max_attachment_size;
+    gon.max_file_size          = current_application_settings.max_attachment_size
+    gon.relative_url_root      = Gitlab.config.gitlab.relative_url_root
+    gon.user_color_scheme      = Gitlab::ColorSchemes.for_user(current_user).css_class

    if current_user
      gon.current_user_id = current_user.id

--- 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


--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
 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

--- 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
--- 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
--- 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
--- a/app/controllers/projects/hooks_controller.rb
+++ b/app/controllers/projects/hooks_controller.rb
@@ -53,6 +53,7 @@ class Projects::HooksController < Projects::ApplicationController
  end

  def hook_params
-    params.require(:hook).permit(:url, :push_events, :issues_events, :merge_requests_events, :tag_push_events, :note_events)
+    params.require(:hook).permit(:url, :push_events, :issues_events,
+      :merge_requests_events, :tag_push_events, :note_events, :enable_ssl_verification)
  end
 end
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -8,7 +8,7 @@ class Projects::ServicesController < Projects::ApplicationController
                    :push_events, :issues_events, :merge_requests_events, :tag_push_events,
                    :note_events, :send_from_committer_email, :disable_diffs, :external_wiki_url,
                    :notify, :color,
-                    :server_host, :server_port, :default_irc_uri]
+                    :server_host, :server_port, :default_irc_uri, :enable_ssl_verification]
  # Authorize
  before_action :authorize_admin_project!
  before_action :service, only: [:edit, :update, :test]

--- a/app/controllers/projects/snippets_controller.rb
+++ b/app/controllers/projects/snippets_controller.rb
@@ -30,9 +30,14 @@ class Projects::SnippetsController < Projects::ApplicationController
  def create
    @snippet = CreateSnippetService.new(@project, current_user,
                                        snippet_params).execute
-    respond_with(@snippet,
-                 location: namespace_project_snippet_path(@project.namespace,
-                                                          @project, @snippet))
+
+    if @snippet.valid?
+      respond_with(@snippet,
+                   location: namespace_project_snippet_path(@project.namespace,
+                                                            @project, @snippet))
+    else
+      render :new
+    end
  end

  def edit

--- 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

--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -51,10 +51,6 @@ class UsersController < ApplicationController

  def set_user
    @user = User.find_by_username!(params[:username])
-
-    unless current_user || @user.public_profile?
-      return authenticate_user!
-    end
  end

  def authorized_projects_ids

--- a/app/finders/trending_projects_finder.rb
+++ b/app/finders/trending_projects_finder.rb
@@ -2,13 +2,21 @@ class TrendingProjectsFinder
  def execute(current_user, start_date = nil)
    start_date ||= Date.today - 1.month

-    projects = projects_for(current_user)
-
    # Determine trending projects based on comments count
    # for period of time - ex. month
-    projects.joins(:notes).where('notes.created_at > ?', start_date).
-      select("projects.*, count(notes.id) as ncount").
-      group("projects.id").reorder("ncount DESC")
+    trending_project_ids = Note.
+      select("notes.project_id, count(notes.project_id) as pcount").
+      where('notes.created_at > ?', start_date).
+      group("project_id").
+      reorder("pcount DESC").
+      map(&:project_id)
+
+    sql_order_ids = trending_project_ids.reverse.
+      map { |project_id| "id = #{project_id}" }.join(", ")
+
+    # Get list of projects that user allowed to see
+    projects = projects_for(current_user)
+    projects.where(id: trending_project_ids).reorder(sql_order_ids)
  end

  private

--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -58,7 +58,7 @@ module GitlabMarkdownHelper
      @options = options

      # see https://github.com/vmg/redcarpet#darling-i-packed-you-a-couple-renderers-for-lunch
-      rend = Redcarpet::Render::GitlabHTML.new(self, user_color_scheme_class, options)
+      rend = Redcarpet::Render::GitlabHTML.new(self, options)

      # see https://github.com/vmg/redcarpet#and-its-like-really-simple-to-use
      @markdown = Redcarpet::Markdown.new(rend, MARKDOWN_OPTIONS)

--- 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')

--- 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
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
 # Helper methods for per-User preferences
 module PreferencesHelper
-  COLOR_SCHEMES = {
-    1 => 'white',
-    2 => 'dark',
-    3 => 'solarized-light',
-    4 => 'solarized-dark',
-    5 => 'monokai',
-  }
-  COLOR_SCHEMES.default = 'white'
-
-  # Helper method to access the COLOR_SCHEMES
-  #
-  # The keys are the `color_scheme_ids`
-  # The values are the `name` of the scheme.
-  #
-  # The preview images are `name-scheme-preview.png`
-  # The stylesheets should use the css class `.name`
-  def color_schemes
-    COLOR_SCHEMES.freeze
-  end
-
  # Maps `dashboard` values to more user-friendly option text
  DASHBOARD_CHOICES = {
    projects: 'Your Projects (default)',
@@ -50,12 +30,11 @@ module PreferencesHelper
  end

  def user_application_theme
-    theme = Gitlab::Themes.by_id(current_user.try(:theme_id))
-    theme.css_class
+    Gitlab::Themes.for_user(current_user).css_class
  end

-  def user_color_scheme_class
-    COLOR_SCHEMES[current_user.try(:color_scheme_id)] if defined?(current_user)
+  def user_color_scheme
+    Gitlab::ColorSchemes.for_user(current_user).css_class
  end

  def prefer_readme?

--- 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

--- a/app/mailers/base_mailer.rb
+++ b/app/mailers/base_mailer.rb
+class BaseMailer < 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 can?
+    Ability.abilities.allowed?(current_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
--- a/app/mailers/email_rejection_mailer.rb
+++ b/app/mailers/email_rejection_mailer.rb
+class EmailRejectionMailer < BaseMailer
+  def rejection(reason, original_raw, can_retry = false)
+    @reason = reason
+    @original_message = Mail::Message.new(original_raw)
+
+    return unless @original_message.from
+
+    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
+end
--- 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})"))
+
+      SentNotification.record(@issue, recipient_id, reply_key)
    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})"))
+
+      SentNotification.record(@issue, recipient_id, reply_key)
    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})"))
+
+      SentNotification.record(@issue, recipient_id, reply_key)
    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})"))
+
+      SentNotification.record(@issue, recipient_id, reply_key)
    end
  end
 end
--- 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})"))
+
+      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)
@@ -23,6 +25,8 @@ module Emails
                         from: sender(updated_by_user_id),
                         to: recipient(recipient_id),
                         subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
+
+      SentNotification.record(@merge_request, recipient_id, reply_key)
    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})"))
+
+      SentNotification.record(@merge_request, recipient_id, reply_key)
    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})"))
+
+      SentNotification.record(@merge_request, recipient_id, reply_key)
    end

    def merge_request_status_email(recipient_id, merge_request_id, status, updated_by_user_id)
@@ -58,52 +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}"))
-    end
-  end
+                         subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))

-  # 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}"
+      SentNotification.record(@merge_request, recipient_id, reply_key)
    end
-    subject << " | " + extra.join(' | ') if extra.present?
-    subject
  end
-
 end
--- 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})"))
+
+      SentNotification.record(@commit, recipient_id, reply_key)
    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})"))
+
+      SentNotification.record(@issue, recipient_id, reply_key)
    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})"))
+
+      SentNotification.record(@merge_request, recipient_id, reply_key)
    end
  end
 end
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
-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: Gitlab.config.gitlab.email_reply_to
-
-  # 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,
@@ -48,13 +35,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
-
  def can_send_from_user_email?(sender)
    sender_domain = sender.email.split("@").last
    self.class.allowed_email_domains.include?(sender_domain)
@@ -85,14 +65,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
@@ -126,14 +98,37 @@ class Notify < ActionMailer::Base
    "<#{model_name}_#{model.id}@#{Gitlab.config.gitlab.host}>"
  end

+  def mail_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
+
+    if reply_key
+      headers['X-GitLab-Reply-Key'] = 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)
+  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 = {}, &block)
+  def mail_new_thread(model, headers = {})
    headers['Message-ID'] = message_id(model)
-    headers['X-GitLab-Project'] = "#{@project.name} | " if @project
-    mail(headers, &block)
+
+    mail_thread(model, headers)
  end

  # Send an email that responds to an existing conversation thread,
@@ -144,19 +139,17 @@ 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
+    headers[:subject].prepend('Re: ') if headers[:subject]

-    mail(headers, &block)
+    mail_thread(model, headers)
  end

-  def can?
-    Ability.abilities.allowed?(user, action, subject)
+  def reply_key
+    @reply_key ||= Gitlab::ReplyByEmail.reply_key
  end
 end
--- 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'

--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -25,6 +25,7 @@ class WebHook < ActiveRecord::Base
  default_value_for :note_events, false
  default_value_for :merge_requests_events, false
  default_value_for :tag_push_events, false
+  default_value_for :enable_ssl_verification, false

  # HTTParty timeout
  default_timeout Gitlab.config.gitlab.webhook_timeout
@@ -41,7 +42,7 @@ class WebHook < ActiveRecord::Base
                     "Content-Type" => "application/json",
                     "X-Gitlab-Event" => hook_name.singularize.titleize
                   },
-                   verify: false)
+                   verify: enable_ssl_verification)
    else
      post_url = url.gsub("#{parsed_url.userinfo}@", "")
      auth = {
@@ -54,7 +55,7 @@ class WebHook < ActiveRecord::Base
                     "Content-Type" => "application/json",
                     "X-Gitlab-Event" => hook_name.singularize.titleize
                   },
-                   verify: false,
+                   verify: enable_ssl_verification,
                   basic_auth: auth)
    end
  rescue SocketError, Errno::ECONNRESET, Errno::ECONNREFUSED, Net::OpenTimeout => e

--- 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

--- a/app/models/project_services/buildkite_service.rb
+++ b/app/models/project_services/buildkite_service.rb
@@ -23,7 +23,7 @@ require "addressable/uri"
 class BuildkiteService < CiService
  ENDPOINT = "https://buildkite.com"

-  prop_accessor :project_url, :token
+  prop_accessor :project_url, :token, :enable_ssl_verification

  validates :project_url, presence: true, if: :activated?
  validates :token, presence: true, if: :activated?
@@ -37,6 +37,7 @@ class BuildkiteService < CiService
  def compose_service_hook
    hook = service_hook || build_service_hook
    hook.url = webhook_url
+    hook.enable_ssl_verification = enable_ssl_verification
    hook.save
  end

@@ -96,7 +97,11 @@ class BuildkiteService < CiService

      { type: 'text',
        name: 'project_url',
-        placeholder: "#{ENDPOINT}/example/project" }
+        placeholder: "#{ENDPOINT}/example/project" },
+      
+      { type: 'checkbox',
+        name: 'enable_ssl_verification',
+        title: "Enable SSL verification" }
    ]
  end


--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -21,7 +21,7 @@
 class GitlabCiService < CiService
  API_PREFIX = "api/v1"

-  prop_accessor :project_url, :token
+  prop_accessor :project_url, :token, :enable_ssl_verification
  validates :project_url,
    presence: true,
    format: { with: /\A#{URI.regexp(%w(http https))}\z/, message: "should be a valid url" }, if: :activated?
@@ -34,6 +34,7 @@ class GitlabCiService < CiService
  def compose_service_hook
    hook = service_hook || build_service_hook
    hook.url = [project_url, "/build", "?token=#{token}"].join("")
+    hook.enable_ssl_verification = enable_ssl_verification
    hook.save
  end

@@ -136,7 +137,8 @@ class GitlabCiService < CiService
  def fields
    [
      { type: 'text', name: 'token', placeholder: 'GitLab CI project specific token' },
-      { type: 'text', name: 'project_url', placeholder: 'http://ci.gitlabhq.com/projects/3' }
+      { type: 'text', name: 'project_url', placeholder: 'http://ci.gitlabhq.com/projects/3' },
+      { type: 'checkbox', name: 'enable_ssl_verification', title: "Enable SSL verification" }
    ]
  end


--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
+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, unless: :for_commit?
+  validates :commit_id, presence: true, if: :for_commit?
+
+  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?
+    noteable_type == "Commit"
+  end
+
+  def noteable
+    if for_commit?
+      project.commit(commit_id) rescue nil
+    else
+      super
+    end
+  end
+end
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -637,10 +637,6 @@ class User < ActiveRecord::Base
    email.start_with?('temp-email-for-oauth')
  end

-  def public_profile?
-    authorized_projects.public_only.any?
-  end
-
  def avatar_url(size = nil)
    if avatar.present?
      [gitlab_config.url, avatar.url].join

--- 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) }


--- a/app/services/merge_requests/create_service.rb
+++ b/app/services/merge_requests/create_service.rb
 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

--- 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


--- 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
-    = link_to 'Remove report', [:admin, abuse_report], method: :delete, class: "btn btn-xs btn-close"
+    - 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"
+    = link_to 'Remove report', [:admin, abuse_report], remote: true, method: :delete, class: "btn btn-xs btn-close js-remove-tr"
--- 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

--- 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

--- a/app/views/admin/hooks/index.html.haml
+++ b/app/views/admin/hooks/index.html.haml
@@ -18,6 +18,13 @@
    = f.label :url, "URL:", class: 'control-label'
    .col-sm-10
      = f.text_field :url, class: "form-control"
+  .form-group
+    = f.label :enable_ssl_verification, "SSL verification", class: 'control-label checkbox'
+    .col-sm-10
+      .checkbox
+        = f.label :enable_ssl_verification do
+          = f.check_box :enable_ssl_verification
+          %strong Enable SSL verification
  .form-actions
    = f.submit "Add System Hook", class: "btn btn-create"
 %hr
@@ -32,6 +39,7 @@
          .list-item-name
            = link_to admin_hook_path(hook) do
              %strong= hook.url
+            %p SSL Verification: #{hook.enable_ssl_verification ? "enabled" : "disabled"}

          .pull-right
            = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-sm"

--- a/app/views/dashboard/_projects.html.haml
+++ b/app/views/dashboard/_projects.html.haml
-.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,4 @@
          = link_to new_project_path, class: 'btn btn-success' do
            New project

-  = render 'shared/projects_list', projects: @projects, projects_limit: 20
+  = render 'shared/projects/list', projects: @projects
--- a/app/views/dashboard/activity.html.haml
+++ b/app/views/dashboard/activity.html.haml
+= 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'
--- a/app/views/dashboard/groups/index.html.haml
+++ b/app/views/dashboard/groups/index.html.haml
@@ -8,32 +8,9 @@
      = link_to new_group_path, class: "btn btn-new btn-sm" do
        %i.fa.fa-plus
        New Group
-.panel.panel-default
-  .panel-heading
-    %strong Groups
-    (#{@group_members.count})
-  %ul.well-list
-    - @group_members.each do |group_member|
-      - group = group_member.group
-      %li
-        .pull-right.hidden-xs
-          - if can?(current_user, :admin_group, group)
-            = link_to edit_group_path(group), class: "btn-sm btn btn-grouped" do
-              %i.fa.fa-cogs
-              Settings
-
-          = link_to leave_group_group_members_path(group), data: { confirm: leave_group_message(group.name) }, method: :delete, class: "btn-sm btn btn-grouped", title: 'Leave this group' do
-            %i.fa.fa-sign-out
-            Leave
-
-        = image_tag group_icon(group), class: "avatar s40 avatar-tile hidden-xs"
-        = link_to group, class: 'group-name' do
-          %strong= group.name
-
-        as
-        %strong #{group_member.human_access}
-
-        %div.light
-          #{pluralize(group.projects.count, "project")}, #{pluralize(group.users.count, "user")}
+%ul.bordered-list
+  - @group_members.each do |group_member|
+    - group = group_member.group
+    = render 'shared/groups/group', group: group, group_member: group_member

 = paginate @group_members
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
@@ -5,10 +5,10 @@
  = render 'shared/show_aside'

  .dashboard.row
-    %section.activities.col-md-8
+    %section.activities.col-md-7
      = render 'dashboard/activities'
-    %aside.col-md-4
-      .panel.panel-default
+    %aside.col-md-5
+      .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'
@@ -17,8 +17,7 @@
                = link_to new_project_path, class: 'btn btn-success' do
                  New project

-        = render 'shared/projects_list', projects: @projects,
-          projects_limit: 20, stars: true, avatar: false
+        = render 'shared/projects/list', projects: @projects, projects_limit: 20

 - else
  %h3 You don't have starred projects yet

--- a/app/views/dashboard/show.html.haml
+++ b/app/views/dashboard/show.html.haml
@@ -4,14 +4,10 @@

 = 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'
+- if @last_push
+  = render "events/event_last_push", event: @last_push

+- if @projects.any?
+  = render 'projects'
 - else
  = render "zero_authorized_projects"
--- a/app/views/email_rejection_mailer/rejection.html.haml
+++ b/app/views/email_rejection_mailer/rejection.html.haml
+%p
+  Unfortunately, your email message to GitLab could not be processed.
+
+= markdown @reason
--- a/app/views/email_rejection_mailer/rejection.text.haml
+++ b/app/views/email_rejection_mailer/rejection.text.haml
+Unfortunately, your email message to GitLab could not be processed.
+
+
+= @reason
--- 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
--- a/app/views/explore/groups/index.html.haml
+++ b/app/views/explore/groups/index.html.haml
@@ -32,17 +32,7 @@

 %ul.bordered-list
  - @groups.each do |group|
-    %li
-      .clearfix
-        %h4
-          = link_to group_path(id: group.path) do
-            = group.name
-      .clearfix
-        %p
-          = truncate group.description, length: 150
-      .clearfix
-        %p.light
-          #{pluralize(group.members.size, 'member')}, #{pluralize(group.projects.count, 'project')}
+    = render 'shared/groups/group', group: group
  - unless @groups.present?
    .nothing-here-block No public groups


--- a/app/views/explore/projects/_project.html.haml
+++ b/app/views/explore/projects/_project.html.haml
-%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
--- a/app/views/explore/projects/_projects.html.haml
+++ b/app/views/explore/projects/_projects.html.haml
+- if projects.any?
+  .public-projects
+    = render 'shared/projects/list', projects: projects
+- else
+  .nothing-here-block
+    No such projects
--- 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"
--- 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'
--- 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
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
-.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'
@@ -7,4 +7,4 @@
          = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-success' do
            New project

-  = render 'shared/projects_list', projects: @projects, projects_limit: 20
+  = render 'shared/projects/list', projects: @projects, projects_limit: 20
--- 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
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
 .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
@@ -13,7 +18,7 @@
        .username
          = current_user.username
  .content-wrapper
-    .container-fluid
+    %div{ class: fluid_layout ? "container-fluid" : "container-fluid container-limited" }
      .content
        = render "layouts/flash"
        .clearfix

--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
 %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
@@ -17,15 +12,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 +20,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')

--- a/app/views/layouts/header/_public.html.haml
+++ b/app/views/layouts/header/_public.html.haml
 %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

--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
 %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')
@@ -29,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

--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -100,7 +100,7 @@
  - if project_nav_tab? :snippets
    = nav_link(controller: :snippets) do
      = link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets', data: {placement: 'right'} do
-        = icon('file-text-o fw')
+        = icon('clipboard fw')
        %span
          Snippets


--- 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.
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
@@ -48,7 +48,7 @@
          = f.radio_button :notification_level, Notification::N_WATCH
          .level-title
            Watch
-          %p You will receive all notifications from projects in which you participate
+          %p You will receive notifications for any activity

  .form-actions
    = f.submit 'Save changes', class: "btn btn-create"

--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -22,11 +22,11 @@
    .panel-heading
      Syntax highlighting theme
    .panel-body
-      - color_schemes.each do |color_scheme_id, color_scheme|
+      - Gitlab::ColorSchemes.each do |scheme|
        = label_tag do
-          .preview= image_tag "#{color_scheme}-scheme-preview.png"
-          = f.radio_button :color_scheme_id, color_scheme_id
-          = color_scheme.tr('-_', ' ').titleize
+          .preview= image_tag "#{scheme.css_class}-scheme-preview.png"
+          = f.radio_button :color_scheme_id, scheme.id
+          = scheme.name

  .panel.panel-default
    .panel-heading

--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -100,11 +100,6 @@
              %hr
              = link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar"

-      - if @user.public_profile?
-        .alert.alert-info
-          %h4 Public profile
-          %p Your profile is publicly visible because you joined public project(s)
-

  .row
    .col-md-7

--- 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)

--- 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

--- 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

--- a/app/views/projects/deploy_keys/index.html.haml
+++ b/app/views/projects/deploy_keys/index.html.haml
 - page_title "Deploy Keys"
+
 %h3.page-title
  Deploy keys allow read-only access to the repository


--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
+- if params[:view] == 'parallel'
+  - fluid_layout true
+
 .prepend-top-20.append-bottom-20
  .pull-right
    .btn-group

--- 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)

--- 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})
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
--- a/app/views/projects/snippets/_snippet.html.haml
+++ b/app/views/projects/snippets/_snippet.html.haml
--- a/app/views/projects/snippets/index.html.haml
+++ b/app/views/projects/snippets/index.html.haml
--- a/app/views/search/_category.html.haml
+++ b/app/views/search/_category.html.haml
--- a/app/views/search/_filter.html.haml
+++ b/app/views/search/_filter.html.haml
--- a/app/views/search/_form.html.haml
+++ b/app/views/search/_form.html.haml
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
--- a/app/views/search/results/_blob.html.haml
+++ b/app/views/search/results/_blob.html.haml
--- a/app/views/search/results/_milestone.html.haml
+++ b/app/views/search/results/_milestone.html.haml
--- a/app/views/search/results/_project.html.haml
+++ b/app/views/search/results/_project.html.haml
--- a/app/views/search/results/_snippet_blob.html.haml
+++ b/app/views/search/results/_snippet_blob.html.haml
--- a/app/views/search/results/_wiki_blob.html.haml
+++ b/app/views/search/results/_wiki_blob.html.haml
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
--- a/app/views/shared/_file_highlight.html.haml
+++ b/app/views/shared/_file_highlight.html.haml
--- a/app/views/shared/_project.html.haml
+++ b/app/views/shared/_project.html.haml
--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
--- a/app/views/shared/issuable/_context.html.haml
+++ b/app/views/shared/issuable/_context.html.haml
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
--- a/app/views/shared/_projects_list.html.haml
+++ b/app/views/shared/_projects_list.html.haml
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
--- a/app/views/snippets/_snippet.html.haml
+++ b/app/views/snippets/_snippet.html.haml
--- a/app/views/snippets/_snippets.html.haml
+++ b/app/views/snippets/_snippets.html.haml
--- a/app/views/users/_projects.html.haml
+++ b/app/views/users/_projects.html.haml
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
--- a/app/workers/email_receiver_worker.rb
+++ b/app/workers/email_receiver_worker.rb
--- a/app/workers/emails_on_push_worker.rb
+++ b/app/workers/emails_on_push_worker.rb
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
--- a/bin/background_jobs
+++ b/bin/background_jobs
--- a/bin/daemon_with_pidfile
+++ b/bin/daemon_with_pidfile
--- a/bin/mail_room
+++ b/bin/mail_room
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
--- a/config/initializers/7_omniauth.rb
+++ b/config/initializers/7_omniauth.rb
--- a/config/mail_room.yml.example
+++ b/config/mail_room.yml.example
--- a/config/routes.rb
+++ b/config/routes.rb
--- a/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb
+++ b/db/migrate/20150814065925_remove_oauth_tokens_from_users.rb
--- a/db/migrate/20150818213832_add_sent_notifications.rb
+++ b/db/migrate/20150818213832_add_sent_notifications.rb
--- a/db/migrate/20150824002011_add_enable_ssl_verification.rb
+++ b/db/migrate/20150824002011_add_enable_ssl_verification.rb
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/doc/README.md
+++ b/doc/README.md
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
--- a/doc/release/monthly.md
+++ b/doc/release/monthly.md
--- a/doc/reply_by_email/README.md
+++ b/doc/reply_by_email/README.md
--- a/doc/workflow/importing/README.md
+++ b/doc/workflow/importing/README.md
--- a/features/admin/groups.feature
+++ b/features/admin/groups.feature
--- a/features/admin/hooks.feature
+++ b/features/admin/hooks.feature
--- a/features/dashboard/dashboard.feature
+++ b/features/dashboard/dashboard.feature
--- a/features/dashboard/event_filters.feature
+++ b/features/dashboard/event_filters.feature
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
--- a/features/project/hooks.feature
+++ b/features/project/hooks.feature
--- a/features/search.feature
+++ b/features/search.feature
--- a/features/steps/admin/groups.rb
+++ b/features/steps/admin/groups.rb
--- a/features/steps/admin/hooks.rb
+++ b/features/steps/admin/hooks.rb
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
--- a/features/steps/project/hooks.rb
+++ b/features/steps/project/hooks.rb
--- a/features/steps/search.rb
+++ b/features/steps/search.rb
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
--- a/features/user.feature
+++ b/features/user.feature
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
--- a/lib/gitlab/bitbucket_import/key_adder.rb
+++ b/lib/gitlab/bitbucket_import/key_adder.rb
--- a/lib/gitlab/bitbucket_import/key_deleter.rb
+++ b/lib/gitlab/bitbucket_import/key_deleter.rb
--- a/lib/gitlab/bitbucket_import/project_creator.rb
+++ b/lib/gitlab/bitbucket_import/project_creator.rb
--- a/lib/gitlab/color_schemes.rb
+++ b/lib/gitlab/color_schemes.rb
--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
--- a/lib/gitlab/email/attachment_uploader.rb
+++ b/lib/gitlab/email/attachment_uploader.rb
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
--- a/lib/gitlab/email/reply_parser.rb
+++ b/lib/gitlab/email/reply_parser.rb
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
--- a/lib/gitlab/github_import/project_creator.rb
+++ b/lib/gitlab/github_import/project_creator.rb
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
--- a/lib/gitlab/gitlab_import/project_creator.rb
+++ b/lib/gitlab/gitlab_import/project_creator.rb
--- a/lib/gitlab/markdown/autolink_filter.rb
+++ b/lib/gitlab/markdown/autolink_filter.rb
--- a/lib/gitlab/reply_by_email.rb
+++ b/lib/gitlab/reply_by_email.rb
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
--- a/lib/gitlab/themes.rb
+++ b/lib/gitlab/themes.rb
--- a/lib/redcarpet/render/gitlab_html.rb
+++ b/lib/redcarpet/render/gitlab_html.rb
--- a/lib/support/init.d/gitlab
+++ b/lib/support/init.d/gitlab
--- a/lib/support/init.d/gitlab.default.example
+++ b/lib/support/init.d/gitlab.default.example
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
--- a/spec/controllers/autocomplete_controller_spec.rb
+++ b/spec/controllers/autocomplete_controller_spec.rb
--- a/spec/controllers/import/bitbucket_controller_spec.rb
+++ b/spec/controllers/import/bitbucket_controller_spec.rb
--- a/spec/controllers/import/github_controller_spec.rb
+++ b/spec/controllers/import/github_controller_spec.rb
--- a/spec/controllers/import/gitlab_controller_spec.rb
+++ b/spec/controllers/import/gitlab_controller_spec.rb
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
--- a/spec/fixtures/emails/android_gmail.eml
+++ b/spec/fixtures/emails/android_gmail.eml
--- a/spec/fixtures/emails/attachment.eml
+++ b/spec/fixtures/emails/attachment.eml
--- a/spec/fixtures/emails/auto_reply.eml
+++ b/spec/fixtures/emails/auto_reply.eml
--- a/spec/fixtures/emails/dutch.eml
+++ b/spec/fixtures/emails/dutch.eml
--- a/spec/fixtures/emails/gmail_web.eml
+++ b/spec/fixtures/emails/gmail_web.eml
--- a/spec/fixtures/emails/html_paragraphs.eml
+++ b/spec/fixtures/emails/html_paragraphs.eml
--- a/spec/fixtures/emails/inline_reply.eml
+++ b/spec/fixtures/emails/inline_reply.eml
--- a/spec/fixtures/emails/ios_default.eml
+++ b/spec/fixtures/emails/ios_default.eml
--- a/spec/fixtures/emails/newlines.eml
+++ b/spec/fixtures/emails/newlines.eml
--- a/spec/fixtures/emails/no_content_reply.eml
+++ b/spec/fixtures/emails/no_content_reply.eml
--- a/spec/fixtures/emails/on_wrote.eml
+++ b/spec/fixtures/emails/on_wrote.eml
--- a/spec/fixtures/emails/outlook.eml
+++ b/spec/fixtures/emails/outlook.eml
--- a/spec/fixtures/emails/paragraphs.eml
+++ b/spec/fixtures/emails/paragraphs.eml
--- a/spec/fixtures/emails/plaintext_only.eml
+++ b/spec/fixtures/emails/plaintext_only.eml
--- a/spec/fixtures/emails/valid_reply.eml
+++ b/spec/fixtures/emails/valid_reply.eml
--- a/spec/fixtures/emails/windows_8_metro.eml
+++ b/spec/fixtures/emails/windows_8_metro.eml
--- a/spec/fixtures/emails/wrong_reply_key.eml
+++ b/spec/fixtures/emails/wrong_reply_key.eml
--- a/spec/helpers/events_helper_spec.rb
+++ b/spec/helpers/events_helper_spec.rb
--- a/spec/helpers/preferences_helper_spec.rb
+++ b/spec/helpers/preferences_helper_spec.rb
--- a/spec/lib/gitlab/bitbucket_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/project_creator_spec.rb
--- a/spec/lib/gitlab/color_schemes_spec.rb
+++ b/spec/lib/gitlab/color_schemes_spec.rb
--- a/spec/lib/gitlab/email/attachment_uploader_spec.rb
+++ b/spec/lib/gitlab/email/attachment_uploader_spec.rb
--- a/spec/lib/gitlab/email/receiver_spec.rb
+++ b/spec/lib/gitlab/email/receiver_spec.rb
--- a/spec/lib/gitlab/email/reply_parser_spec.rb
+++ b/spec/lib/gitlab/email/reply_parser_spec.rb
--- a/spec/lib/gitlab/github_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/github_import/project_creator_spec.rb
--- a/spec/lib/gitlab/gitlab_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/gitlab_import/project_creator_spec.rb
--- a/spec/lib/gitlab/google_code_import/client_spec.rb
+++ b/spec/lib/gitlab/google_code_import/client_spec.rb
--- a/spec/lib/gitlab/google_code_import/importer_spec.rb
+++ b/spec/lib/gitlab/google_code_import/importer_spec.rb
--- a/spec/lib/gitlab/markdown/autolink_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/autolink_filter_spec.rb
--- a/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
+++ b/spec/lib/gitlab/markdown/user_reference_filter_spec.rb
--- a/spec/lib/gitlab/reply_by_email_spec.rb
+++ b/spec/lib/gitlab/reply_by_email_spec.rb
--- a/spec/lib/gitlab/themes_spec.rb
+++ b/spec/lib/gitlab/themes_spec.rb
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
--- a/spec/services/projects/upload_service_spec.rb
+++ b/spec/services/projects/upload_service_spec.rb
--- a/spec/support/fixture_helpers.rb
+++ b/spec/support/fixture_helpers.rb
--- a/spec/support/markdown_feature.rb
+++ b/spec/support/markdown_feature.rb
--- a/spec/support/stub_configuration.rb
+++ b/spec/support/stub_configuration.rb
--- a/spec/workers/email_receiver_worker_spec.rb
+++ b/spec/workers/email_receiver_worker_spec.rb
--- a/spec/workers/emails_on_push_worker_spec.rb
+++ b/spec/workers/emails_on_push_worker_spec.rb