Merge branch 'master' into ci/api-triggers

* master: (150 commits) fixes margin and padding Update mailroom/postfix documentation [ci skip] Fix css mess around git clone panel. Align it properly Fix missing padding for user/group pages Fix parse_gollum_tags matcher Update documentation on Banzai::Filter::GollumTagsFilter Add tests for the wiki pipeline Refactoring Banzai::Filter::GollumTagsFilter Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter Remove GollumTagsPipeline Refactoring Gitlab::GithubImport::Importer Remove unnecessary brackets on WIKI_SLUG_ID route constraints Move js function to removing accents to vendor/assets/javascripts Update CHANGELOG Use the WikiPipeline when rendering the wiki markdown content Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML Relax constraints for wiki slug Import GitHub wiki into GitLab Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus Revert changes to how the notes are paginated in the API ... Conflicts: doc/api/README.md lib/api/entities.rb

Merge branch 'master' into ci/api-triggers
* master: (150 commits) fixes margin and padding Update mailroom/postfix documentation [ci skip] Fix css mess around git clone panel. Align it properly Fix missing padding for user/group pages Fix parse_gollum_tags matcher Update documentation on Banzai::Filter::GollumTagsFilter Add tests for the wiki pipeline Refactoring Banzai::Filter::GollumTagsFilter Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter Remove GollumTagsPipeline Refactoring Gitlab::GithubImport::Importer Remove unnecessary brackets on WIKI_SLUG_ID route constraints Move js function to removing accents to vendor/assets/javascripts Update CHANGELOG Use the WikiPipeline when rendering the wiki markdown content Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML Relax constraints for wiki slug Import GitHub wiki into GitLab Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus Revert changes to how the notes are paginated in the API ... Conflicts: doc/api/README.md lib/api/entities.rb
768721dc · Tomasz Maczukin · 7ed5bc5c · 2f2aada3 · 768721dc · 768721dc
Commit 768721dc authored Jan 14, 2016 by Tomasz Maczukin
217 changed files
--- a/CHANGELOG
+++ b/CHANGELOG
 Please view this file on the master branch, on stable branches it's out of date.

+v 8.5.0 (unreleased)
+  - Remove gray background from layout in UI
+
 v 8.4.0 (unreleased)
+  - Add pagination headers to already paginated API resources
+  - Properly generate diff of orphan commits, like the first commit in a repository
  - Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages
  - Autocomplete data is now always loaded, instead of when focusing a comment text area (Yorick Peterse)
  - Improved performance of finding issues for an entire group (Yorick Peterse)
@@ -47,10 +52,15 @@ v 8.4.0 (unreleased)
  - Fix Encoding::CompatibilityError bug when markdown content has some complex URL (Jason Lee)
  - Add API support for managing project's build triggers
  - Add API support for managing project's build variables
+  - Add API support for managing builds of a project
+  - Add API support for managing build variables of project
  - Allow broadcast messages to be edited
+  - Autosize Markdown textareas
+  - Import GitHub wiki into GitLab

 v 8.3.4
  - Use gitlab-workhorse 0.5.4 (fixes API routing bug)
+  - Add build artifacts browser

 v 8.3.3
  - Preserve CE behavior with JIRA integration by only calling API if URL is set
@@ -84,6 +94,7 @@ v 8.3.0
  - Add open_issues_count to project API (Stan Hu)
  - Expand character set of usernames created by Omniauth (Corey Hinshaw)
  - Add button to automatically merge a merge request when the build succeeds (Zeger-Jan van de Weg)
+  - Add unsubscribe link in the email footer (Zeger-Jan van de Weg)
  - Provide better diagnostic message upon project creation errors (Stan Hu)
  - Bump devise to 3.5.3 to fix reset token expiring after account creation (Stan Hu)
  - Remove api credentials from link to build_page

--- a/app/assets/javascripts/activities.js.coffee
+++ b/app/assets/javascripts/activities.js.coffee
 class @Activities
  constructor: ->
    Pager.init 20, true
-    $(".event-filter .btn").bind "click", (event) =>
+    $(".event-filter a").bind "click", (event) =>
      event.preventDefault()
      @toggleFilter($(event.currentTarget))
      @reloadActivities()
@@ -12,7 +12,7 @@ class @Activities


  toggleFilter: (sender) ->
-    sender.toggleClass "active"
+    sender.closest('li').toggleClass "active"
    event_filters = $.cookie("event_filter")
    filter = sender.attr("id").split("_")[0]
    if event_filters

--- a/app/assets/javascripts/behaviors/autosize.js.coffee
+++ b/app/assets/javascripts/behaviors/autosize.js.coffee
+#= require autosize
+
+$ ->
+  autosize($('.js-autosize'))
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -48,15 +48,16 @@ class @MergeRequest
    _this = @
    $('a.btn-close, a.btn-reopen').on 'click', (e) ->
      $this = $(this)
-      if $this.data('submitted')
+      shouldSubmit = $this.hasClass('btn-comment')
+      if shouldSubmit && $this.data('submitted')
        return
+      if shouldSubmit
+        if $this.hasClass('btn-comment-and-close') || $this.hasClass('btn-comment-and-reopen')
          e.preventDefault()
          e.stopImmediatePropagation()
-      shouldSubmit = $this.hasClass('btn-comment')
-      console.log("shouldSubmit")
-      if shouldSubmit
          _this.submitNoteForm($this.closest('form'),$this)

+
  submitNoteForm: (form, $button) =>
    noteText = form.find("textarea.js-note-text").val()
    if noteText.trim().length > 0

--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -5,7 +5,7 @@
 #
 # ### Example Markup
 #
-#   <ul class="nav nav-tabs merge-request-tabs">
+#   <ul class="nav-links merge-request-tabs">
 #     <li class="notes-tab active">
 #       <a data-action="notes" data-target="#notes" data-toggle="tab" href="/foo/bar/merge_requests/1">
 #         Discussion

--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
 #= require autosave
+#= require autosize
 #= require dropzone
 #= require dropzone_input
 #= require gfm_auto_complete
@@ -246,6 +247,7 @@ class @Notes
      else
        previewButton.removeClass("turn-on").addClass "turn-off"

+    autosize(textarea)
    new Autosave textarea, [
      "Note"
      form.find("#note_commit_id").val()
@@ -521,9 +523,13 @@ class @Notes
    if textarea.val().trim().length > 0
      form.find('.js-note-target-reopen').text('Comment & reopen')
      form.find('.js-note-target-close').text('Comment & close')
+      form.find('.js-note-target-reopen').addClass('btn-comment-and-reopen')
+      form.find('.js-note-target-close').addClass('btn-comment-and-close')
    else
      form.find('.js-note-target-reopen').text('Reopen')
      form.find('.js-note-target-close').text('Close')
+      form.find('.js-note-target-reopen').removeClass('btn-comment-and-reopen')
+      form.find('.js-note-target-close').removeClass('btn-comment-and-close')

  initTaskList: ->
    @enableTaskList()

--- a/app/assets/javascripts/wikis.js.coffee
+++ b/app/assets/javascripts/wikis.js.coffee
+#= require latinise
+
 class @Wikis
  constructor: ->
-    $('.build-new-wiki').bind "click", (e) ->
-      $('[data-error~=slug]').addClass("hidden")
-      $('p.hint').show()
+    $('.build-new-wiki').bind 'click', (e) =>
+      $('[data-error~=slug]').addClass('hidden')
      field = $('#new_wiki_path')
-      valid_slug_pattern = /^[\w\/-]+$/
+      slug = @slugify(field.val())

-      slug = field.val()
-      if slug.match valid_slug_pattern
+      if (slug.length > 0)
        path = field.attr('data-wikis-path')
-        if(slug.length > 0)
-          location.href = path + "/" + slug
-      else
-        e.preventDefault()
-        $('p.hint').hide()
-        $('[data-error~=slug]').removeClass("hidden")
+        location.href = path + '/' + slug
+
+  dasherize: (value) ->
+    value.replace(/[_\s]+/g, '-')
+
+  slugify: (value) =>
+    @dasherize(value.trim().toLowerCase().latinise())
--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -24,6 +24,7 @@
 @import "framework/lists.scss";
 @import "framework/markdown_area.scss";
 @import "framework/mobile.scss";
+@import "framework/nav.scss";
 @import "framework/pagination.scss";
 @import "framework/panels.scss";
 @import "framework/selects.scss";

--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -18,9 +18,9 @@
  line-height: 36px;
 }

-.content-block,
 .gray-content-block {
-  margin: -$gl-padding;
+  margin-top: 0;
+  margin-bottom: -$gl-padding;
  background-color: $background-color;
  padding: $gl-padding;
  margin-bottom: 0px;
@@ -86,10 +86,7 @@
 .cover-block {
  text-align: center;
  background: $background-color;
-  margin: -$gl-padding;
-  margin-bottom: 0;
-  padding: 44px $gl-padding;
-  border-bottom: 1px solid $border-color;
+  padding-top: 44px;
  position: relative;

  .avatar-holder {
@@ -136,3 +133,19 @@
 .block-connector {
  margin-top: -1px;
 }
+
+.nav-block {
+  .controls {
+    float: right;
+    margin-top: 11px;
+  }
+}
+
+.content-block {
+  padding: $gl-padding 0;
+  border-bottom: 1px solid $border-color;
+
+  &.oneline-block {
+    line-height: 42px;
+  }
+}
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
 @mixin btn-default {
  @include border-radius(3px);
-  border-width: 1px;
-  border-style: solid;
-  font-size: 15px;
+  font-size: $gl-font-size;
  font-weight: 500;
-  line-height: 18px;
-  padding: 11px $gl-padding;
-  letter-spacing: .4px;
+  padding: $gl-vert-padding $gl-padding;

  &:focus,
  &:active {
@@ -17,8 +13,6 @@

 @mixin btn-middle {
  @include btn-default;
-  @include border-radius(3px);
-  padding: 11px 24px;
 }

 @mixin btn-color($light, $border-light, $normal, $border-normal, $dark, $border-dark, $color) {
@@ -74,16 +68,15 @@
  @include btn-default;
  @include btn-white;

+  &.btn-small,
  &.btn-sm {
-    padding: 5px 10px;
-  }
-
-  &.btn-nr {
-    padding: 7px 10px;
+    padding: 4px 10px;
+    font-size: 13px;
+    line-height: 18px;
  }

  &.btn-xs {
-    padding: 1px 5px;
+    padding: 2px 5px;
  }

  &.btn-success,
@@ -159,33 +152,42 @@
  }
 }

-.btn-group-next {
+.btn-clipboard {
+  border: none;
+  padding: 0 5px;
+}
+
+.input-group-btn {
  .btn {
-    padding: 9px 0px;
-    font-size: 15px;
-    color: #7f8fa4;
-    border-color: #e7e9ed;
-    width: 140px;
+    @include btn-gray;
+    @include btn-middle;

-    .badge {
-      font-weight: normal;
-      background-color: #eee;
-      color: #78a;
+    &:hover {
+      outline: none;
    }

-    &.active {
-      border-color: $gl-info;
-      background: $gl-info;
-      color: #fff;
+    &:focus {
+      outline: none;
+    }

-      .badge {
-        color: $gl-info;
-        background-color: white;
+    &:active {
+      outline: none;
    }
+
+    &.btn-clipboard {
+      padding-left: 15px;
+      padding-right: 15px;
    }
  }
-}

-.btn-clipboard {
-  border: none;
+  .active {
+    @include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
+
+    border: 1px solid #c6cacf !important;
+    background-color: #e4e7ed !important;
+  }
+
+  .btn-green {
+    @include btn-green
+  }
 }
--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -374,75 +374,6 @@ table {
  }
 }

-.center-top-menu, .left-top-menu {
-  @include nav-menu;
-  text-align: center;
-  margin-top: 5px;
-  margin-bottom: $gl-padding;
-  height: auto;
-  margin-top: -$gl-padding;
-
-  &.no-bottom {
-    margin-bottom: 0;
-  }
-
-  &.no-top {
-    margin-top: 0;
-  }
-
-  li a {
-    display: inline-block;
-    padding-top: $gl-padding;
-    padding-bottom: 11px;
-    margin-bottom: -1px;
-  }
-
-  &.bottom-border {
-    border-bottom: 1px solid $border-color;
-    height: 57px;
-  }
-
-  &.wide {
-    margin-left: -$gl-padding;
-    margin-right: -$gl-padding;
-  }
-}
-
-.left-top-menu {
-  text-align: left;
-  border-bottom: 1px solid #EEE;
-}
-
-.center-middle-menu {
-  @include nav-menu;
-  padding: 0;
-  text-align: center;
-  margin: -$gl-padding;
-  margin-top: 0;
-  margin-bottom: 0;
-  height: 58px;
-  border-bottom: 1px solid $border-color;
-
-  li {
-    &:after {
-      content: "|";
-      color: $border-gray-light;
-    }
-
-    &:last-child {
-      &:after {
-        content: none;
-      }
-    }
-
-    > a {
-      display: inline-block;
-      text-transform: uppercase;
-      font-size: 13px;
-    }
-  }
-}
-
 .dropzone .dz-preview .dz-progress {
  border-color: $border-color !important;
 }

--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -3,11 +3,8 @@
 *
 */
 .file-holder {
-  margin-left: -$gl-padding;
-  margin-right: -$gl-padding;
  border: none;
-  border-top: 1px solid #E7E9EE;
-  border-bottom: 1px solid #E7E9EE;
+  border: 1px solid $border-color;

  &.readme-holder {
    border-bottom: 0;

--- a/app/assets/stylesheets/framework/flash.scss
+++ b/app/assets/stylesheets/framework/flash.scss
@@ -8,10 +8,12 @@
  .flash-notice {
    @extend .alert;
    @extend .alert-info;
+    margin: 0;
  }

  .flash-alert {
    @extend .alert;
    @extend .alert-danger;
+    margin: 0;
  }
 }
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -74,8 +74,6 @@ label {

 .form-control {
  @include box-shadow(none);
-  height: 42px;
-  padding: 8px $gl-padding;
 }

 .form-control-inline {

--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -28,6 +28,7 @@ header {
    min-height: $header-height;
    background-color: #fff;
    border: none;
+    border-bottom: 1px solid #EEE;

    .container-fluid {
      width: 100% !important;

--- a/app/assets/stylesheets/framework/layout.scss
+++ b/app/assets/stylesheets/framework/layout.scss
@@ -5,8 +5,6 @@ html {
 }

 body {
-  background-color: #F3F3F3 !important;
-
  &.navless {
    background-color: white !important;
  }

--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -109,10 +109,8 @@ ul.content-list {
  padding: 0;

  > li {
-    padding: $gl-padding;
+    padding: $gl-padding 0;
    border-color: $table-border-color;
-    margin-left: -$gl-padding;
-    margin-right: -$gl-padding;
    color: $gl-gray;

    .avatar {
@@ -133,6 +131,7 @@ ul.content-list {
 .panel > .content-list {
  li {
    margin: 0;
+    padding: $gl-padding;
  }
 }


--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -65,13 +65,6 @@
  position: relative;
 }

-.md-header {
-  ul {
-    float: left;
-    margin-bottom: 1px;
-  }
-}
-
 .referenced-users {
  color: #4c4e54;
  padding-top: 10px;
@@ -85,28 +78,12 @@
  box-shadow: none;
 }

-.new_note,
-.edit_note,
-.detail-page-description,
-.milestone-description,
-.wiki-content,
-.merge-request-form {
-  .nav-tabs {
-    margin-bottom: 0;
-    border: none;
-
-    li a,
-    li.active a {
-      border: 1px solid #DDD;
-    }
-  }
-}
-
 .markdown-area {
  @include border-radius(0);
  background: #FFF;
  border: 1px solid #ddd;
  min-height: 140px;
+  max-height: 430px;
  padding: 5px;
  box-shadow: none;
  width: 100%;

--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -118,38 +118,3 @@
  font-size: 16px;
  line-height: 24px;
 }
-
-@mixin nav-menu {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-  height: 56px;
-
-  li {
-    display: inline-block;
-
-    a {
-      padding: 14px;
-      font-size: 15px;
-      line-height: 28px;
-      color: #959494;
-      border-bottom: 2px solid transparent;
-
-      &:hover, &:active, &:focus {
-        text-decoration: none;
-        outline: none;
-      }
-    }
-
-    &.active a {
-      color: #616060;
-      border-bottom: 2px solid #4688f1;
-    }
-
-    .badge {
-      font-weight: normal;
-      background-color: #eee;
-      color: #78a;
-    }
-  }
-}
--- a/app/assets/stylesheets/framework/mobile.scss
+++ b/app/assets/stylesheets/framework/mobile.scss
@@ -9,7 +9,7 @@
    padding-right: 5px;
  }

-  .nav.nav-tabs > li > a {
+  .nav-links > li > a {
    padding: 10px;
    font-size: 12px;
    margin-right: 3px;
@@ -81,7 +81,7 @@
    display: none;
  }

-  .center-top-menu, .left-top-menu {
+  .nav-links, .nav-links {
    li a {
      font-size: 14px;
      padding: 19px 10px;
@@ -100,11 +100,6 @@
 }

 @media (max-width: $screen-sm-max) {
-  .page-with-sidebar .content-wrapper {
-    padding: 0;
-    padding-top: 1px;
-  }
-
  .issues-filters {
    .milestone-filter, .labels-filter {
      display: none;

--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
+.nav-links {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+  height: auto;
+  border-bottom: 1px solid $border-color;
+
+  li {
+    display: inline-block;
+
+    a {
+      display: inline-block;
+      padding: 14px;
+      padding-top: $gl-padding;
+      padding-bottom: 11px;
+      margin-bottom: -1px;
+      font-size: 15px;
+      line-height: 28px;
+      color: #959494;
+      border-bottom: 2px solid transparent;
+
+      &:hover, &:active, &:focus {
+        text-decoration: none;
+        outline: none;
+      }
+    }
+
+    &.active a {
+      color: #000000;
+      border-bottom: 2px solid #4688f1;
+    }
+
+    .badge {
+      font-weight: normal;
+      background-color: #eee;
+      color: #78a;
+    }
+  }
+}
--- a/app/assets/stylesheets/framework/selects.scss
+++ b/app/assets/stylesheets/framework/selects.scss
@@ -3,8 +3,8 @@
  .select2-choice {
    background: #FFF;
    border-color: #DDD;
-    height: 42px;
-    padding: 8px $gl-padding;
+    height: 36px;
+    padding: 6px $gl-padding;
    font-size: $gl-font-size;
    line-height: 1.42857143;


--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -21,11 +21,10 @@

 .content-wrapper {
  width: 100%;
-  padding: 20px;

  .container-fluid {
    background: #FFF;
-    padding: $gl-padding;
+    padding: 0 $gl-padding;

    &.container-blank {
      background: none;

--- a/app/assets/stylesheets/framework/tables.scss
+++ b/app/assets/stylesheets/framework/tables.scss
 .table-holder {
-  margin: -$gl-padding;
-  margin-top: 0;
-  margin-bottom: 0;
+  margin: 0;
 }

 table {
@@ -32,6 +30,7 @@ table {
      }

      th {
+        background-color: $background-color;
        font-weight: normal;
        font-size: 15px;
        border-bottom: 1px solid $border-color !important;

--- a/app/assets/stylesheets/framework/timeline.scss
+++ b/app/assets/stylesheets/framework/timeline.scss
@@ -5,10 +5,8 @@
  padding: 0;

  .timeline-entry {
-    padding: $gl-padding;
+    padding: $gl-padding 0;
    border-color: $table-border-color;
-    margin-left: -$gl-padding;
-    margin-right: -$gl-padding;
    color: $gl-gray;
    border-bottom: 1px solid $border-white-light;


--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -99,47 +99,6 @@
  }
 }

-// Nav tabs
-.nav.nav-tabs {
-  margin-bottom: 15px;
-
-  li {
-    > a {
-      margin-right: 5px;
-      line-height: 20px;
-      border-color: #EEE;
-      color: #888;
-      border-bottom: 1px solid #ddd;
-      .badge {
-        background-color: #eee;
-        color: #888;
-        text-shadow: 0 1px 1px #fff;
-      }
-      i.fa {
-        line-height: 14px;
-      }
-    }
-    &.active {
-      > a {
-        border-color: #CCC;
-        border-bottom: 1px solid #fff;
-        color: #333;
-        font-weight: bold;
-      }
-    }
-  }
-}
-
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  color: #666;
-}
-
-.nav-pills > .active > a > span > .badge {
-  background-color: #fff;
-  color: $gl-primary;
-}
-

 /**
 * fix to keep tooltips position in top navigation bar

--- a/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap_variables.scss
@@ -46,7 +46,7 @@ $font-size-base:         $gl-font-size;
 //
 //## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).

-$padding-base-vertical:     9px;
+$padding-base-vertical:     $gl-vert-padding;
 $padding-base-horizontal:   $gl-padding;
 $component-active-color:    #fff;
 $component-active-bg:       $brand-info;

--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -177,7 +177,7 @@ body {
 }

 .page-title {
-  margin-top: 0px;
+  margin-top: $gl-padding;
  line-height: 1.3;
  font-size: 1.25em;
  font-weight: 600;

--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -22,6 +22,7 @@ $header-height: 58px;
 $fixed-layout-width: 1280px;
 $gl-gray: #5a5a5a;
 $gl-padding: 16px;
+$gl-vert-padding: 6px;
 $gl-padding-top:10px;
 $gl-avatar-size: 46px;
 $secondary-text: #7f8fa4;

--- a/app/assets/stylesheets/framework/zen.scss
+++ b/app/assets/stylesheets/framework/zen.scss
@@ -4,7 +4,7 @@
    position: absolute;
    top: 0px;
    right: 4px;
-    line-height: 40px;
+    line-height: 56px;
  }

  a.js-zen-leave {

--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -39,6 +39,8 @@
 }

 .commit-box {
+  border-top: 1px solid $border-color;
+
  .commit-title {
    margin: 0;
    font-size: 23px;

--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
 .detail-page-header {
-  margin: -$gl-padding;
-  padding: 7px $gl-padding;
-  margin-bottom: 0px;
+  padding: 11px 0;
  border-bottom: 1px solid $border-color;
  color: #5c5d5e;
  font-size: 16px;

--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
 // Common
 .diff-file {
-  margin-left: -$gl-padding;
-  margin-right: -$gl-padding;
-  border: none;
-  border-bottom: 1px solid #E7E9EE;
+  border: 1px solid $border-color;
+  border-top: none;

  .diff-header {
    position: relative;
@@ -23,14 +21,6 @@
      }
    }

-    .diff-controls {
-      .btn {
-        padding: 0px 10px;
-        font-size: 13px;
-        line-height: 28px;
-      }
-    }
-
    .commit-short-id {
      font-family: $monospace_font;
      font-size: smaller;

--- a/app/assets/stylesheets/pages/events.scss
+++ b/app/assets/stylesheets/pages/events.scss
@@ -4,9 +4,7 @@
 */
 .event-item {
  font-size: $gl-font-size;
-  padding: $gl-padding $gl-padding $gl-padding ($gl-padding + $gl-avatar-size + 15px);
-  margin-left: -$gl-padding;
-  margin-right: -$gl-padding;
+  padding: $gl-padding 0 $gl-padding ($gl-avatar-size + 15px);
  border-bottom: 1px solid $table-border-color;
  color: #7f8fa4;


--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -27,10 +27,10 @@
 .project-issuable-filter {
  .controls {
    float: right;
-    margin-top: 7px;
+    margin-top: 11px;
  }

-  .center-top-menu {
+  .nav-links {
    text-align: left;
  }
 }
@@ -105,8 +105,13 @@
      text-overflow: ellipsis;
    }

+    cite {
+      font-style: normal;
+    }
+
    button {
      float: right;
+      padding: 3px 5px;
    }
  }


--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -3,9 +3,9 @@
 *
 */
 .mr-state-widget {
-  background: #F7F8FA;
+  background: $background-color;
  color: $gl-gray;
-  border: 1px solid #dce0e6;
+  border: 1px solid $border-color;
  @include border-radius(2px);

  form {

--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -159,6 +159,7 @@
 .edit_note {
  .markdown-area {
    min-height: 140px;
+    max-height: 430px;
  }
  .note-form-actions {
    background: transparent;

--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -26,6 +26,8 @@
 }

 .project-home-panel {
+  padding-bottom: 40px;
+  border-bottom: 1px solid $border-color;

  .cover-controls {
    .project-settings-dropdown {
@@ -51,6 +53,8 @@
  }

  .notifications-btn {
+    margin-top: -28px;
+
    .fa-bell {
      margin-right: 6px;
    }
@@ -75,17 +79,6 @@
    }
  }

-  .git-clone-holder {
-    max-width: 498px;
-
-    .form-control {
-      background: #FFF;
-      font-size: 14px;
-      height: 42px;
-      margin-left: -1px;
-    }
-  }
-
  .visibility-level-label {
    @extend .btn;
    @extend .btn-gray;
@@ -98,11 +91,6 @@
    }
  }

-  .git-clone-holder {
-    display: inline-table;
-    position: relative;
-  }
-
  .project-repo-buttons {
    margin-top: 12px;
    margin-bottom: 0px;
@@ -112,10 +100,22 @@
      margin-bottom: 12px;
    }

+    .clone-row {
+      .split-repo-buttons,
+      .project-clone-holder {
+        display: inline-block;
+      }
+
+      .split-repo-buttons {
+        margin: 0 12px;
+      }
+    }
+
    .btn {
      @include btn-gray;
      text-transform: none;
    }
+
    .count-with-arrow {
      display: inline-block;
      position: relative;
@@ -160,8 +160,8 @@
        border-style: solid;
        font-size: 13px;
        font-weight: 600;
-        line-height: 20px;
-        padding: 11px 16px;
+        line-height: 13px;
+        padding: $gl-vert-padding $gl-padding;
        letter-spacing: .4px;
        padding: 10px;
        text-align: center;
@@ -189,117 +189,6 @@
  }
 }

-.git-clone-holder {
-  .project-home-dropdown + & {
-    margin-right: 45px;
-  }
-
-  .clone-options {
-    display: table-cell;
-    a.btn {
-      width: 100%;
-    }
-  }
-
-  .form-control {
-    cursor: auto;
-    @extend .monospace;
-    background: #FAFAFA;
-    width: 101%;
-  }
-
-  .input-group-addon {
-    background: #f7f8fa;
-
-    &.git-protocols {
-      padding: 0;
-      border: none;
-
-      .input-group-btn:last-child > .btn {
-        @include border-radius-right(0);
-
-        border-left: 1px solid #c6cacf;
-        margin-left: -2px !important;
-      }
-    }
-  }
-}
-
-.projects-search-form {
-
-  .input-group .form-control {
-    height: 42px;
-  }
-}
-
-.input-group-btn {
-  .btn {
-    @include btn-gray;
-    @include btn-middle;
-
-    &:hover {
-      outline: none;
-    }
-
-    &:focus {
-      outline: none;
-    }
-
-    &:active {
-      outline: none;
-    }
-
-    &.btn-clipboard {
-      padding-left: 15px;
-      padding-right: 15px;
-    }
-  }
-
-  .active {
-    @include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
-
-    border: 1px solid #c6cacf !important;
-    background-color: #e4e7ed !important;
-  }
-
-  .btn-green {
-    @include btn-green
-  }
-
-}
-
-.split-repo-buttons {
-  display: inline-table;
-  margin: 0 12px 0 12px;
-
-  .btn{
-    @include btn-gray;
-    @include btn-default;
-  }
-
-  .dropdown-toggle  {
-    margin: -5px;
-  }
-}
-
-#notification-form {
-  margin-left: 5px;
-}
-
-.dropdown-new {
-  margin-left: -5px;
-}
-
-.open > .dropdown-new.btn {
-  @include box-shadow(inset 0 0 4px rgba(0, 0, 0, 0.12));
-
-  border: 1px solid #c6cacf !important;
-  background-color: #e4e7ed !important;
-  text-transform: none;
-  color: #313236 !important;
-  font-size: 15px;
-}
-
 .dropdown-menu {
  @include box-shadow(rgba(76, 86, 103, 0.247059) 0px 0px 1px 0px, rgba(31, 37, 50, 0.317647) 0px 2px 18px 0px);
  @include border-radius (0px);
@@ -351,28 +240,6 @@
  color: #555;
 }

-ul.nav.nav-projects-tabs {
-  @extend .nav-tabs;
-
-  padding-left: 8px;
-
-  li {
-    a {
-      padding: 6px 25px;
-      margin-top: 2px;
-      border-color: #DDD;
-      background-color: #EEE;
-      text-shadow: 0 1px 1px white;
-      color: #555;
-    }
-    &.active {
-      a {
-        font-weight: bold;
-      }
-    }
-  }
-}
-
 .project_member_row form {
  margin: 0px;
 }
@@ -399,9 +266,9 @@ ul.nav.nav-projects-tabs {

 .breadcrumb.repo-breadcrumb {
  padding: 0;
-  line-height: 42px;
  background: transparent;
  border: none;
+  line-height: 42px;
  margin: 0;

  > li + li:before {
@@ -416,11 +283,8 @@ ul.nav.nav-projects-tabs {

 .top-area {
  border-bottom: 1px solid #EEE;
-  margin: 0 -16px;
-  padding: 0 $gl-padding;
-  height: 42px;

-  ul.left-top-menu {
+  ul.nav-links {
    display: inline-block;
    width: 50%;
    margin-bottom: 0px;
@@ -431,12 +295,12 @@ ul.nav.nav-projects-tabs {
    width: 50%;
    display: inline-block;
    float: right;
-    padding-top: 7px;
+    padding-top: 11px;
    text-align: right;

    .btn-green {
-      margin-top: -2px;
      margin-left: 10px;
+      float: right;
    }
  }

@@ -482,11 +346,11 @@ table.table.protected-branches-list tr.no-border {
  padding-top: 10px;
  padding-bottom: 4px;

-  ul.nav-pills {
+  ul.nav {
    display:inline-block;
  }

-  .nav-pills li {
+  .nav li {
    display:inline;
  }

@@ -523,8 +387,7 @@ pre.light-well {
 }

 .projects-search-form {
-  margin: -$gl-padding;
-  padding: $gl-padding;
+  padding: $gl-padding 0;
  padding-bottom: 0;
  margin-bottom: 0px;

@@ -574,10 +437,8 @@ pre.light-well {
  @include basic-list;

  .project-row {
-    padding: $gl-padding;
+    padding: $gl-padding 0;
    border-color: $table-border-color;
-    margin-left: -$gl-padding;
-    margin-right: -$gl-padding;

    &.no-description {
      .project {
@@ -631,8 +492,6 @@ pre.light-well {
 }

 .project-last-commit {
-  margin: 0 7px;
-
  .ci-status {
    margin-right: 16px;
  }
@@ -662,9 +521,7 @@ pre.light-well {
 }

 .project-show-readme .readme-holder {
-  margin-left: -$gl-padding;
-  margin-right: -$gl-padding;
-  padding: ($gl-padding + 7px);
+  padding: $gl-padding 0;
  border-top: 0;

  .edit-project-readme {
@@ -672,3 +529,32 @@ pre.light-well {
    position: relative;
  }
 }
+
+.git-clone-holder {
+  width: 498px;
+
+  .btn-clipboard {
+    border: 1px solid $border-color;
+    padding: 6px $gl-padding;
+  }
+
+  .project-home-dropdown + & {
+    margin-right: 45px;
+  }
+
+  .clone-options {
+    display: table-cell;
+    a.btn {
+      width: 100%;
+    }
+  }
+
+  .form-control {
+    @extend .monospace;
+    background: #FFF;
+    font-size: 14px;
+    margin-left: -1px;
+    cursor: auto;
+    width: 101%;
+  }
+}
--- a/app/assets/stylesheets/pages/tree.scss
+++ b/app/assets/stylesheets/pages/tree.scss
 .tree-holder {
+  > .nav-block {
+    margin: 11px 0;
+  }

  .file-finder {
    width: 50%;
@@ -13,7 +16,7 @@

    tr {
      > td, > th {
-        line-height: 28px;
+        line-height: 26px;
      }

      &:hover {
@@ -86,12 +89,14 @@

 .blob-commit-info {
  list-style: none;
+  padding: $gl-padding;
+  background: $background-color;
+  border: 1px solid $border-color;
+  border-bottom: none;
  margin: 0;
-  padding: 0;
-  margin-bottom: 5px;

  .commit {
-    padding: $gl-padding 0;
+    padding: 0;

    .commit-row-title {
      .commit-row-message {
@@ -115,3 +120,8 @@
  font-weight: normal;
  color: $md-link-color;
 }
+
+.tree-controls {
+  float: right;
+  margin-top: 11px;
+}
--- a/app/controllers/projects/artifacts_controller.rb
+++ b/app/controllers/projects/artifacts_controller.rb
+class Projects::ArtifactsController < Projects::ApplicationController
+  layout 'project'
+  before_action :authorize_read_build_artifacts!
+
+  def download
+    unless artifacts_file.file_storage?
+      return redirect_to artifacts_file.url
+    end
+
+    unless artifacts_file.exists?
+      return not_found!
+    end
+
+    send_file artifacts_file.path, disposition: 'attachment'
+  end
+
+  def browse
+    return render_404 unless build.artifacts?
+
+    directory = params[:path] ? "#{params[:path]}/" : ''
+    @entry = build.artifacts_metadata_entry(directory)
+
+    return render_404 unless @entry.exists?
+  end
+
+  def file
+    entry = build.artifacts_metadata_entry(params[:path])
+
+    if entry.exists?
+      render json: { archive: build.artifacts_file.path,
+                     entry: Base64.encode64(entry.path) }
+    else
+      render json: {}, status: 404
+    end
+  end
+
+  private
+
+  def build
+    @build ||= project.builds.unscoped.find_by!(id: params[:build_id])
+  end
+
+  def artifacts_file
+    @artifacts_file ||= build.artifacts_file
+  end
+
+  def authorize_read_build_artifacts!
+    unless can?(current_user, :read_build_artifacts, @project)
+      if current_user.nil?
+        return authenticate_user!
+      else
+        return render_404
+      end
+    end
+  end
+end
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -2,7 +2,6 @@ class Projects::BuildsController < Projects::ApplicationController
  before_action :build, except: [:index, :cancel_all]

  before_action :authorize_manage_builds!, except: [:index, :show, :status]
-  before_action :authorize_download_build_artifacts!, only: [:download]

  layout "project"

@@ -51,18 +50,6 @@ class Projects::BuildsController < Projects::ApplicationController
    redirect_to build_path(build)
  end

-  def download
-    unless artifacts_file.file_storage?
-      return redirect_to artifacts_file.url
-    end
-
-    unless artifacts_file.exists?
-      return not_found!
-    end
-
-    send_file artifacts_file.path, disposition: 'attachment'
-  end
-
  def status
    render json: @build.to_json(only: [:status, :id, :sha, :coverage], methods: :sha)
  end
@@ -79,10 +66,6 @@ class Projects::BuildsController < Projects::ApplicationController
    @build ||= project.builds.unscoped.find_by!(id: params[:id])
  end

-  def artifacts_file
-    build.artifacts_file
-  end
-
  def build_path(build)
    namespace_project_build_path(build.project.namespace, build.project, build)
  end
@@ -92,14 +75,4 @@ class Projects::BuildsController < Projects::ApplicationController
      return page_404
    end
  end
-
-  def authorize_download_build_artifacts!
-    unless can?(current_user, :download_build_artifacts, @project)
-      if current_user.nil?
-        return authenticate_user!
-      else
-        return render_404
-      end
-    end
-  end
 end
--- a/app/controllers/sent_notifications_controller.rb
+++ b/app/controllers/sent_notifications_controller.rb
+class SentNotificationsController < ApplicationController
+  skip_before_action :authenticate_user!
+
+  def unsubscribe
+    @sent_notification = SentNotification.for(params[:id])
+    return render_404 unless @sent_notification && @sent_notification.unsubscribable?
+
+    noteable = @sent_notification.noteable
+    noteable.unsubscribe(@sent_notification.recipient)
+
+    flash[:notice] = "You have been unsubscribed from this thread."
+    if current_user
+      case noteable
+      when Issue
+        redirect_to issue_path(noteable)
+      when MergeRequest
+        redirect_to merge_request_path(noteable)
+      else
+        redirect_to root_path
+      end
+    else
+      redirect_to new_user_session_path
+    end
+  end
+end
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
@@ -17,7 +17,7 @@ module ButtonHelper
  def clipboard_button(data = {})
    content_tag :button,
      icon('clipboard'),
-      class: 'btn btn-xs btn-clipboard',
+      class: 'btn btn-clipboard',
      data: data,
      type: :button
  end

--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -27,15 +27,17 @@ module EventsHelper
    key = key.to_s
    active = 'active' if @event_filter.active?(key)
    link_opts = {
-      class: "event-filter-link btn btn-default #{active}",
+      class: "event-filter-link",
      id:    "#{key}_event_filter",
      title: "Filter by #{tooltip.downcase}",
    }

+    content_tag :li, class: active do
      link_to request.path, link_opts do
        content_tag(:span, ' ' + tooltip)
      end
    end
+  end

  def icon_for_event
    {

--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -91,7 +91,7 @@ module GitlabMarkdownHelper
  def render_wiki_content(wiki_page)
    case wiki_page.format
    when :markdown
-      markdown(wiki_page.content)
+      markdown(wiki_page.content, pipeline: :wiki, project_wiki: @project_wiki)
    when :asciidoc
      asciidoc(wiki_page.content)
    else

--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
 module Emails
  module Issues
    def new_issue_email(recipient_id, issue_id)
-      issue_mail_with_notification(issue_id, recipient_id) do
+      setup_issue_mail(issue_id, recipient_id)
+
      mail_new_thread(@issue, issue_thread_options(@issue.author_id, recipient_id))
    end
-    end

    def reassigned_issue_email(recipient_id, issue_id, previous_assignee_id, updated_by_user_id)
-      issue_mail_with_notification(issue_id, recipient_id) do
+      setup_issue_mail(issue_id, recipient_id)
+
      @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
      mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
    end
-    end

    def closed_issue_email(recipient_id, issue_id, updated_by_user_id)
-      issue_mail_with_notification(issue_id, recipient_id) do
+      setup_issue_mail(issue_id, recipient_id)
+
      @updated_by = User.find updated_by_user_id
      mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
    end
-    end

    def issue_status_changed_email(recipient_id, issue_id, status, updated_by_user_id)
-      issue_mail_with_notification(issue_id, recipient_id) do
+      setup_issue_mail(issue_id, recipient_id)
+
      @issue_status = status
      @updated_by = User.find updated_by_user_id
      mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id))
    end
-    end

    private

@@ -38,14 +38,12 @@ module Emails
      }
    end

-    def issue_mail_with_notification(issue_id, recipient_id)
+    def setup_issue_mail(issue_id, recipient_id)
      @issue = Issue.find(issue_id)
      @project = @issue.project
      @target_url = namespace_project_issue_url(@project.namespace, @project, @issue)

-      yield
-
-      SentNotification.record(@issue, recipient_id, reply_key)
+      @sent_notification = SentNotification.record(@issue, recipient_id, reply_key)
    end
  end
 end
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
 module Emails
  module MergeRequests
    def new_merge_request_email(recipient_id, merge_request_id)
-      @merge_request = MergeRequest.find(merge_request_id)
-      @project = @merge_request.project
-      @target_url = namespace_project_merge_request_url(@project.namespace,
-                                                        @project,
-                                                        @merge_request)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+
      mail_new_thread(@merge_request,
                      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)
-      @merge_request = MergeRequest.find(merge_request_id)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+
      @previous_assignee = User.find_by(id: previous_assignee_id) if previous_assignee_id
-      @project = @merge_request.project
-      @target_url = namespace_project_merge_request_url(@project.namespace,
-                                                        @project,
-                                                        @merge_request)
      mail_answer_thread(@merge_request,
                         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)
-      @merge_request = MergeRequest.find(merge_request_id)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+
      @updated_by = User.find updated_by_user_id
-      @project = @merge_request.project
-      @target_url = namespace_project_merge_request_url(@project.namespace,
-                                                        @project,
-                                                        @merge_request)
      mail_answer_thread(@merge_request,
                         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)
-      @merge_request = MergeRequest.find(merge_request_id)
-      @project = @merge_request.project
-      @target_url = namespace_project_merge_request_url(@project.namespace,
-                                                        @project,
-                                                        @merge_request)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+
      mail_answer_thread(@merge_request,
                         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)
-      @merge_request = MergeRequest.find(merge_request_id)
+      setup_merge_request_mail(merge_request_id, recipient_id)
+
      @mr_status = status
-      @project = @merge_request.project
      @updated_by = User.find updated_by_user_id
-      @target_url = namespace_project_merge_request_url(@project.namespace,
-                                                        @project,
-                                                        @merge_request)
      mail_answer_thread(@merge_request,
                         from: sender(updated_by_user_id),
                         to: recipient(recipient_id),
                         subject: subject("#{@merge_request.title} (##{@merge_request.iid})"))
+    end
+
+    private
+
+    def setup_merge_request_mail(merge_request_id, recipient_id)
+      @merge_request = MergeRequest.find(merge_request_id)
+      @project = @merge_request.project
+      @target_url = namespace_project_merge_request_url(@project.namespace,
+                                                        @project,
+                                                        @merge_request)

-      SentNotification.record(@merge_request, recipient_id, reply_key)
+      @sent_notification = SentNotification.record(@merge_request, recipient_id, reply_key)
    end
  end
 end
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
 module Emails
  module Notes
    def note_commit_email(recipient_id, note_id)
-      note_mail_with_notification(note_id, recipient_id) do
+      setup_note_mail(note_id, recipient_id)
+
      @commit = @note.noteable
      @target_url = namespace_project_commit_url(*note_target_url_options)

@@ -10,23 +11,22 @@ module Emails
                         to: recipient(recipient_id),
                         subject: subject("#{@commit.title} (#{@commit.short_id})"))
    end
-    end

    def note_issue_email(recipient_id, note_id)
-      note_mail_with_notification(note_id, recipient_id) do
+      setup_note_mail(note_id, recipient_id)
+
      @issue = @note.noteable
      @target_url = namespace_project_issue_url(*note_target_url_options)
      mail_answer_thread(@issue, note_thread_options(recipient_id))
    end
-    end

    def note_merge_request_email(recipient_id, note_id)
-      note_mail_with_notification(note_id, recipient_id) do
+      setup_note_mail(note_id, recipient_id)
+
      @merge_request = @note.noteable
      @target_url = namespace_project_merge_request_url(*note_target_url_options)
      mail_answer_thread(@merge_request, note_thread_options(recipient_id))
    end
-    end

    private

@@ -42,13 +42,11 @@ module Emails
      }
    end

-    def note_mail_with_notification(note_id, recipient_id)
+    def setup_note_mail(note_id, recipient_id)
      @note = Note.find(note_id)
      @project = @note.project

-      yield
-
-      SentNotification.record_note(@note, recipient_id, reply_key)
+      @sent_notification = SentNotification.record_note(@note, recipient_id, reply_key)
    end
  end
 end
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -107,10 +107,9 @@ class Notify < BaseMailer
    end

    headers["X-GitLab-#{model.class.name}-ID"] = model.id
-
-    if reply_key
    headers['X-GitLab-Reply-Key'] = reply_key

+    if Gitlab::IncomingEmail.enabled?
      address = Mail::Address.new(Gitlab::IncomingEmail.reply_address(reply_key))
      address.display_name = @project.name_with_namespace


--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -175,7 +175,7 @@ class Ability
        :create_merge_request,
        :create_wiki,
        :manage_builds,
-        :download_build_artifacts,
+        :read_build_artifacts,
        :push_code
      ]
    end

--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -30,10 +30,12 @@
 #  description        :string(255)
 #  artifacts_file     :text
 #  gl_project_id      :integer
+#  artifacts_metadata :text
 #

 module Ci
  class Build < CommitStatus
+    include Gitlab::Application.routes.url_helpers
    LAZY_ATTRIBUTES = ['trace']

    belongs_to :runner, class_name: 'Ci::Runner'
@@ -49,6 +51,7 @@ module Ci
    scope :similar, ->(build) { where(ref: build.ref, tag: build.tag, trigger_request_id: build.trigger_request_id) }

    mount_uploader :artifacts_file, ArtifactUploader
+    mount_uploader :artifacts_metadata, ArtifactUploader

    acts_as_taggable

@@ -291,20 +294,17 @@ module Ci
    end

    def target_url
-      Gitlab::Application.routes.url_helpers.
      namespace_project_build_url(project.namespace, project, self)
    end

    def cancel_url
      if active?
-        Gitlab::Application.routes.url_helpers.
        cancel_namespace_project_build_path(project.namespace, project, self)
      end
    end

    def retry_url
      if retryable?
-        Gitlab::Application.routes.url_helpers.
        retry_namespace_project_build_path(project.namespace, project, self)
      end
    end
@@ -321,20 +321,35 @@ module Ci
      pending? && !any_runners_online?
    end

-    def download_url
-      if artifacts_file.exists?
-        Gitlab::Application.routes.url_helpers.
-          download_namespace_project_build_path(project.namespace, project, self)
-      end
-    end
-
    def execute_hooks
      build_data = Gitlab::BuildDataBuilder.build(self)
      project.execute_hooks(build_data.dup, :build_hooks)
      project.execute_services(build_data.dup, :build_hooks)
    end

+    def artifacts?
+      artifacts_file.exists?
+    end
+
+    def artifacts_download_url
+      if artifacts?
+        download_namespace_project_build_artifacts_path(project.namespace, project, self)
+      end
+    end

+    def artifacts_browse_url
+      if artifacts_browser_supported?
+        browse_namespace_project_build_artifacts_path(project.namespace, project, self)
+      end
+    end
+
+    def artifacts_browser_supported?
+      artifacts? && artifacts_metadata.exists?
+    end
+
+    def artifacts_metadata_entry(path)
+      Gitlab::Ci::Build::Artifacts::Metadata.new(artifacts_metadata.path, path).to_entry
+    end

    private


--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -56,6 +56,8 @@ class CommitStatus < ActiveRecord::Base
  scope :ordered, -> { order(:ref, :stage_idx, :name) }
  scope :for_ref, ->(ref) { where(ref: ref) }

+  AVAILABLE_STATUSES = ['pending', 'running', 'success', 'failed', 'canceled']
+
  state_machine :status, initial: :pending do
    event :run do
      transition pending: :running
@@ -131,7 +133,11 @@ class CommitStatus < ActiveRecord::Base
    false
  end

-  def download_url
+  def artifacts_download_url
+    nil
+  end
+
+  def artifacts_browse_url
    nil
  end
 end
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -119,6 +119,12 @@ module Issuable
      update(subscribed: !subscribed?(user))
  end

+  def unsubscribe(user)
+    subscriptions.
+      find_or_initialize_by(user_id: user.id).
+      update(subscribed: false)
+  end
+
  def to_hook_data(user)
    {
      object_kind: self.class.name.underscore,

--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -38,6 +38,10 @@ class ProjectWiki
    [Gitlab.config.gitlab.url, "/", path_with_namespace, ".git"].join('')
  end

+  def wiki_base_path
+    ["/", @project.path_with_namespace, "/wikis"].join('')
+  end
+
  # Returns the Gollum::Wiki object.
  def wiki
    @wiki ||= begin

--- a/app/models/sent_notification.rb
+++ b/app/models/sent_notification.rb
@@ -25,8 +25,6 @@ class SentNotification < ActiveRecord::Base

  class << self
    def reply_key
-      return nil unless Gitlab::IncomingEmail.enabled?
-
      SecureRandom.hex(16)
    end

@@ -64,6 +62,10 @@ class SentNotification < ActiveRecord::Base
    end
  end

+  def unsubscribable?
+    !for_commit?
+  end
+
  def for_commit?
    noteable_type == "Commit"
  end
@@ -75,4 +77,8 @@ class SentNotification < ActiveRecord::Base
      super
    end
  end
+
+  def to_param
+    self.reply_key
+  end
 end
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -169,7 +169,7 @@ class WikiPage
  private

  def set_attributes
-    attributes[:slug] = @page.escaped_url_path
+    attributes[:slug] = @page.url_path
    attributes[:title] = @page.title
    attributes[:format] = @page.format
  end

--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -44,7 +44,7 @@ module MergeRequests
    def after_merge
      MergeRequests::PostMergeService.new(project, current_user).execute(merge_request)

-      if params[:should_remove_source_branch]
+      if params[:should_remove_source_branch].present?
        DeleteBranchService.new(@merge_request.source_project, current_user).
          execute(merge_request.source_branch)
      end

--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -60,8 +60,8 @@

  %td
    .pull-right
-      - if current_user && can?(current_user, :download_build_artifacts, project) && build.download_url
-        = link_to build.download_url, title: 'Download artifacts' do
+      - if current_user && can?(current_user, :read_build_artifacts, project) && build.artifacts?
+        = link_to build.artifacts_download_url, title: 'Download artifacts' do
          %i.fa.fa-download
      - if current_user && can?(current_user, :manage_builds, build.project)
        - if build.active?

--- a/app/views/admin/builds/index.html.haml
+++ b/app/views/admin/builds/index.html.haml
@@ -4,7 +4,7 @@
      - if @all_builds.running_or_pending.any?
        = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post

-  %ul.center-top-menu
+  %ul.nav-links
    %li{class: ('active' if @scope.nil?)}
      = link_to admin_builds_path do
        All

--- a/app/views/admin/logs/show.html.haml
+++ b/app/views/admin/logs/show.html.haml
 - page_title "Logs"
 - loggers = [Gitlab::GitLogger, Gitlab::AppLogger,
             Gitlab::ProductionLogger, Gitlab::SidekiqLogger]
-%ul.nav.nav-tabs.log-tabs
+%ul.nav-links.log-tabs
  - loggers.each do |klass|
    %li{ class: (klass == Gitlab::GitLogger ? 'active' : '') }
      = link_to klass::file_name, "##{klass::file_name_noext}",
          'data-toggle' => 'tab'
-%p.light To prevent performance issues admin logs output the last 2000 lines
+.gray-content-block
+  To prevent performance issues admin logs output the last 2000 lines
 .tab-content
  - loggers.each do |klass|
    .tab-pane{ class: (klass == Gitlab::GitLogger ? 'active' : ''),

--- a/app/views/admin/users/_head.html.haml
+++ b/app/views/admin/users/_head.html.haml
@@ -12,7 +12,7 @@
      %i.fa.fa-pencil-square-o
      Edit
 %hr
-%ul.nav.nav-tabs
+%ul.nav-links
  = nav_link(path: 'users#show') do
    = link_to "Account", admin_user_path(@user)
  = nav_link(path: 'users#groups') do
@@ -23,3 +23,4 @@
    = link_to "SSH keys", keys_admin_user_path(@user)
  = nav_link(controller: :identities) do
    = link_to "Identities", admin_user_identities_path(@user)
+.append-bottom-default
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
 - page_title "Users"
 = render 'shared/show_aside'

-.row
-  %aside.col-md-3
-    .admin-filter
-      %ul.nav.nav-pills.nav-stacked
+.admin-filter
+  %ul.nav-links
    %li{class: "#{'active' unless params[:filter]}"}
      = link_to admin_users_path do
        Active
-            %small.pull-right= number_with_delimiter(User.active.count)
+        %small.badge= number_with_delimiter(User.active.count)
    %li{class: "#{'active' if params[:filter] == "admins"}"}
      = link_to admin_users_path(filter: "admins") do
        Admins
-            %small.pull-right= number_with_delimiter(User.admins.count)
+        %small.badge= number_with_delimiter(User.admins.count)
    %li.filter-two-factor-enabled{class: "#{'active' if params[:filter] == 'two_factor_enabled'}"}
      = link_to admin_users_path(filter: 'two_factor_enabled') do
        2FA Enabled
-            %small.pull-right= number_with_delimiter(User.with_two_factor.count)
+        %small.badge= number_with_delimiter(User.with_two_factor.count)
    %li.filter-two-factor-disabled{class: "#{'active' if params[:filter] == 'two_factor_disabled'}"}
      = link_to admin_users_path(filter: 'two_factor_disabled') do
        2FA Disabled
-            %small.pull-right= number_with_delimiter(User.without_two_factor.count)
+        %small.badge= number_with_delimiter(User.without_two_factor.count)
    %li{class: "#{'active' if params[:filter] == "blocked"}"}
      = link_to admin_users_path(filter: "blocked") do
        Blocked
-            %small.pull-right= number_with_delimiter(User.blocked.count)
+        %small.badge= number_with_delimiter(User.blocked.count)
    %li{class: "#{'active' if params[:filter] == "wop"}"}
      = link_to admin_users_path(filter: "wop") do
        Without projects
-            %small.pull-right= number_with_delimiter(User.without_projects.count)
-      %hr
-      = form_tag admin_users_path, method: :get, class: 'form-inline' do
-        .form-group
-          = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control', spellcheck: false
-          = hidden_field_tag "filter", params[:filter]
-        = button_tag class: 'btn btn-primary' do
-          %i.fa.fa-search
-      %hr
-      = link_to 'Reset', admin_users_path, class: "btn btn-cancel"
+        %small.badge= number_with_delimiter(User.without_projects.count)

-  %section.col-md-9
-    .panel.panel-default
-      .panel-heading
-        Users (#{number_with_delimiter(@users.total_count)})
-        .panel-head-actions
+  .gray-content-block.second-block
+    .pull-right
      .dropdown.inline
-            %a.dropdown-toggle.btn.btn-sm{href: '#', "data-toggle" => "dropdown"}
+        %a.dropdown-toggle.btn{href: '#', "data-toggle" => "dropdown"}
          %span.light sort:
          - if @sort.present?
            = sort_options_hash[@sort]
@@ -69,7 +55,16 @@
            = link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do
              = sort_title_oldest_updated

-          = link_to 'New User', new_admin_user_path, class: "btn btn-new btn-sm"
+      = link_to 'New User', new_admin_user_path, class: "btn btn-new"
+    = form_tag admin_users_path, method: :get, class: 'form-inline' do
+      .form-group
+        = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control', spellcheck: false
+        = hidden_field_tag "filter", params[:filter]
+      = button_tag class: 'btn btn-primary' do
+        %i.fa.fa-search
+
+
+.panel.panel-default
  %ul.well-list
    - @users.each do |user|
      %li
@@ -103,4 +98,4 @@
                = link_to 'Unlock', unlock_admin_user_path(user), method: :put, class: 'btn-grouped btn btn-xs btn-success', data: { confirm: 'Are you sure?' }
              - if user.can_be_removed?
                = link_to 'Destroy', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and groups linked to this user will also be removed! Maybe block the user instead? Are you sure?" }, method: :delete, class: 'btn-grouped btn btn-xs btn-remove'
-    = paginate @users, theme: "gitlab"
+= paginate @users, theme: "gitlab"
--- a/app/views/dashboard/_activities.html.haml
+++ b/app/views/dashboard/_activities.html.haml
 .hidden-xs
  = render "events/event_last_push", event: @last_push

-.gray-content-block
+.nav-block
  - if current_user
-    .pull-right
+    .controls
      = link_to dashboard_projects_path(:atom, { private_token: current_user.private_token }), class: 'btn rss-btn' do
        %i.fa.fa-rss
  = render 'shared/event_filter'

--- a/app/views/dashboard/_activity_head.html.haml
+++ b/app/views/dashboard/_activity_head.html.haml
-%ul.center-top-menu
+%ul.nav-links
  %li{ class: ("active" unless params[:filter]) }
    = link_to activity_dashboard_path, class: 'shortcuts-activity', data: {placement: 'right'} do
      Your Projects

--- a/app/views/dashboard/_groups_head.html.haml
+++ b/app/views/dashboard/_groups_head.html.haml
-%ul.center-top-menu
+%ul.nav-links
  = nav_link(page: dashboard_groups_path) do
    = link_to dashboard_groups_path, title: 'Your groups', data: {placement: 'right'} do
      Your Groups

--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
 = content_for :flash_message do
  = render 'shared/project_limit'
 .top-area
-  %ul.left-top-menu
+  %ul.nav-links
    = nav_link(page: [dashboard_projects_path, root_path]) do
      = link_to dashboard_projects_path, title: 'Home', class: 'shortcuts-activity', data: {placement: 'right'} do
        Your Projects

--- a/app/views/dashboard/_snippets_head.html.haml
+++ b/app/views/dashboard/_snippets_head.html.haml
-%ul.center-top-menu
+%ul.nav-links
  = nav_link(page: dashboard_snippets_path, html_options: {class: 'home'}) do
    = link_to dashboard_snippets_path, title: 'Your snippets', data: {placement: 'right'} do
      Your Snippets

--- a/app/views/dashboard/milestones/show.html.haml
+++ b/app/views/dashboard/milestones/show.html.haml
@@ -48,7 +48,7 @@
    #{@milestone.open_items_count} open
  = milestone_progress_bar(@milestone)

-%ul.center-top-menu.no-top.no-bottom
+%ul.nav-links.no-top.no-bottom
  %li.active
    = link_to '#tab-issues', 'data-toggle' => 'tab' do
      Issues

--- a/app/views/dashboard/snippets/index.html.haml
+++ b/app/views/dashboard/snippets/index.html.haml
@@ -3,29 +3,33 @@

 = render 'dashboard/snippets_head'

-.gray-content-block
-  .pull-right
+.nav-block
+  .controls
    = link_to new_snippet_path, class: "btn btn-new", title: "New Snippet" do
      = icon('plus')
      New Snippet

-  .btn-group.btn-group-next.snippet-scope-menu
-    = link_to dashboard_snippets_path, class: "btn btn-default #{"active" unless params[:scope]}" do
+  .nav-links.snippet-scope-menu
+    %li{ class: ("active" unless params[:scope]) }
+      = link_to dashboard_snippets_path do
        All
        %span.badge
          = current_user.snippets.count

-    = link_to dashboard_snippets_path(scope: 'are_private'), class: "btn btn-default #{"active" if params[:scope] == "are_private"}" do
+    %li{ class: ("active" if params[:scope] == "are_private") }
+      = link_to dashboard_snippets_path(scope: 'are_private') do
        Private
        %span.badge
          = current_user.snippets.are_private.count

-    = link_to dashboard_snippets_path(scope: 'are_internal'), class: "btn btn-default #{"active" if params[:scope] == "are_internal"}" do
+    %li{ class: ("active" if params[:scope] == "are_internal") }
+      = link_to dashboard_snippets_path(scope: 'are_internal') do
        Internal
        %span.badge
          = current_user.snippets.are_internal.count

-    = link_to dashboard_snippets_path(scope: 'are_public'), class: "btn btn-default #{"active" if params[:scope] == "are_public"}" do
+    %li{ class: ("active" if params[:scope] == "are_public") }
+      = link_to dashboard_snippets_path(scope: 'are_public') do
        Public
        %span.badge
          = current_user.snippets.are_public.count

--- a/app/views/devise/shared/_signin_box.html.haml
+++ b/app/views/devise/shared/_signin_box.html.haml
@@ -7,7 +7,7 @@
      %h3 Sign in
  .login-body
    - if form_based_providers.any?
-      %ul.nav.nav-tabs
+      %ul.nav-links
        - if crowd_enabled?
          %li.active
            = link_to "Crowd", "#tab-crowd", 'data-toggle' => 'tab'

--- a/app/views/groups/edit.html.haml
+++ b/app/views/groups/edit.html.haml
 - header_title group_title(@group, "Settings", edit_group_path(@group))
 - @blank_container = true

-.panel.panel-default
+.panel.panel-default.prepend-top-default
  .panel-heading
    Group settings
  .panel-body

--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -2,7 +2,7 @@
 - header_title group_title(@group, "Members", group_group_members_path(@group))
 - @blank_container = true

-.group-members-page
+.group-members-page.prepend-top-default
  - if current_user && current_user.can?(:admin_group_member, @group)
    .panel.panel-default
      .panel-heading

--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
@@ -54,7 +54,7 @@
    #{@milestone.open_items_count} open
  = milestone_progress_bar(@milestone)

-%ul.center-top-menu.no-top.no-bottom
+%ul.nav-links.no-top.no-bottom
  %li.active
    = link_to '#tab-issues', 'data-toggle' => 'tab' do
      Issues

--- a/app/views/groups/projects.html.haml
+++ b/app/views/groups/projects.html.haml
 - page_title "Projects"
 - header_title group_title(@group, "Projects", projects_group_path(@group))

-.panel.panel-default
+.panel.panel-default.prepend-top-default
  .panel-heading
    %strong= @group.name
    projects:

--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
+- @no_container = true
+
 - unless can?(current_user, :read_group, @group)
  - @disable_search_panel = true

@@ -25,8 +27,8 @@
    .cover-desc.description
      = markdown(@group.description, pipeline: :description)

- if can?(current_user, :read_group, @group)
-  %ul.center-top-menu.no-top
+
+  %ul.nav-links
    %li.active
      = link_to "#activity", 'data-toggle' => 'tab' do
        Activity
@@ -35,9 +37,11 @@
        = link_to "#projects", 'data-toggle' => 'tab' do
          Projects

+- if can?(current_user, :read_group, @group)
+  %div{ class: container_class }
    .tab-content
      .tab-pane.active#activity
-      .gray-content-block.activity-filter-block
+        .activity-filter-block
          - if current_user
            = render "events/event_last_push", event: @last_push

@@ -50,5 +54,5 @@
        = render "projects", projects: @projects

 - else
-  %p.center-top-menu.no-top
+  %p.nav-links.no-top
    No projects to show
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -139,26 +139,9 @@
  %h2#navs Navigation

  %h4
-    %code .center-top-menu
+    %code .nav-links
  .example
-    %ul.center-top-menu
-      %li.active
-        %a Open
-      %li
-        %a Closed
-
-  %h4
-    %code .btn-group.btn-group-next
-  .example
-    %div.btn-group.btn-group-next
-      %a.btn.active Open
-      %a.btn Closed
-
-
-  %h4
-    %code .nav.nav-tabs
-  .example
-    %ul.nav.nav-tabs
+    %ul.nav-links
      %li.active
        %a Open
      %li

--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -24,7 +24,7 @@
  .content-wrapper
    = render "layouts/flash"
    = yield :flash_message
-    %div{ class: container_class }
+    %div{ class: (container_class unless @no_container) }
      .content
        .clearfix
          = yield
--- a/app/views/layouts/notify.html.haml
+++ b/app/views/layouts/notify.html.haml
@@ -44,6 +44,10 @@
          %br
          -# Don't link the host is the line below, one link in the email is easier to quickly click than two.
          You're receiving this email because of your account on #{Gitlab.config.gitlab.host}.
-          If you'd like to receive fewer emails, you can adjust your notification settings.
+          If you'd like to receive fewer emails, you can
+          - if @sent_notification && @sent_notification.unsubscribable?
+            = link_to "unsubscribe", unsubscribe_sent_notification_url(@sent_notification)
+            from this thread or
+          adjust your notification settings.

          = email_action @target_url
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -6,7 +6,7 @@
  .alert.alert-info
    Some options are unavailable for LDAP accounts

-.account-page
+.account-page.prepend-top-default
  .panel.panel-default.update-token
    .panel-heading
      Reset Private token

--- a/app/views/projects/_activity.html.haml
+++ b/app/views/projects/_activity.html.haml
-.gray-content-block.activity-filter-block
+.nav-block.activity-filter-block
  - if current_user
-    .pull-right
+    .controls
      = link_to namespace_project_path(@project.namespace, @project, format: :atom, private_token: current_user.private_token), title: "Feed", class: 'btn rss-btn' do
        %i.fa.fa-rss


--- a/app/views/projects/_files.html.haml
+++ b/app/views/projects/_files.html.haml
 #tree-holder.tree-holder.clearfix
-  .gray-content-block.second-block
+  .nav-block
    = render 'projects/tree/tree_header', tree: @tree

  = render 'projects/tree/tree_content', tree: @tree

--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -44,9 +44,12 @@
      = render 'projects/buttons/star'
      = render 'projects/buttons/fork'

+    .clone-row
+      .project-clone-holder
        = render "shared/clone_panel"

      .split-repo-buttons
+        .btn-group.pull-left
          = render "projects/buttons/download"
          = render 'projects/buttons/dropdown'


--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
 .md-area
  .md-header.clearfix
-    %ul.center-top-menu
+    %ul.nav-links
      %li.active
        %a.js-md-write-button(href="#md-write-holder" tabindex="-1")
          Write

--- a/app/views/projects/_zen.html.haml
+++ b/app/views/projects/_zen.html.haml
 .zennable
  .zen-backdrop
-    - classes << ' js-gfm-input markdown-area'
+    - classes << ' js-gfm-input js-autosize markdown-area'
    - if defined?(f) && f
      = f.text_area attr, class: classes
    - else

--- a/app/views/projects/artifacts/_tree_directory.html.haml
+++ b/app/views/projects/artifacts/_tree_directory.html.haml
+%tr{ class: 'tree-item' }
+  %td.tree-item-file-name
+    = tree_icon('folder', '755', directory.name)
+    %span.str-truncated
+      = link_to directory.name, browse_namespace_project_build_artifacts_path(@project.namespace, @project, @build, path: directory.path)
+  %td
+  %td
--- a/app/views/projects/artifacts/_tree_file.html.haml
+++ b/app/views/projects/artifacts/_tree_file.html.haml
+%tr{ class: 'tree-item' }
+  %td.tree-item-file-name
+    = tree_icon('file', '664', file.name)
+    %span.str-truncated
+      = file.name
+  %td
+    = number_to_human_size(file.metadata[:size], precision: 2)
+  %td
+    = link_to file_namespace_project_build_artifacts_path(@project.namespace, @project, @build, path: file.path),
+      class: 'btn btn-xs btn-default artifact-download' do
+      = icon('download')
--- a/app/views/projects/artifacts/browse.html.haml
+++ b/app/views/projects/artifacts/browse.html.haml
+- page_title 'Artifacts', "#{@build.name} (##{@build.id})", 'Builds'
+= render 'projects/builds/header_title'
+
+#tree-holder.tree-holder
+  .gray-content-block.top-block.clearfix
+    .pull-right
+      = link_to download_namespace_project_build_artifacts_path(@project.namespace, @project, @build),
+        class: 'btn btn-default' do
+        = icon('download')
+        Download artifacts archive
+
+%div.tree-content-holder
+  .table-holder
+    %table.table.tree-table.table-striped
+      %thead
+        %tr
+          %th Name
+          %th Size
+          %th Download
+      = render partial: 'tree_directory', collection: @entry.directories(parent: true), as: :directory
+      = render partial: 'tree_file', collection: @entry.files, as: :file
+
+- if @entry.empty?
+  .center Empty
--- a/app/views/projects/blob/_blob.html.haml
+++ b/app/views/projects/blob/_blob.html.haml
-.gray-content-block.top-block
+.nav-block
  .tree-ref-holder
    = render 'shared/ref_switcher', destination: 'blob', path: @path


--- a/app/views/projects/blob/edit.html.haml
+++ b/app/views/projects/blob/edit.html.haml
@@ -2,7 +2,7 @@
 = render "header_title"

 .file-editor
-  %ul.center-top-menu.no-bottom.js-edit-mode
+  %ul.nav-links.no-bottom.js-edit-mode
    %li.active
      = link_to '#editor' do
        = icon('edit')

--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -8,7 +8,7 @@
        - if @all_builds.running_or_pending.any?
          = link_to 'Cancel running', cancel_all_namespace_project_builds_path(@project.namespace, @project), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post

-  %ul.center-top-menu
+  %ul.nav-links
    %li{class: ('active' if @scope.nil?)}
      = link_to project_builds_path(@project) do
        All

--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -14,7 +14,7 @@

  #up-build-trace
  - if @commit.matrix_for_ref?(@build.ref)
-    %ul.center-top-menu.no-top.no-bottom
+    %ul.nav-links.no-top.no-bottom
      - @commit.latest_builds_for_ref(@build.ref).each do |build|
        %li{class: ('active' if build == @build) }
          = link_to namespace_project_build_path(@project.namespace, @project, build) do
@@ -89,9 +89,15 @@
            Test coverage
          %h1 #{@build.coverage}%

-      - if current_user && can?(current_user, :download_build_artifacts, @project) && @build.download_url
-        .build-widget.center
-          = link_to "Download artifacts", @build.download_url, class: 'btn btn-sm btn-primary'
+      - if current_user && can?(current_user, :read_build_artifacts, @project) && @build.artifacts?
+
+        .build-widget.artifacts
+          %h4.title Build artifacts
+          .center
+            .btn-group{ role: :group }
+              = link_to "Download", @build.artifacts_download_url, class: 'btn btn-sm btn-primary'
+              - if @build.artifacts_browser_supported?
+                = link_to "Browse", @build.artifacts_browse_url, class: 'btn btn-sm btn-primary'

      .build-widget
        %h4.title

--- a/app/views/projects/buttons/_dropdown.html.haml
+++ b/app/views/projects/buttons/_dropdown.html.haml
 - if current_user
-  %span.dropdown
-    %a.dropdown-new.btn.btn-new{href: '#', "data-toggle" => "dropdown"}
+  .btn-group
+    %a.btn.dropdown-toggle{href: '#', "data-toggle" => "dropdown"}
      = icon('plus')
    %ul.dropdown-menu.dropdown-menu-right.project-home-dropdown
      - if can?(current_user, :create_issue, @project)

--- a/app/views/projects/commit/_ci_menu.html.haml
+++ b/app/views/projects/commit/_ci_menu.html.haml
-%ul.center-top-menu.no-top.no-bottom.commit-ci-menu
+%ul.nav-links.no-top.no-bottom.commit-ci-menu
  = nav_link(path: 'commit#show') do
    = link_to namespace_project_commit_path(@project.namespace, @project, @commit.id) do
      Changes

--- a/app/views/projects/commit/_commit_box.html.haml
+++ b/app/views/projects/commit/_commit_box.html.haml
@@ -50,7 +50,7 @@
 .commit-info-row.branches
  %i.fa.fa-spinner.fa-spin

-.commit-box.gray-content-block.middle-block
+.commit-box.content-block
  %h3.commit-title
    = markdown escape_once(@commit.title), pipeline: :single_line
  - if @commit.description.present?

--- a/app/views/projects/commit/show.html.haml
+++ b/app/views/projects/commit/show.html.haml
@@ -2,7 +2,9 @@
 - page_description  @commit.description

 = render "projects/commits/header_title"
-= render "commit_box"
+
+.prepend-top-default
+  = render "commit_box"
 - if @ci_commit
  = render "ci_menu"
 - else

--- a/app/views/projects/commit_statuses/_commit_status.html.haml
+++ b/app/views/projects/commit_statuses/_commit_status.html.haml
@@ -66,8 +66,8 @@

  %td
    .pull-right
-      - if current_user && can?(current_user, :download_build_artifacts, commit_status.project) && commit_status.download_url
-        = link_to commit_status.download_url, title: 'Download artifacts' do
+      - if current_user && can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts?
+        = link_to commit_status.artifacts_download_url, title: 'Download artifacts' do
          %i.fa.fa-download
      - if current_user && can?(current_user, :manage_builds, commit_status.project)
        - if commit_status.active?

--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
-%ul.center-top-menu
+%ul.nav-links
  = nav_link(controller: [:commit, :commits]) do
    = link_to namespace_project_commits_path(@project.namespace, @project, current_ref) do
      Commits

--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -6,7 +6,7 @@

 = render "head"

-.gray-content-block
+.gray-content-block.second-block
  .tree-ref-holder
    = render 'shared/ref_switcher', destination: 'commits'


--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
@@ -3,7 +3,7 @@

 - diff_files = safe_diff_files(diffs)

-.gray-content-block.middle-block.oneline-block
+.content-block.oneline-block
  .inline-parallel-buttons
    .btn-group
      = inline_diff_btn

--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
 - @blank_container = true

-.project-edit-container
+.project-edit-container.prepend-top-default
  .project-edit-errors
  .project-edit-content
    .panel.panel-default

--- a/app/views/projects/graphs/_head.html.haml
+++ b/app/views/projects/graphs/_head.html.haml
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
--- a/app/views/projects/project_members/index.html.haml
+++ b/app/views/projects/project_members/index.html.haml
--- a/app/views/projects/runners/index.html.haml
+++ b/app/views/projects/runners/index.html.haml
--- a/app/views/projects/show.html.haml
+++ b/app/views/projects/show.html.haml
--- a/app/views/projects/tree/_tree_content.html.haml
+++ b/app/views/projects/tree/_tree_content.html.haml
--- a/app/views/projects/tree/show.html.haml
+++ b/app/views/projects/tree/show.html.haml
--- a/app/views/projects/wikis/_nav.html.haml
+++ b/app/views/projects/wikis/_nav.html.haml
--- a/app/views/projects/wikis/_new.html.haml
+++ b/app/views/projects/wikis/_new.html.haml
--- a/app/views/projects/wikis/git_access.html.haml
+++ b/app/views/projects/wikis/git_access.html.haml
--- a/app/views/search/_category.html.haml
+++ b/app/views/search/_category.html.haml
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
--- a/app/views/search/show.html.haml
+++ b/app/views/search/show.html.haml
--- a/app/views/shared/_clone_panel.html.haml
+++ b/app/views/shared/_clone_panel.html.haml
--- a/app/views/shared/_event_filter.html.haml
+++ b/app/views/shared/_event_filter.html.haml
--- a/app/views/shared/_milestones_filter.html.haml
+++ b/app/views/shared/_milestones_filter.html.haml
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
--- a/app/views/sherlock/queries/show.html.haml
+++ b/app/views/sherlock/queries/show.html.haml
--- a/app/views/sherlock/transactions/show.html.haml
+++ b/app/views/sherlock/transactions/show.html.haml
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
--- a/config/routes.rb
+++ b/config/routes.rb
--- a/db/fixtures/development/14_builds.rb
+++ b/db/fixtures/development/14_builds.rb
--- a/db/migrate/20151230132518_add_artifacts_metadata_to_ci_build.rb
+++ b/db/migrate/20151230132518_add_artifacts_metadata_to_ci_build.rb
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/doc/api/README.md
+++ b/doc/api/README.md
--- a/doc/api/builds.md
+++ b/doc/api/builds.md
--- a/doc/incoming_email/README.md
+++ b/doc/incoming_email/README.md
--- a/doc/incoming_email/postfix.md
+++ b/doc/incoming_email/postfix.md
--- a/features/project/builds.feature
+++ b/features/project/builds.feature
--- a/features/project/wiki.feature
+++ b/features/project/wiki.feature
--- a/features/steps/project/builds.rb
+++ b/features/steps/project/builds.rb
--- a/features/steps/project/wiki.rb
+++ b/features/steps/project/wiki.rb
--- a/features/steps/shared/active_tab.rb
+++ b/features/steps/shared/active_tab.rb
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
--- a/lib/api/builds.rb
+++ b/lib/api/builds.rb
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
--- a/lib/api/helpers.rb
+++ b/lib/api/helpers.rb
--- a/lib/banzai/cross_project_reference.rb
+++ b/lib/banzai/cross_project_reference.rb
--- a/lib/banzai/filter.rb
+++ b/lib/banzai/filter.rb
--- a/lib/banzai/filter/abstract_reference_filter.rb
+++ b/lib/banzai/filter/abstract_reference_filter.rb
--- a/lib/banzai/filter/autolink_filter.rb
+++ b/lib/banzai/filter/autolink_filter.rb
--- a/lib/banzai/filter/commit_range_reference_filter.rb
+++ b/lib/banzai/filter/commit_range_reference_filter.rb
--- a/lib/banzai/filter/commit_reference_filter.rb
+++ b/lib/banzai/filter/commit_reference_filter.rb
--- a/lib/banzai/filter/emoji_filter.rb
+++ b/lib/banzai/filter/emoji_filter.rb
--- a/lib/banzai/filter/external_issue_reference_filter.rb
+++ b/lib/banzai/filter/external_issue_reference_filter.rb
--- a/lib/banzai/filter/external_link_filter.rb
+++ b/lib/banzai/filter/external_link_filter.rb
--- a/lib/banzai/filter/gollum_tags_filter.rb
+++ b/lib/banzai/filter/gollum_tags_filter.rb
--- a/lib/banzai/filter/issue_reference_filter.rb
+++ b/lib/banzai/filter/issue_reference_filter.rb
--- a/lib/banzai/filter/label_reference_filter.rb
+++ b/lib/banzai/filter/label_reference_filter.rb
--- a/lib/banzai/filter/markdown_filter.rb
+++ b/lib/banzai/filter/markdown_filter.rb
--- a/lib/banzai/filter/merge_request_reference_filter.rb
+++ b/lib/banzai/filter/merge_request_reference_filter.rb
--- a/lib/banzai/filter/redactor_filter.rb
+++ b/lib/banzai/filter/redactor_filter.rb
--- a/lib/banzai/filter/reference_filter.rb
+++ b/lib/banzai/filter/reference_filter.rb
--- a/lib/banzai/filter/reference_gatherer_filter.rb
+++ b/lib/banzai/filter/reference_gatherer_filter.rb
--- a/lib/banzai/filter/relative_link_filter.rb
+++ b/lib/banzai/filter/relative_link_filter.rb
--- a/lib/banzai/filter/sanitization_filter.rb
+++ b/lib/banzai/filter/sanitization_filter.rb
--- a/lib/banzai/filter/snippet_reference_filter.rb
+++ b/lib/banzai/filter/snippet_reference_filter.rb
--- a/lib/banzai/filter/syntax_highlight_filter.rb
+++ b/lib/banzai/filter/syntax_highlight_filter.rb
--- a/lib/banzai/filter/table_of_contents_filter.rb
+++ b/lib/banzai/filter/table_of_contents_filter.rb
--- a/lib/banzai/filter/task_list_filter.rb
+++ b/lib/banzai/filter/task_list_filter.rb
--- a/lib/banzai/filter/upload_link_filter.rb
+++ b/lib/banzai/filter/upload_link_filter.rb
--- a/lib/banzai/filter/user_reference_filter.rb
+++ b/lib/banzai/filter/user_reference_filter.rb
--- a/lib/banzai/lazy_reference.rb
+++ b/lib/banzai/lazy_reference.rb
--- a/lib/banzai/pipeline.rb
+++ b/lib/banzai/pipeline.rb
--- a/lib/banzai/pipeline/asciidoc_pipeline.rb
+++ b/lib/banzai/pipeline/asciidoc_pipeline.rb
--- a/lib/banzai/pipeline/atom_pipeline.rb
+++ b/lib/banzai/pipeline/atom_pipeline.rb
--- a/lib/banzai/pipeline/base_pipeline.rb
+++ b/lib/banzai/pipeline/base_pipeline.rb
--- a/lib/banzai/pipeline/combined_pipeline.rb
+++ b/lib/banzai/pipeline/combined_pipeline.rb
--- a/lib/banzai/pipeline/description_pipeline.rb
+++ b/lib/banzai/pipeline/description_pipeline.rb
--- a/lib/banzai/pipeline/email_pipeline.rb
+++ b/lib/banzai/pipeline/email_pipeline.rb
--- a/lib/banzai/pipeline/full_pipeline.rb
+++ b/lib/banzai/pipeline/full_pipeline.rb
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
--- a/lib/banzai/pipeline/note_pipeline.rb
+++ b/lib/banzai/pipeline/note_pipeline.rb
--- a/lib/banzai/pipeline/plain_markdown_pipeline.rb
+++ b/lib/banzai/pipeline/plain_markdown_pipeline.rb
--- a/lib/banzai/pipeline/post_process_pipeline.rb
+++ b/lib/banzai/pipeline/post_process_pipeline.rb
--- a/lib/banzai/pipeline/reference_extraction_pipeline.rb
+++ b/lib/banzai/pipeline/reference_extraction_pipeline.rb
--- a/lib/banzai/pipeline/single_line_pipeline.rb
+++ b/lib/banzai/pipeline/single_line_pipeline.rb
--- a/lib/banzai/pipeline/wiki_pipeline.rb
+++ b/lib/banzai/pipeline/wiki_pipeline.rb
--- a/lib/banzai/reference_extractor.rb
+++ b/lib/banzai/reference_extractor.rb
--- a/lib/ci/api/builds.rb
+++ b/lib/ci/api/builds.rb
--- a/lib/gitlab/ci/build/artifacts/metadata.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata.rb
--- a/lib/gitlab/ci/build/artifacts/metadata/entry.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata/entry.rb
--- a/lib/gitlab/diff/parser.rb
+++ b/lib/gitlab/diff/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/github_import/wiki_formatter.rb
+++ b/lib/gitlab/github_import/wiki_formatter.rb
--- a/lib/gitlab/markdown/pipeline.rb
+++ b/lib/gitlab/markdown/pipeline.rb
--- a/lib/gitlab/reference_extractor.rb
+++ b/lib/gitlab/reference_extractor.rb
--- a/spec/controllers/sent_notification_controller_spec.rb
+++ b/spec/controllers/sent_notification_controller_spec.rb
--- a/spec/factories.rb
+++ b/spec/factories.rb
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
--- a/spec/fixtures/ci_build_artifacts.zip
+++ b/spec/fixtures/ci_build_artifacts.zip
--- a/spec/fixtures/ci_build_artifacts_metadata.gz
+++ b/spec/fixtures/ci_build_artifacts_metadata.gz
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
--- a/spec/helpers/gitlab_markdown_helper_spec.rb
+++ b/spec/helpers/gitlab_markdown_helper_spec.rb
--- a/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
+++ b/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
--- a/spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb
+++ b/spec/lib/gitlab/ci/build/artifacts/metadata/entry_spec.rb
--- a/spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb
+++ b/spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb
--- a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
--- a/spec/requests/api/commit_status_spec.rb
+++ b/spec/requests/api/commit_status_spec.rb
--- a/spec/requests/api/notes_spec.rb
+++ b/spec/requests/api/notes_spec.rb
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
--- a/spec/support/api/pagination_shared_examples.rb
+++ b/spec/support/api/pagination_shared_examples.rb
--- a/spec/support/markdown_feature.rb
+++ b/spec/support/markdown_feature.rb
--- a/spec/support/matchers/markdown_matchers.rb
+++ b/spec/support/matchers/markdown_matchers.rb
--- a/vendor/assets/javascripts/autosize.js
+++ b/vendor/assets/javascripts/autosize.js
--- a/vendor/assets/javascripts/latinise.js
+++ b/vendor/assets/javascripts/latinise.js