Merge branch 'master' into rs-redactor-filter

34148d15 · Douwe Maan · 95f0440a · bd3689e9 · 34148d15 · 34148d15
Commit 34148d15 authored Oct 16, 2015 by Douwe Maan
113 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -25,7 +25,6 @@ config/initializers/rack_attack.rb
 config/initializers/smtp_settings.rb
 config/resque.yml
 config/unicorn.rb
-config/mail_room.yml
 config/secrets.yml
 coverage/*
 db/*.sqlite3

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

 v 8.1.0 (unreleased)
+  - Fix error preventing displaying of commit data for a directory with a leading dot (Stan Hu)
+  - Speed up load times of issue detail pages by roughly 1.5x
  - Make diff file view easier to use on mobile screens (Stan Hu)
+  - Improved performance of finding users by username or Email address
+  - Fix bug where merge request comments created by API would not trigger notifications (Stan Hu)
  - Add support for creating directories from Files page (Stan Hu)
  - Allow removing of project without confirmation when JavaScript is disabled (Stan Hu)
  - Support filtering by "Any" milestone or issue and fix "No Milestone" and "No Label" filters (Stan Hu)
@@ -17,6 +21,8 @@ v 8.1.0 (unreleased)
  - Fix cases where Markdown did not render links in activity feed (Stan Hu)
  - Add first and last to pagination (Zeger-Jan van de Weg)
  - Added Commit Status API
+  - Added Builds View
+  - Added when to .gitlab-ci.yml
  - Show CI status on commit page
  - Added CI_BUILD_TAG, _STAGE, _NAME and _TRIGGERED to CI builds
  - Show CI status on Your projects page and Starred projects page

--- a/Gemfile
+++ b/Gemfile
 source "https://rubygems.org"

-def darwin_only(require_as)
-  RUBY_PLATFORM.include?('darwin') && require_as
-end
-
-def linux_only(require_as)
-  RUBY_PLATFORM.include?('linux') && require_as
-end
-
 gem 'rails', '4.1.12'

 # Specify a sprockets version due to security issue
@@ -47,7 +39,7 @@ gem "browser", '~> 1.0.0'

 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 7.2.18'
+gem "gitlab_git", '~> 7.2.19'

 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
@@ -102,7 +94,7 @@ gem "seed-fu", '~> 2.3.5'
 gem 'html-pipeline', '~> 1.11.0'
 gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
 gem 'github-markup', '~> 1.3.1'
-gem 'redcarpet',     '~> 3.3.2'
+gem 'redcarpet',     '~> 3.3.3'
 gem 'RedCloth',      '~> 4.2.9'
 gem 'rdoc',          '~>3.6'
 gem 'org-ruby',      '~> 0.9.12'
@@ -196,7 +188,7 @@ gem 'charlock_holmes', '~> 0.6.9.4'

 gem "sass-rails", '~> 4.0.5'
 gem "coffee-rails", '~> 4.1.0'
-gem "uglifier", '~> 2.3.2'
+gem "uglifier", '~> 2.7.2'
 gem 'turbolinks', '~> 2.5.0'
 gem 'jquery-turbolinks', '~> 2.0.1'

@@ -224,6 +216,9 @@ group :development do
  gem 'quiet_assets', '~> 1.0.2'
  gem 'rack-mini-profiler', '~> 0.9.0', require: false
  gem 'rerun', '~> 0.10.0'
+  gem 'bullet', require: false
+  gem 'active_record_query_trace', require: false
+  gem 'rack-lineprof', platform: :mri

  # Better errors handler
  gem 'better_errors', '~> 1.0.1'
@@ -290,7 +285,7 @@ gem 'newrelic-grape'

 gem 'octokit', '~> 3.7.0'

-gem "mail_room", "~> 0.6.0"
+gem "mail_room", "~> 0.6.1"

 gem 'email_reply_parser', '~> 0.5.8'

@@ -304,11 +299,3 @@ gem 'oauth2', '~> 1.0.0'

 # Soft deletion
 gem "paranoia", "~> 2.0"
-
-group :development, :test do
-  gem 'guard-rspec', '~> 4.2.0'
-
-  gem 'rb-fsevent', require: darwin_only('rb-fsevent')
-  gem 'growl',      require: darwin_only('growl')
-  gem 'rb-inotify', require: linux_only('rb-inotify')
-end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,6 +17,7 @@ GEM
      activesupport (= 4.1.12)
      builder (~> 3.1)
      erubis (~> 2.7.0)
+    active_record_query_trace (1.5)
    activemodel (4.1.12)
      activesupport (= 4.1.12)
      builder (~> 3.1)
@@ -87,6 +88,9 @@ GEM
      terminal-table (~> 1.4)
    browser (1.0.0)
    builder (3.2.2)
+    bullet (4.14.9)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.9.0)
    byebug (6.0.2)
    cal-heatmap-rails (0.0.1)
    capybara (2.4.4)
@@ -134,6 +138,7 @@ GEM
    daemons (1.2.3)
    database_cleaner (1.4.1)
    debug_inspector (0.0.2)
+    debugger-ruby_core_source (1.3.8)
    default_value_for (3.0.1)
      activerecord (>= 3.2.0, < 5.0)
    descendants_tracker (0.0.4)
@@ -278,7 +283,7 @@ GEM
      mime-types (~> 1.19)
    gitlab_emoji (0.1.1)
      gemojione (~> 2.0)
-    gitlab_git (7.2.18)
+    gitlab_git (7.2.19)
      activesupport (~> 4.0)
      charlock_holmes (~> 0.6)
      gitlab-linguist (~> 3.0)
@@ -314,19 +319,6 @@ GEM
    grape-entity (0.4.8)
      activesupport
      multi_json (>= 1.3.2)
-    growl (1.0.3)
-    guard (2.13.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-rspec (4.2.10)
-      guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
    haml (4.0.7)
      tilt
    haml-rails (0.9.0)
@@ -387,12 +379,11 @@ GEM
      celluloid (~> 0.16.0)
      rb-fsevent (>= 0.9.3)
      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
    macaddr (1.7.1)
      systemu (~> 2.6.2)
    mail (2.6.3)
      mime-types (>= 1.16, < 3)
-    mail_room (0.6.0)
+    mail_room (0.6.1)
    method_source (0.8.2)
    mime-types (1.25.1)
    mimemagic (0.3.0)
@@ -403,7 +394,6 @@ GEM
    multi_xml (0.5.5)
    multipart-post (2.0.0)
    mysql2 (0.3.20)
-    nenv (0.2.0)
    nested_form (0.3.2)
    net-ldap (0.11)
    net-scp (1.2.1)
@@ -416,9 +406,6 @@ GEM
    newrelic_rpm (3.9.4.245)
    nokogiri (1.6.6.2)
      mini_portile (~> 0.6.0)
-    notiffany (0.0.7)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
    nprogress-rails (0.1.2.3)
    oauth (0.4.7)
    oauth2 (1.0.0)
@@ -502,6 +489,10 @@ GEM
    rack-attack (4.3.0)
      rack
    rack-cors (0.4.0)
+    rack-lineprof (0.0.3)
+      rack (~> 1.5)
+      rblineprof (~> 0.3.6)
+      term-ansicolor (~> 1.3)
    rack-mini-profiler (0.9.7)
      rack (>= 1.1.3)
    rack-mount (0.8.3)
@@ -540,13 +531,15 @@ GEM
    rb-fsevent (0.9.5)
    rb-inotify (0.9.5)
      ffi (>= 0.5.0)
+    rblineprof (0.3.6)
+      debugger-ruby_core_source (~> 1.3)
    rbvmomi (1.8.2)
      builder
      nokogiri (>= 1.4.1)
      trollop
    rdoc (3.12.2)
      json (~> 1.4)
-    redcarpet (3.3.2)
+    redcarpet (3.3.3)
    redis (3.2.1)
    redis-actionpack (4.0.0)
      actionpack (~> 4)
@@ -647,7 +640,6 @@ GEM
    sexp_processor (4.6.0)
    sham_rack (1.3.6)
      rack
-    shellany (0.0.1)
    shoulda-matchers (2.8.0)
      activesupport (>= 3.0.0)
    sidekiq (3.3.0)
@@ -741,7 +733,7 @@ GEM
      simple_oauth (~> 0.1.4)
    tzinfo (1.2.2)
      thread_safe (~> 0.1)
-    uglifier (2.3.3)
+    uglifier (2.7.2)
      execjs (>= 0.3.0)
      json (>= 1.8.0)
    underscore-rails (1.4.4)
@@ -755,6 +747,7 @@ GEM
    unicorn-worker-killer (0.4.3)
      get_process_mem (~> 0)
      unicorn (~> 4)
+    uniform_notifier (1.9.0)
    uuid (2.3.8)
      macaddr (~> 1.0)
    version_sorter (2.0.0)
@@ -784,6 +777,7 @@ PLATFORMS
 DEPENDENCIES
  RedCloth (~> 4.2.9)
  ace-rails-ap (~> 2.0.1)
+  active_record_query_trace
  activerecord-deprecated_finders (~> 1.0.3)
  activerecord-session_store (~> 0.1.0)
  acts-as-taggable-on (~> 3.4)
@@ -800,6 +794,7 @@ DEPENDENCIES
  bootstrap-sass (~> 3.0)
  brakeman (= 3.0.1)
  browser (~> 1.0.0)
+  bullet
  byebug
  cal-heatmap-rails (~> 0.0.1)
  capybara (~> 2.4.0)
@@ -834,15 +829,13 @@ DEPENDENCIES
  gitlab-flowdock-git-hook (~> 1.0.1)
  gitlab-linguist (~> 3.0.1)
  gitlab_emoji (~> 0.1)
-  gitlab_git (~> 7.2.18)
+  gitlab_git (~> 7.2.19)
  gitlab_meta (= 7.0)
  gitlab_omniauth-ldap (~> 1.2.1)
  gollum-lib (~> 4.0.2)
  gon (~> 5.0.0)
  grape (~> 0.6.1)
  grape-entity (~> 0.4.2)
-  growl
-  guard-rspec (~> 4.2.0)
  haml-rails (~> 0.9.0)
  hipchat (~> 1.5.0)
  html-pipeline (~> 1.11.0)
@@ -854,7 +847,7 @@ DEPENDENCIES
  jquery-ui-rails (~> 4.2.1)
  kaminari (~> 0.16.3)
  letter_opener (~> 1.1.2)
-  mail_room (~> 0.6.0)
+  mail_room (~> 0.6.1)
  minitest (~> 5.7.0)
  mousetrap-rails (~> 1.4.6)
  mysql2 (~> 0.3.16)
@@ -882,14 +875,13 @@ DEPENDENCIES
  quiet_assets (~> 1.0.2)
  rack-attack (~> 4.3.0)
  rack-cors (~> 0.4.0)
+  rack-lineprof
  rack-mini-profiler (~> 0.9.0)
  rack-oauth2 (~> 1.0.5)
  rails (= 4.1.12)
  raphael-rails (~> 2.1.2)
-  rb-fsevent
-  rb-inotify
  rdoc (~> 3.6)
-  redcarpet (~> 3.3.2)
+  redcarpet (~> 3.3.3)
  redis-rails (~> 4.0.0)
  request_store (~> 1.2.0)
  rerun (~> 0.10.0)
@@ -926,7 +918,7 @@ DEPENDENCIES
  thin (~> 1.6.1)
  tinder (~> 1.10.0)
  turbolinks (~> 2.5.0)
-  uglifier (~> 2.3.2)
+  uglifier (~> 2.7.2)
  underscore-rails (~> 1.4.4)
  unf (~> 0.1.4)
  unicorn (~> 4.8.2)

--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -68,8 +68,8 @@ class @MergeRequestTabs

  scrollToElement: (container) ->
    if window.location.hash
-      top = $(container + " " + window.location.hash).offset().top
-      $('body').scrollTo(top)
+      $el = $("#{container} #{window.location.hash}")
+      $('body').scrollTo($el.offset().top) if $el.length

  # Activate a tab based on the current action
  activateTab: (action) ->
@@ -127,7 +127,7 @@ class @MergeRequestTabs
        document.getElementById('commits').innerHTML = data.html
        $('.js-timeago').timeago()
        @commitsLoaded = true
-        @scrollToElement(".commits")
+        @scrollToElement("#commits")

  loadDiff: (source) ->
    return if @diffsLoaded
@@ -137,7 +137,7 @@ class @MergeRequestTabs
      success: (data) =>
        document.getElementById('diffs').innerHTML = data.html
        @diffsLoaded = true
-        @scrollToElement(".diffs")
+        @scrollToElement("#diffs")

  # Show or hide the loading spinner
  #

--- a/app/assets/javascripts/shortcuts_navigation.coffee
+++ b/app/assets/javascripts/shortcuts_navigation.coffee
@@ -7,6 +7,7 @@ class @ShortcutsNavigation extends Shortcuts
    Mousetrap.bind('g e', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-project-activity'))
    Mousetrap.bind('g f', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-tree'))
    Mousetrap.bind('g c', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-commits'))
+    Mousetrap.bind('g b', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-builds'))
    Mousetrap.bind('g n', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-network'))
    Mousetrap.bind('g g', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-graphs'))
    Mousetrap.bind('g i', -> ShortcutsNavigation.findAndFollowLink('.shortcuts-issues'))

--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -101,9 +101,9 @@

  pre {
    margin: 12px 0 12px 0 !important;
-    background-color: #f8fafc !important;
+    background-color: #f8fafc;
    font-size: 13px !important;
-    color: #5b6169 !important;
+    color: #5b6169;
    line-height: 1.6em !important;
    @include border-radius(2px);
  }

--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
 /* https://github.com/MozMorris/tomorrow-pygments */
-pre.code.highlight.dark,
 .code.dark {

-  background-color: #1d1f21;
-  color: #c5c8c6;
+  background-color: #1d1f21 !important;
+  color: #c5c8c6 !important;

-  pre.code,
+  pre.highlight,
  .line-numbers,
  .line-numbers a {
    background-color: #1d1f21 !important;
@@ -23,8 +22,8 @@ pre.code.highlight.dark,

  // Search result highlight
  span.highlight_word {
-    background: #ffe792;
-    color: #000000;
+    background-color: #ffe792 !important;
+    color: #000000 !important;
  }

  .hll { background-color: #373b41 }

--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
 /* https://github.com/richleland/pygments-css/blob/master/monokai.css */
-pre.code.monokai,
 .code.monokai {

-  background: #272822;
-  color: #f8f8f2;
+  background-color: #272822 !important;
+  color: #f8f8f2 !important;

  pre.highlight,
  .line-numbers,
  .line-numbers a {
-    background:#272822 !important;
-    color:#f8f8f2 !important;
+    background-color :#272822 !important;
+    color: #f8f8f2 !important;
  }

  pre.code {
@@ -23,8 +22,8 @@ pre.code.monokai,

  // Search result highlight
  span.highlight_word {
-    background: #ffe792;
-    color: #000000;
+    background-color: #ffe792 !important;
+    color: #000000 !important;
  }

  .hll { background-color: #49483e }

--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
 /* https://gist.github.com/qguv/7936275 */
-pre.code.highlight.solarized-dark,
 .code.solarized-dark {

-  background-color: #002b36;
-  color: #93a1a1;
+  background-color: #002b36 !important;
+  color: #93a1a1 !important;

-  pre.code,
+  pre.highlight,
  .line-numbers,
  .line-numbers a {
    background-color: #002b36 !important;
@@ -23,7 +22,7 @@ pre.code.highlight.solarized-dark,

  // Search result highlight
  span.highlight_word {
-    background: #094554;
+    background-color: #094554 !important;
  }

  /* Solarized Dark

--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
 /* https://gist.github.com/qguv/7936275 */
-pre.code.highlight.solarized-light,
 .code.solarized-light {

-  background-color: #fdf6e3;
-  color: #586e75;
+  background-color: #fdf6e3 !important;
+  color: #586e75 !important;

-  pre.code,
+  pre.highlight,
  .line-numbers,
  .line-numbers a {
    background-color: #fdf6e3 !important;
@@ -23,7 +22,7 @@ pre.code.highlight.solarized-light,

  // Search result highlight
  span.highlight_word {
-    background: #eee8d5;
+    background-color: #eee8d5 !important;
  }

  /* Solarized Light

--- a/app/assets/stylesheets/highlight/white.scss
+++ b/app/assets/stylesheets/highlight/white.scss
 /* https://github.com/aahan/pygments-github-style */
-pre.code.highlight.white,
 .code.white {
-  background-color: #f8fafc;
-  font-size: 13px;
-  color: #5b6169;
-  line-height: 1.6em;

+  background-color: #f8fafc !important;
+  color: #5b6169 !important;
+
+  pre.highlight,
  .line-numbers,
  .line-numbers a {
    background-color: $background-color !important;
    color: $gl-gray !important;
  }

-  pre.highlight {
-    background-color: #fff !important;
-    color: #333 !important;
-  }
-
  pre.code {
    border-left: 1px solid $border-color;
+    background-color: #fff !important;
+    color: #333 !important;
  }

  // highlight line via anchor
@@ -28,7 +24,7 @@ pre.code.highlight.white,

  // Search result highlight
  span.highlight_word {
-    background: #fafe3d;
+    background-color: #fafe3d !important;
  }

  .hll { background-color: #f8f8f8 }

--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -39,7 +39,13 @@ class Admin::ServicesController < Admin::ApplicationController
  end

  def application_services_params
-    params.permit(:id,
+    application_services_params = params.permit(:id,
      service: Projects::ServicesController::ALLOWED_PARAMS)
+    if application_services_params[:service].is_a?(Hash)
+      Projects::ServicesController::FILTER_BLANK_PARAMS.each do |param|
+        application_services_params[:service].delete(param) if application_services_params[:service][param].blank? 
+      end
+    end
+    application_services_params
  end
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -150,7 +150,7 @@ class ApplicationController < ActionController::Base
  end

  def git_not_found!
-    render "errors/git_not_found", layout: "errors", status: 404
+    render html: "errors/git_not_found", layout: "errors", status: 404
  end

  def method_missing(method_sym, *arguments, &block)

--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
 class Projects::BuildsController < Projects::ApplicationController
  before_action :ci_project
-  before_action :build
+  before_action :build, except: [:index, :cancel_all]

-  before_action :authorize_admin_project!, except: [:show, :status]
+  before_action :authorize_admin_project!, except: [:index, :show, :status]

  layout "project"

+  def index
+    @scope = params[:scope]
+    @all_builds = project.ci_builds
+    @builds =
+      case @scope
+      when 'all'
+        @all_builds
+      when 'finished'
+        @all_builds.finished
+      else
+        @all_builds.running_or_pending
+      end
+    @builds = @builds.order('created_at DESC').page(params[:page]).per(30)
+  end
+
+  def cancel_all
+    @project.ci_builds.running_or_pending.each(&:cancel)
+
+    redirect_to namespace_project_builds_path(project.namespace, project)
+  end
+
  def show
    @builds = @ci_project.commits.find_by_sha(@build.sha).builds.order('id DESC')
    @builds = @builds.where("id not in (?)", @build.id).page(params[:page]).per(20)

--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -57,7 +57,7 @@ class Projects::IssuesController < Projects::ApplicationController
  def show
    @participants = @issue.participants(current_user)
    @note = @project.notes.new(noteable: @issue)
-    @notes = @issue.notes.inc_author.fresh
+    @notes = @issue.notes.with_associations.fresh
    @noteable = @issue

    respond_with(@issue)

--- a/app/controllers/projects/refs_controller.rb
+++ b/app/controllers/projects/refs_controller.rb
@@ -3,6 +3,7 @@ class Projects::RefsController < Projects::ApplicationController
  include TreeHelper

  before_action :require_non_empty_project
+  before_action :validate_ref_id
  before_action :assign_ref_vars
  before_action :authorize_download_code!

@@ -71,4 +72,10 @@ class Projects::RefsController < Projects::ApplicationController
      format.js
    end
  end
+
+  private
+
+  def validate_ref_id
+    return not_found! if params[:id].present? && params[:id] !~ Gitlab::Regex.git_reference_regex
+  end
 end
--- a/app/controllers/projects/repositories_controller.rb
+++ b/app/controllers/projects/repositories_controller.rb
@@ -11,18 +11,9 @@ class Projects::RepositoriesController < Projects::ApplicationController
  end

  def archive
-    begin
-      file_path = ArchiveRepositoryService.new(@project, params[:ref], params[:format]).execute
-    rescue
-      return head :not_found
-    end
-
-    if file_path
-      # Send file to user
-      response.headers["Content-Length"] = File.open(file_path).size.to_s
-      send_file file_path
-    else
-      redirect_to request.fullpath
-    end
+    render json: ArchiveRepositoryService.new(@project, params[:ref], params[:format]).execute
+  rescue => ex
+    logger.error("#{self.class.name}: #{ex}")
+    return git_not_found!
  end
 end
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -9,6 +9,10 @@ class Projects::ServicesController < Projects::ApplicationController
                    :note_events, :send_from_committer_email, :disable_diffs, :external_wiki_url,
                    :notify, :color,
                    :server_host, :server_port, :default_irc_uri, :enable_ssl_verification]
+
+  # Parameters to ignore if no value is specified
+  FILTER_BLANK_PARAMS = [:password]
+  
  # Authorize
  before_action :authorize_admin_project!
  before_action :service, only: [:edit, :update, :test]
@@ -59,7 +63,9 @@ class Projects::ServicesController < Projects::ApplicationController

  def service_params
    service_params = params.require(:service).permit(ALLOWED_PARAMS)
-    service_params.delete("password") if service_params["password"].blank?
+    FILTER_BLANK_PARAMS.each do |param|
+      service_params.delete(param) if service_params[param].blank?
+    end
    service_params
  end
 end
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -68,13 +68,17 @@ module ApplicationHelper
    end
  end

-  def avatar_icon(user_email = '', size = nil)
-    user = User.find_by(email: user_email)
+  def avatar_icon(user_or_email = nil, size = nil)
+    if user_or_email.is_a?(User)
+      user = user_or_email
+    else
+      user = User.find_by(email: user_or_email)
+    end

    if user
      user.avatar_url(size) || default_avatar
    else
-      gravatar_icon(user_email, size)
+      gravatar_icon(user_or_email, size)
    end
  end


--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
@@ -25,6 +25,10 @@ module GitlabRoutingHelper
    namespace_project_commits_path(project.namespace, project, @ref || project.repository.root_ref)
  end

+  def project_builds_path(project, *args)
+    namespace_project_builds_path(project.namespace, project, *args)
+  end
+
  def activity_project_path(project, *args)
    activity_namespace_project_path(project.namespace, project, *args)
  end

--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -47,7 +47,7 @@ module MergeRequestsHelper
  end

  def issues_sentence(issues)
-    issues.map { |i| "##{i.iid}" }.to_sentence
+    issues.map(&:to_reference).to_sentence
  end

  def mr_change_branches_path(merge_request)

--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -29,7 +29,7 @@ module ProjectsHelper
    author_html =  ""

    # Build avatar image tag
-    author_html << image_tag(avatar_icon(author.try(:email), opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt:'') if opts[:avatar]
+    author_html << image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt:'') if opts[:avatar]

    # Build name span tag
    author_html << content_tag(:span, sanitize(author.name), class: opts[:author_class]) if opts[:name]
@@ -113,6 +113,10 @@ module ProjectsHelper
      nav_tabs << :merge_requests
    end

+    if can?(current_user, :read_build, project)
+      nav_tabs << :builds
+    end
+
    if can?(current_user, :admin_project, project)
      nav_tabs << :settings
    end

--- a/app/helpers/runners_helper.rb
+++ b/app/helpers/runners_helper.rb
@@ -13,4 +13,17 @@ module RunnersHelper
                  title: "Runner is #{status}, last contact was #{time_ago_in_words(runner.contacted_at)} ago"
    end
  end
+
+  def runner_link(runner)
+    display_name = truncate(runner.display_name, length: 15)
+    id = "\##{runner.id}"
+
+    if current_user && current_user.admin
+      link_to ci_admin_runner_path(runner) do
+        display_name + id
+      end
+    else
+      display_name + id
+    end
+  end
 end
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -41,6 +41,7 @@ class Ability
          :read_project_member,
          :read_merge_request,
          :read_note,
+          :read_build,
          :download_code
        ]

@@ -127,6 +128,7 @@ class Ability
        :read_project_member,
        :read_merge_request,
        :read_note,
+        :read_build,
        :create_project,
        :create_issue,
        :create_note

--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -93,10 +93,7 @@ module Ci
          Ci::WebHookService.new.build_end(build)
        end

-        if build.commit.should_create_next_builds?(build)
-          build.commit.create_next_builds(build.ref, build.tag, build.user, build.trigger_request)
-        end
-
+        build.commit.create_next_builds(build)
        project.execute_services(build)

        if project.coverage_enabled?

--- a/app/models/ci/commit.rb
+++ b/app/models/ci/commit.rb
@@ -24,6 +24,8 @@ module Ci
    has_many :builds, class_name: 'Ci::Build'
    has_many :trigger_requests, dependent: :destroy, class_name: 'Ci::TriggerRequest'

+    scope :ordered, -> { order('CASE WHEN ci_commits.committed_at IS NULL THEN 0 ELSE 1 END', :committed_at, :id) }
+
    validates_presence_of :sha
    validate :valid_commit_sha

@@ -89,19 +91,28 @@ module Ci
    def create_builds(ref, tag, user, trigger_request = nil)
      return unless config_processor
      config_processor.stages.any? do |stage|
-        CreateBuildsService.new.execute(self, stage, ref, tag, user, trigger_request).present?
+        CreateBuildsService.new.execute(self, stage, ref, tag, user, trigger_request, 'success').present?
      end
    end

-    def create_next_builds(ref, tag, user, trigger_request)
+    def create_next_builds(build)
      return unless config_processor

-      stages = builds.where(ref: ref, tag: tag, trigger_request: trigger_request).group_by(&:stage)
+      # don't create other builds if this one is retried
+      latest_builds = builds.similar(build).latest
+      return unless latest_builds.exists?(build.id)

-      config_processor.stages.any? do |stage|
-        unless stages.include?(stage)
-          CreateBuildsService.new.execute(self, stage, ref, tag, user, trigger_request).present?
-        end
+      # get list of stages after this build
+      next_stages = config_processor.stages.drop_while { |stage| stage != build.stage }
+      next_stages.delete(build.stage)
+
+      # get status for all prior builds
+      prior_builds = latest_builds.reject { |other_build| next_stages.include?(other_build.stage) }
+      status = Ci::Status.get_status(prior_builds)
+
+      # create builds for next stages based
+      next_stages.any? do |stage|
+        CreateBuildsService.new.execute(self, stage, build.ref, build.tag, build.user, build.trigger_request, status).present?
      end
    end

@@ -130,24 +141,7 @@ module Ci
        return 'failed'
      end

-      @status ||= begin
-        latest = latest_statuses
-        latest.reject! { |status| status.try(&:allow_failure?) }
-
-        if latest.none?
-          'skipped'
-        elsif latest.all?(&:success?)
-          'success'
-        elsif latest.all?(&:pending?)
-          'pending'
-        elsif latest.any?(&:running?) || latest.any?(&:pending?)
-          'running'
-        elsif latest.all?(&:canceled?)
-          'canceled'
-        else
-          'failed'
-        end
-      end
+      @status ||= Ci::Status.get_status(latest_statuses)
    end

    def pending?
@@ -217,16 +211,6 @@ module Ci
      update!(committed_at: DateTime.now)
    end

-    def should_create_next_builds?(build)
-      # don't create other builds if this one is retried
-      other_builds = builds.similar(build).latest
-      return false unless other_builds.include?(build)
-
-      other_builds.all? do |build|
-        build.success? || build.ignored?
-      end
-    end
-
    private

    def save_yaml_error(error)

--- a/app/models/ci/project.rb
+++ b/app/models/ci/project.rb
@@ -205,7 +205,7 @@ module Ci
    end

    def commits
-      gl_project.ci_commits
+      gl_project.ci_commits.ordered
    end

    def builds

--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -59,7 +59,7 @@ module Ci
    end

    def display_name
-      return token unless !description.blank?
+      return short_sha unless !description.blank?

      description
    end
@@ -95,7 +95,7 @@ module Ci
    end

    def short_sha
-      token[0...10]
+      token[0...8] if token
    end
  end
 end
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -16,6 +16,7 @@ class CommitStatus < ActiveRecord::Base
  scope :success, -> { where(status: 'success') }
  scope :failed, -> { where(status: 'failed')  }
  scope :running_or_pending, -> { where(status:[:running, :pending]) }
+  scope :finished, -> { where(status:[:success, :failed, :canceled]) }
  scope :latest, -> { where(id: unscope(:select).select('max(id)').group(:name, :ref)) }
  scope :ordered, -> { order(:ref, :stage_idx, :name) }
  scope :for_ref, ->(ref) { where(ref: ref) }
@@ -27,7 +28,7 @@ class CommitStatus < ActiveRecord::Base
    end

    event :drop do
-      transition running: :failed
+      transition [:pending, :running] => :failed
    end

    event :success do

--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -47,7 +47,7 @@ module Issuable
             prefix: true

    attr_mentionable :title, :description
-    participant :author, :assignee, :notes
+    participant :author, :assignee, :notes_with_associations
  end

  module ClassMethods
@@ -176,6 +176,10 @@ module Issuable
    self.class.to_s.underscore
  end

+  def notes_with_associations
+    notes.includes(:author, :project)
+  end
+
  private

  def filter_superceded_votes(votes, notes)

--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -64,7 +64,7 @@ class Group < Namespace
  end

  def owners
-    @owners ||= group_members.owners.map(&:user)
+    @owners ||= group_members.owners.includes(:user).map(&:user)
  end

  def add_users(user_ids, access_level, current_user = nil)

--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -60,6 +60,11 @@ class Note < ActiveRecord::Base
  scope :inc_author_project, ->{ includes(:project, :author) }
  scope :inc_author, ->{ includes(:author) }

+  scope :with_associations, -> do
+    includes(:author, :noteable, :updated_by,
+             project: [:project_members, { group: [:group_members] }])
+  end
+
  serialize :st_diff
  before_create :set_diff, if: ->(n) { n.line_code.present? }


--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -119,7 +119,7 @@ class Project < ActiveRecord::Base
  has_many :deploy_keys, through: :deploy_keys_projects
  has_many :users_star_projects, dependent: :destroy
  has_many :starrers, through: :users_star_projects, source: :user
-  has_many :ci_commits, ->() { order('CASE WHEN ci_commits.committed_at IS NULL THEN 0 ELSE 1 END', :committed_at, :id) }, dependent: :destroy, class_name: 'Ci::Commit', foreign_key: :gl_project_id
+  has_many :ci_commits, dependent: :destroy, class_name: 'Ci::Commit', foreign_key: :gl_project_id
  has_many :ci_builds, through: :ci_commits, source: :builds, dependent: :destroy, class_name: 'Ci::Build'

  has_one :import_data, dependent: :destroy, class_name: "ProjectImportData"

--- a/app/models/project_services/bamboo_service.rb
+++ b/app/models/project_services/bamboo_service.rb
@@ -48,7 +48,7 @@ class BambooService < CiService
  end

  def reset_password
-    if prop_updated?(:bamboo_url)
+    if bamboo_url_changed? && !password_touched?
      self.password = nil
    end
  end

--- a/app/models/project_services/teamcity_service.rb
+++ b/app/models/project_services/teamcity_service.rb
@@ -45,7 +45,7 @@ class TeamcityService < CiService
  end

  def reset_password
-    if prop_updated?(:teamcity_url)
+    if teamcity_url_changed? && !password_touched?
      self.password = nil
    end
  end

--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -139,15 +139,28 @@ class ProjectTeam
    Gitlab::Access.options.key max_member_access(user_id)
  end

+  # This method assumes project and group members are eager loaded for optimal
+  # performance.
  def max_member_access(user_id)
    access = []
-    access << project.project_members.find_by(user_id: user_id).try(:access_field)
+
+    project.project_members.each do |member|
+      if member.user_id == user_id
+        access << member.access_field if member.access_field
+        break
+      end
+    end

    if group
-      access << group.group_members.find_by(user_id: user_id).try(:access_field)
+      group.group_members.each do |member|
+        if member.user_id == user_id
+          access << member.access_field if member.access_field
+          break
+        end
+      end
    end

-    access.compact.max
+    access.max
  end

  private

--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -33,6 +33,8 @@ class Service < ActiveRecord::Base

  after_initialize :initialize_properties

+  after_commit :reset_updated_properties
+
  belongs_to :project
  has_one :service_hook

@@ -103,6 +105,7 @@ class Service < ActiveRecord::Base

  # Provide convenient accessor methods
  # for each serialized property.
+  # Also keep track of updated properties in a similar way as ActiveModel::Dirty
  def self.prop_accessor(*args)
    args.each do |arg|
      class_eval %{
@@ -111,21 +114,39 @@ class Service < ActiveRecord::Base
        end

        def #{arg}=(value)
+          updated_properties['#{arg}'] = #{arg} unless #{arg}_changed?
          self.properties['#{arg}'] = value
        end
+
+        def #{arg}_changed?
+          #{arg}_touched? && #{arg} != #{arg}_was
+        end
+
+        def #{arg}_touched?
+          updated_properties.include?('#{arg}')
+        end
+
+        def #{arg}_was
+          updated_properties['#{arg}']
+        end
      }
    end
  end

-  # ActiveRecord does not provide a mechanism to track changes in serialized keys.
-  # This is why we need to perform extra query to do it mannually.
-  def prop_updated?(prop_name)
-    relation_name = self.type.underscore
-    previous_value = project.send(relation_name).send(prop_name)
-    return false if previous_value.nil?
-    previous_value != send(prop_name)
+  # Returns a hash of the properties that have been assigned a new value since last save,
+  # indicating their original values (attr => original value).
+  # ActiveRecord does not provide a mechanism to track changes in serialized keys, 
+  # so we need a specific implementation for service properties.
+  # This allows to track changes to properties set with the accessor methods,
+  # but not direct manipulation of properties hash.
+  def updated_properties
+    @updated_properties ||= ActiveSupport::HashWithIndifferentAccess.new
  end

+  def reset_updated_properties
+    @updated_properties = nil
+  end
+  
  def async_execute(data)
    return unless supported_events.include?(data[:object_kind])


--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -68,6 +68,7 @@ class User < ActiveRecord::Base
  include Referable
  include Sortable
  include TokenAuthenticatable
+  include CaseSensitivity

  default_value_for :admin, false
  default_value_for :can_create_group, gitlab_config.default_can_create_group
@@ -273,8 +274,13 @@ class User < ActiveRecord::Base
    end

    def by_login(login)
-      where('lower(username) = :value OR lower(email) = :value',
-            value: login.to_s.downcase).first
+      return nil unless login
+
+      if login.include?('@'.freeze)
+        unscoped.iwhere(email: login).take
+      else
+        unscoped.iwhere(username: login).take
+      end
    end

    def find_by_username!(username)

--- a/app/services/archive_repository_service.rb
+++ b/app/services/archive_repository_service.rb
@@ -9,17 +9,10 @@ class ArchiveRepositoryService
  def execute(options = {})
    project.repository.clean_old_archives

-    raise "No archive file path" unless file_path
+    metadata = project.repository.archive_metadata(ref, storage_path, format)
+    raise "Repository or ref not found" if metadata.empty?

-    return file_path if archived?
-
-    unless archiving?
-      RepositoryArchiveWorker.perform_async(project.id, ref, format)
-    end
-
-    archived = wait_until_archived(options[:timeout] || 5.0)
-
-    file_path if archived
+    metadata
  end

  private
@@ -27,36 +20,4 @@ class ArchiveRepositoryService
  def storage_path
    Gitlab.config.gitlab.repository_downloads_path
  end
-
-  def file_path
-    @file_path ||= project.repository.archive_file_path(ref, storage_path, format)
-  end
-
-  def pid_file_path
-    @pid_file_path ||= project.repository.archive_pid_file_path(ref, storage_path, format)
-  end
-
-  def archived?
-    File.exist?(file_path)
-  end
-
-  def archiving?
-    File.exist?(pid_file_path)
-  end
-
-  def wait_until_archived(timeout = 5.0)
-    return archived? if timeout == 0.0
-    
-    t1 = Time.now
-
-    begin
-      sleep 0.1
-
-      success = archived?
-
-      t2 = Time.now
-    end until success || t2 - t1 >= timeout
-
-    success
-  end
 end
--- a/app/services/ci/create_builds_service.rb
+++ b/app/services/ci/create_builds_service.rb
 module Ci
  class CreateBuildsService
-    def execute(commit, stage, ref, tag, user, trigger_request)
+    def execute(commit, stage, ref, tag, user, trigger_request, status)
      builds_attrs = commit.config_processor.builds_for_stage_and_ref(stage, ref, tag)

+      # check when to create next build
+      builds_attrs = builds_attrs.select do |build_attrs|
+        case build_attrs[:when]
+        when 'on_success'
+          status == 'success'
+        when 'on_failure'
+          status == 'failed'
+        when 'always'
+          %w(success failed).include?(status)
+        end
+      end
+
      builds_attrs.map do |build_attrs|
        # don't create the same build twice
        unless commit.builds.find_by(ref: ref, tag: tag, trigger_request: trigger_request, name: build_attrs[:name])

--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -8,7 +8,7 @@
        = @user.name
      %ul.well-list
        %li
-          = image_tag avatar_icon(@user.email, 60), class: "avatar s60"
+          = image_tag avatar_icon(@user, 60), class: "avatar s60"
        %li
          %span.light Profile page:
          %strong

--- a/app/views/dashboard/milestones/_issue.html.haml
+++ b/app/views/dashboard/milestones/_issue.html.haml
@@ -7,4 +7,4 @@
    = link_to_gfm issue.title, [project.namespace.becomes(Namespace), project, issue], title: issue.title
  .pull-right.assignee-icon
    - if issue.assignee
-      = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16"
+      = image_tag avatar_icon(issue.assignee, 16), class: "avatar s16"
--- a/app/views/dashboard/milestones/_merge_request.html.haml
+++ b/app/views/dashboard/milestones/_merge_request.html.haml
@@ -7,4 +7,4 @@
    = link_to_gfm merge_request.title, [project.namespace.becomes(Namespace), project, merge_request], title: merge_request.title
  .pull-right.assignee-icon
    - if merge_request.assignee
-      = image_tag avatar_icon(merge_request.assignee.email, 16), class: "avatar s16"
+      = image_tag avatar_icon(merge_request.assignee, 16), class: "avatar s16"
--- a/app/views/dashboard/milestones/show.html.haml
+++ b/app/views/dashboard/milestones/show.html.haml
@@ -79,7 +79,7 @@
      - @dashboard_milestone.participants.each do |user|
        %li
          = link_to user, title: user.name, class: "darken" do
-            = image_tag avatar_icon(user.email, 32), class: "avatar s32"
+            = image_tag avatar_icon(user, 32), class: "avatar s32"
            %strong= truncate(user.name, lenght: 40)
            %br
            %small.cgray= user.username
--- a/app/views/groups/group_members/_group_member.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
@@ -5,7 +5,7 @@
 %li{class: "#{dom_class(member)} js-toggle-container", id: dom_id(member)}
  %span{class: ("list-item-name" if show_controls)}
    - if member.user
-      = image_tag avatar_icon(user.email, 16), class: "avatar s16", alt: ''
+      = image_tag avatar_icon(user, 16), class: "avatar s16", alt: ''
      %strong
        = link_to user.name, user_path(user)
      %span.cgray= user.username

--- a/app/views/groups/milestones/_issue.html.haml
+++ b/app/views/groups/milestones/_issue.html.haml
@@ -7,4 +7,4 @@
    = link_to_gfm issue.title, [project.namespace.becomes(Namespace), project, issue], title: issue.title
  .pull-right.assignee-icon
    - if issue.assignee
-      = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16", alt: ''
+      = image_tag avatar_icon(issue.assignee, 16), class: "avatar s16", alt: ''
--- a/app/views/groups/milestones/_merge_request.html.haml
+++ b/app/views/groups/milestones/_merge_request.html.haml
@@ -7,4 +7,4 @@
    = link_to_gfm merge_request.title, [project.namespace.becomes(Namespace), project, merge_request], title: merge_request.title
  .pull-right.assignee-icon
    - if merge_request.assignee
-      = image_tag avatar_icon(merge_request.assignee.email, 16), class: "avatar s16", alt: ''
+      = image_tag avatar_icon(merge_request.assignee, 16), class: "avatar s16", alt: ''
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
@@ -87,7 +87,7 @@
      - @group_milestone.participants.each do |user|
        %li
          = link_to user, title: user.name, class: "darken" do
-            = image_tag avatar_icon(user.email, 32), class: "avatar s32"
+            = image_tag avatar_icon(user, 32), class: "avatar s32"
            %strong= truncate(user.name, lenght: 40)
            %br
            %small.cgray= user.username
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
@@ -99,6 +99,12 @@
                  .key c
                %td
                  Go to commits
+              %tr
+                %td.shortcut
+                  .key g
+                  .key b
+                %td
+                  Go to builds
              %tr
                %td.shortcut
                  .key g

--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -18,7 +18,7 @@
      = render partial: 'layouts/collapse_button'
    - if current_user
      = link_to current_user, class: 'sidebar-user' do
-        = image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s36'
+        = image_tag avatar_icon(current_user, 60), alt: 'User activity', class: 'avatar avatar s36'
        .username
          = current_user.username
  .content-wrapper

--- a/app/views/layouts/ci/_page.html.haml
+++ b/app/views/layouts/ci/_page.html.haml
@@ -15,7 +15,7 @@
      = render partial: 'layouts/collapse_button'
    - if current_user
      = link_to current_user, class: 'sidebar-user' do
-        = image_tag avatar_icon(current_user.email, 60), alt: 'User activity', class: 'avatar avatar s36'
+        = image_tag avatar_icon(current_user, 60), alt: 'User activity', class: 'avatar avatar s36'
        .username
          = current_user.username
  .content-wrapper

--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -32,12 +32,20 @@
          Files

  - if project_nav_tab? :commits
-    = nav_link(controller: %w(commit commits compare repositories tags branches builds)) do
+    = nav_link(controller: %w(commit commits compare repositories tags branches)) do
      = link_to project_commits_path(@project), title: 'Commits', class: 'shortcuts-commits', data: {placement: 'right'} do
        = icon('history fw')
        %span
          Commits

+  - if project_nav_tab? :builds
+    = nav_link(controller: %w(builds)) do
+      = link_to project_builds_path(@project), title: 'Builds', class: 'shortcuts-builds', data: {placement: 'right'} do
+        = icon('cubes fw')
+        %span
+          Builds
+          %span.count.builds_counter= @project.ci_builds.running_or_pending.count(:all)
+
  - if project_nav_tab? :network
    = nav_link(controller: %w(network)) do
      = link_to namespace_project_network_path(@project.namespace, @project, current_ref), title: 'Network', class: 'shortcuts-network', data: {placement: 'right'} do

--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -68,7 +68,7 @@

    .col-md-5
      .light-well
-        = image_tag avatar_icon(@user.email, 160), alt: '', class: 'avatar s160'
+        = image_tag avatar_icon(@user, 160), alt: '', class: 'avatar s160'

        .clearfix
          .profile-avatar-form-option

--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
@@ -2,10 +2,10 @@
  .md-header.clearfix
    %ul.center-top-menu
      %li.active
-        = link_to '#md-write-holder', class: 'js-md-write-button', tabindex: '-1' do
+        %a.js-md-write-button(href="#md-write-holder" tabindex="-1")
          Write
      %li
-        = link_to '#md-preview-holder', class: 'js-md-preview-button', tabindex: '-1' do
+        %a.js-md-preview-button(href="md-preview-holder" tabindex="-1")
          Preview

    - if defined?(referenced_users) && referenced_users

--- a/app/views/projects/_zen.html.haml
+++ b/app/views/projects/_zen.html.haml
 .zennable
-  %input#zen-toggle-comment.zen-toggle-comment{ tabindex: '-1', type: 'checkbox' }
+  %input#zen-toggle-comment.zen-toggle-comment(tabindex="-1" type="checkbox")
  .zen-backdrop
    - classes << ' js-gfm-input markdown-area'
    = f.text_area attr, class: classes, placeholder: ''
-    = link_to nil, class: 'zen-enter-link', tabindex: '-1' do
+    %a.zen-enter-link(tabindex="-1" href="#")
      %i.fa.fa-expand
      Edit in fullscreen
-    = link_to nil, class: 'zen-leave-link' do
+    %a.zen-leave-link(href="#")
      %i.fa.fa-compress
--- a/app/views/projects/builds/_build.html.haml
+++ b/app/views/projects/builds/_build.html.haml
+%tr.build
+  %td.status
+    = ci_status_with_icon(build.status)
+
+  %td.commit_status-link
+    - if build.target_url
+      = link_to build.target_url do
+        %strong Build ##{build.id}
+    - else
+      %strong Build ##{build.id}
+
+    - if build.show_warning?
+      %i.fa.fa-warning.text-warning
+
+  %td
+    = link_to build.short_sha, namespace_project_commit_path(@project.namespace, @project, build.sha)
+
+  %td
+    = link_to build.ref, namespace_project_commits_path(@project.namespace, @project, build.ref)
+
+  %td
+    - if build.runner
+      = runner_link(build.runner)
+    - else
+      .light none
+
+  %td
+    = build.name
+
+    .pull-right
+      - if build.tags.any?
+        - build.tags.each do |tag|
+          %span.label.label-primary
+            = tag
+      - if build.trigger_request
+        %span.label.label-info triggered
+      - if build.allow_failure
+        %span.label.label-danger allowed to fail
+
+  %td.duration
+    - if build.duration
+      #{duration_in_words(build.finished_at, build.started_at)}
+
+  %td.timestamp
+    - if build.finished_at
+      %span #{time_ago_in_words build.finished_at} ago
+
+  %td
+    .pull-right
+      - if current_user && can?(current_user, :manage_builds, @project)
+        - if build.cancel_url
+          = link_to build.cancel_url, title: 'Cancel' do
+            %i.fa.fa-remove.cred
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
+- page_title "Builds"
+- header_title project_title(@project, "Builds", project_builds_path(@project))
+
+.project-issuable-filter
+  .controls
+    - if @ci_project && current_user && can?(current_user, :manage_builds, @project)
+      .pull-left.hidden-xs
+        - if @all_builds.running_or_pending.any?
+          = link_to 'Cancel all', cancel_all_namespace_project_builds_path(@project.namespace, @project), data: { confirm: 'Are you sure?' }, class: 'btn btn-danger'
+
+  %ul.center-top-menu
+    %li{class: ('active' if @scope.nil?)}
+      = link_to project_builds_path(@project) do
+        Running
+        %span.badge.js-running-count= @all_builds.running_or_pending.count(:id)
+
+    %li{class: ('active' if @scope == 'finished')}
+      = link_to project_builds_path(@project, scope: :finished) do
+        Finished
+        %span.badge.js-running-count= @all_builds.finished.count(:id)
+
+    %li{class: ('active' if @scope == 'all')}
+      = link_to project_builds_path(@project, scope: :all) do
+        All
+        %span.badge.js-totalbuilds-count= @all_builds.count(:id)
+
+.gray-content-block
+  List of #{@scope || 'running'} builds from this project
+
+%ul.content-list
+  - if @builds.blank?
+    %li
+      .nothing-here-block No builds to show
+  - else
+    %table.table.builds
+      %thead
+        %tr
+          %th Status
+          %th Build ID
+          %th Commit
+          %th Ref
+          %th Runner
+          %th Name
+          %th Duration
+          %th Finished at
+          %th
+
+      - @builds.each do |build|
+        = render 'projects/builds/build', build: build
+
+    = paginate @builds
+
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -44,16 +44,14 @@
      .bs-callout.bs-callout-warning
        %p
          - if no_runners_for_project?(@build.project)
-            This build is stuck, because the project doesn't have runners assigned.
+            This build is stuck, because the project doesn't have any runners online assigned to it.
          - elsif @build.tags.any?
-            This build is stuck.
-            %br
-            This build is stuck, because you don't have any active runners online with these tags assigned to the project:
+            This build is stuck, because you don't have any active runners online with any of these tags assigned to them:
            - @build.tags.each do |tag|
              %span.label.label-primary
                = tag
          - else
-            This build is stuck, because you don't have any active runners online that can run this build.
+            This build is stuck, because you don't have any active runners that can run this build.

          %br
          Go to

--- a/app/views/projects/merge_requests/_show.html.haml
+++ b/app/views/projects/merge_requests/_show.html.haml
@@ -36,7 +36,8 @@
    - if @merge_request.open? && @merge_request.can_be_merged?
      .light.append-bottom-20
        You can also accept this merge request manually using the
-        = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"
+        = succeed '.' do
+          = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal"

  - if @commits.present?
    %ul.merge-request-tabs

--- a/app/views/projects/milestones/_issue.html.haml
+++ b/app/views/projects/milestones/_issue.html.haml
 %li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid, 'data-url' => issue_path(issue) }
  .pull-right.assignee-icon
    - if issue.assignee
-      = image_tag avatar_icon(issue.assignee.email, 16), class: "avatar s16", alt: ''
+      = image_tag avatar_icon(issue.assignee, 16), class: "avatar s16", alt: ''
  %span
    = link_to [@project.namespace.becomes(Namespace), @project, issue] do
      %span.cgray ##{issue.iid}

--- a/app/views/projects/milestones/_merge_request.html.haml
+++ b/app/views/projects/milestones/_merge_request.html.haml
@@ -5,4 +5,4 @@
    = link_to_gfm merge_request.title, [@project.namespace.becomes(Namespace), @project, merge_request], title: merge_request.title
  .pull-right.assignee-icon
    - if merge_request.assignee
-      = image_tag avatar_icon(merge_request.assignee.email, 16), class: "avatar s16", alt: ''
+      = image_tag avatar_icon(merge_request.assignee, 16), class: "avatar s16", alt: ''
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -104,7 +104,7 @@
      - @users.each do |user|
        %li
          = link_to user, title: user.name, class: "darken" do
-            = image_tag avatar_icon(user.email, 32), class: "avatar s32"
+            = image_tag avatar_icon(user, 32), class: "avatar s32"
            %strong= truncate(user.name, lenght: 40)
            %br
            %small.cgray= user.username
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
 %li.timeline-entry{ id: dom_id(note), class: [dom_class(note), "note-row-#{note.id}", ('system-note' if note.system)], data: { discussion: note.discussion_id } }
  .timeline-entry-inner
    .timeline-icon
-      = link_to user_path(note.author) do
-        = image_tag avatar_icon(note.author_email), class: 'avatar s40', alt: ''
+      %a{href: user_path(note.author)}
+        %img.avatar.s40{src: avatar_icon(note.author), alt: ''}
    .timeline-content
      .note-header
        - if note_editable?(note)
@@ -25,7 +25,7 @@
          = '@' + note.author.username

        %span.note-last-update
-          = link_to "##{dom_id(note)}", name: dom_id(note), title: "Link here" do
+          %a{name: dom_id(note), href: "##{dom_id(note)}", title: 'Link here'}
            = time_ago_with_tooltip(note.created_at, placement: 'bottom', html_class: 'note_created_ago')
          - if note.updated_at != note.created_at
            %span

--- a/app/views/projects/project_members/_project_member.html.haml
+++ b/app/views/projects/project_members/_project_member.html.haml
@@ -4,7 +4,7 @@
 %li{class: "#{dom_class(member)} js-toggle-container project_member_row access-#{member.human_access.downcase}", id: dom_id(member)}
  %span.list-item-name
    - if member.user
-      = image_tag avatar_icon(user.email, 16), class: "avatar s16", alt: ''
+      = image_tag avatar_icon(user, 16), class: "avatar s16", alt: ''
      %strong
        = link_to user.name, user_path(user)
      %span.cgray= user.username

--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -9,8 +9,8 @@
 .row
  %section.col-md-7
    .header-with-avatar
-      = link_to avatar_icon(@user.email, 400), target: '_blank' do
-        = image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: ''
+      = link_to avatar_icon(@user, 400), target: '_blank' do
+        = image_tag avatar_icon(@user, 90), class: "avatar avatar-tile s90", alt: ''
      %h3
        = @user.name
        - if @user == current_user

--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -24,7 +24,7 @@ Gitlab::Application.configure do

  # Expands the lines which load the assets
  # config.assets.debug = true
-  
+
  # Adds additional error checking when serving assets at runtime.
  # Checks for improperly declared sprockets dependencies.
  # Raises helpful error messages.

--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -99,7 +99,29 @@ production: &base
  # For documentation on how to set this up, see http://doc.gitlab.com/ce/incoming_email/README.html
  incoming_email:
    enabled: false
-    address: "incoming+%{key}@gitlab.example.com"
+
+    # The email address including the `%{key}` placeholder that will be replaced to reference the item being replied to.
+    # The `%{key}` placeholder is added after the user part, after a `+` character, before the `@`.
+    address: "gitlab-incoming+%{key}@gmail.com"
+
+    # Email account username
+    # With third party providers, this is usually the full email address.
+    # With self-hosted email servers, this is usually the user part of the email address.
+    user: "gitlab-incoming@gmail.com"
+    # Email account password
+    password: "[REDACTED]"
+
+    # IMAP server host
+    host: "imap.gmail.com"
+    # IMAP server port
+    port: 993
+    # Whether the IMAP server uses SSL
+    ssl: true
+    # Whether the IMAP server uses StartTLS
+    start_tls: false
+
+    # The mailbox where incoming mail will end up. Usually "inbox".
+    mailbox: "inbox"

  ## Gravatar
  ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html

--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -187,7 +187,11 @@ Settings.gitlab_ci['builds_path']         = File.expand_path(Settings.gitlab_ci[
 # Reply by email
 #
 Settings['incoming_email'] ||= Settingslogic.new({})
-Settings.incoming_email['enabled'] = false if Settings.incoming_email['enabled'].nil?
+Settings.incoming_email['enabled']    = false if Settings.incoming_email['enabled'].nil?
+Settings.incoming_email['port']       = 143 if Settings.incoming_email['port'].nil?
+Settings.incoming_email['ssl']        = 143 if Settings.incoming_email['ssl'].nil?
+Settings.incoming_email['start_tls']  = 143 if Settings.incoming_email['start_tls'].nil?
+Settings.incoming_email['mailbox']    = "inbox" if Settings.incoming_email['mailbox'].nil?

 #
 # Gravatar

--- a/config/initializers/active_record_query_trace.rb
+++ b/config/initializers/active_record_query_trace.rb
+if ENV['ENABLE_QUERY_TRACE']
+  require 'active_record_query_trace'
+
+  ActiveRecordQueryTrace.enabled = 'true'
+end
--- a/config/initializers/bullet.rb
+++ b/config/initializers/bullet.rb
+if ENV['ENABLE_BULLET']
+  require 'bullet'
+
+  Bullet.enable  = true
+  Bullet.console = true
+end
--- a/config/initializers/rack_lineprof.rb
+++ b/config/initializers/rack_lineprof.rb
+# The default colors of rack-lineprof can be very hard to look at in terminals
+# with darker backgrounds. This patch tweaks the colors a bit so the output is
+# actually readable.
+if Rails.env.development? and RUBY_ENGINE == 'ruby' and ENV['ENABLE_LINEPROF']
+  Gitlab::Application.config.middleware.use(Rack::Lineprof)
+
+  module Rack
+    class Lineprof
+      class Sample < Rack::Lineprof::Sample.superclass
+        def format(*)
+          formatted = if level == CONTEXT
+                        sprintf "                 | % 3i  %s", line, code
+                      else
+                        sprintf "% 8.1fms %5i | % 3i  %s", ms, calls, line, code
+                      end
+
+          case level
+          when CRITICAL
+            color.red formatted
+          when WARNING
+            color.yellow formatted
+          when NOMINAL
+            color.white formatted
+          else # CONTEXT
+            formatted
+          end
+        end
+      end
+    end
+  end
+end
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
+:mailboxes:
+<%
+require_relative 'config/environment.rb'
+
+if Gitlab::IncomingEmail.enabled? 
+  config = Gitlab::IncomingEmail.config
+
+  redis_config_file = "config/resque.yml"
+  redis_url = 
+    if File.exists?(redis_config_file)
+      YAML.load_file(redis_config_file)[Rails.env]
+    else
+      "redis://localhost:6379"
+    end
+  %>
+  -
+    :host: <%= config.host.to_json %>
+    :port: <%= config.port.to_json %>
+    :ssl: <%= config.ssl.to_json %>
+    :start_tls: <%= config.start_tls.to_json %>
+    :email: <%= config.user.to_json %>
+    :password: <%= config.password.to_json %>
+
+    :name: <%= config.mailbox.to_json %>
+
+    :delete_after_delivery: true
+
+    :delivery_method: sidekiq
+    :delivery_options:
+      :redis_url: <%= redis_url.to_json %>
+      :namespace: resque:gitlab
+      :queue: incoming_email
+      :worker: EmailReceiverWorker
+
+    :arbitration_method: redis
+    :arbitration_options:
+      :redis_url: <%= redis_url.to_json %>
+      :namespace: mail_room:gitlab
+<% end %>
--- a/config/mail_room.yml.example
+++ b/config/mail_room.yml.example
-:mailboxes:
-  -
-    # # IMAP server host
-    # :host: "imap.gmail.com"
-    # # IMAP server port
-    # :port: 993
-    # # Whether the IMAP server uses SSL
-    # :ssl: true
-    # # Whether the IMAP server uses StartTLS
-    # :start_tls: false
-    # # Email account username. Usually the full email address.
-    # :email: "gitlab-incoming@gmail.com"
-    # # Email account password
-    # :password: "password"
-
-    # # The name of the mailbox where incoming mail will end up. Usually "inbox".
-    # :name: "inbox"
-
-    # # Always "sidekiq".
-    # :delivery_method: sidekiq
-    # # Always true.
-    # :delete_after_delivery: true
-    # :delivery_options:
-    #   # The URL to the Redis server used by Sidekiq. Should match the URL in config/resque.yml.
-    #   :redis_url: redis://localhost:6379
-    #   # Always "resque:gitlab".
-    #   :namespace: resque:gitlab
-    #   # Always "incoming_email".
-    #   :queue: incoming_email
-    #   # Always "EmailReceiverWorker".
-    #   :worker: EmailReceiverWorker
-
-    # # Always "redis".
-    # :arbitration_method: redis
-    # :arbitration_options:
-    #   # The URL to the Redis server. Should match the URL in config/resque.yml.
-    #   :redis_url: redis://localhost:6379
-    #   # Always "mail_room:gitlab".
-    #   :namespace: mail_room:gitlab
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -543,8 +543,10 @@ Gitlab::Application.routes.draw do
          member do
            # tree viewer logs
            get 'logs_tree', constraints: { id: Gitlab::Regex.git_reference_regex }
+            # Directories with leading dots erroneously get rejected if git
+            # ref regex used in constraints. Regex verification now done in controller.
            get 'logs_tree/*path' => 'refs#logs_tree', as: :logs_file, constraints: {
-              id: Gitlab::Regex.git_reference_regex,
+              id: /.*/,
              path: /.*/
            }
          end
@@ -585,7 +587,11 @@ Gitlab::Application.routes.draw do
          end
        end

-        resources :builds, only: [:show] do
+        resources :builds, only: [:index, :show] do
+          collection do
+            get :cancel_all
+          end
+
          member do
            get :cancel
            get :status

--- a/db/migrate/20151008110232_add_users_lower_username_email_indexes.rb
+++ b/db/migrate/20151008110232_add_users_lower_username_email_indexes.rb
+class AddUsersLowerUsernameEmailIndexes < ActiveRecord::Migration
+  disable_ddl_transaction!
+
+  def up
+    return unless Gitlab::Database.postgresql?
+
+    execute 'CREATE INDEX CONCURRENTLY index_on_users_lower_username ON users (LOWER(username));'
+    execute 'CREATE INDEX CONCURRENTLY index_on_users_lower_email ON users (LOWER(email));'
+  end
+
+  def down
+    return unless Gitlab::Database.postgresql?
+
+    remove_index :users, :index_on_users_lower_username
+    remove_index :users, :index_on_users_lower_email
+  end
+end
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -140,6 +140,7 @@ job_name:
 | except        | optional | Defines a list of git refs for which build is not created |
 | tags          | optional | Defines a list of tags which are used to select runner |
 | allow_failure | optional | Allow build to fail. Failed build doesn't contribute to commit status |
+| when          | optional | Define when to run build. Can be `on_success`, `on_failure` or `always` |

 ### script
 `script` is a shell script which is executed by runner. The shell script is prepended with `before_script`.
@@ -196,9 +197,58 @@ job:

 The above specification will make sure that `job` is built by a runner that have `ruby` AND `postgres` tags defined.

+### when
+`when` is used to implement jobs that are run in case of failure or despite the failure.
+
+`when` can be set to one of the following values:
+
+1. `on_success` - execute build only when all builds from prior stages succeeded. This is the default.
+1. `on_failure` - execute build only when at least one build from prior stages failed.
+1. `always` - execute build despite the status of builds from prior stages.
+
+```
+stages:
+- build
+- cleanup_build
+- test
+- deploy
+- cleanup
+
+build:
+  stage: build
+  script:
+  - make build
+
+cleanup_build:
+  stage: cleanup_build
+  script:
+  - cleanup build when failed
+  when: on_failure
+
+test:
+  stage: test
+  script:
+  - make test
+
+deploy:
+  stage: deploy
+  script:
+  - make deploy
+
+cleanup:
+  stage: cleanup
+  script:
+  - cleanup after builds
+  when: always
+```
+
+The above script will:
+1. Execute `cleanup_build` only when the `build` failed,
+2. Always execute `cleanup` as the last step in pipeline.
+
 ## Validate the .gitlab-ci.yml
 Each instance of GitLab CI has an embedded debug tool called Lint.
 You can find the link to the Lint in the project's settings page or use short url `/lint`.

 ## Skipping builds
-There is one more way to skip all builds, if your commit message contains tag [ci skip]. In this case, commit will be created but builds will be skipped
\ No newline at end of file
+There is one more way to skip all builds, if your commit message contains tag [ci skip]. In this case, commit will be created but builds will be skipped
--- a/doc/development/profiling.md
+++ b/doc/development/profiling.md
+# Profiling
+
+To make it easier to track down performance problems GitLab comes with a set of
+profiling tools, some of these are available by default while others need to be
+explicitly enabled.
+
+## rack-mini-profiler
+
+This Gem is enabled by default in development only. It allows you to see the
+timings of the various components that made up a web request (e.g. the SQL
+queries executed and their execution timings).
+
+## Bullet
+
+Bullet is a Gem that can be used to track down N+1 query problems. Because
+Bullet adds quite a bit of logging noise it's disabled by default. To enable
+Bullet, set the environment variable `ENABLE_BULLET` to a non-empty value before
+starting GitLab. For example:
+
+    ENABLE_BULLET=true bundle exec rails s
+
+Bullet will log query problems to both the Rails log as well as the Chrome
+console.
+
+## ActiveRecord Query Trace
+
+This Gem adds backtraces for every ActiveRecord query in the Rails console. This
+can be useful to track down where a query was executed. Because this Gem adds
+quite a bit of noise (5-10 extra lines per ActiveRecord query) it's disabled by
+default. To use this Gem you'll need to set `ENABLE_QUERY_TRACE` to a non empty
+file before starting GitLab. For example:
+
+    ENABLE_QUERY_TRACE=true bundle exec rails s
+
+## rack-lineprof
+
+This is a Gem that can trace the execution time of code on a per line basis.
+Because this Gem can add quite a bit of overhead it's disabled by default. To
+enable it, set the environment variable `ENABLE_LINEPROF` to a non-empty value.
+For example:
+
+    ENABLE_LINEPROF=true bundle exec rails s
+
+Once enabled you'll need to add a query string parameter to a request to
+actually profile code execution. The name of the parameter is `lineprof` and
+should be set to a regular expression (minus the starting/ending slash) used to
+select what files to profile. To profile all files containing "foo" somewhere in
+the path you'd use the following parameter:
+
+    ?lineprof=foo
+
+Or when filtering for files containing "foo" and "bar" in their path:
+
+    ?lineprof=foo|bar
+
+Once set the profiling output will be displayed in your terminal.
--- a/doc/incoming_email/README.md
+++ b/doc/incoming_email/README.md
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -211,9 +211,9 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da
 ### Clone the Source

    # Clone GitLab repository
-    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-0-stable gitlab
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-1-stable gitlab

-**Note:** You can change `8-0-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+**Note:** You can change `8-1-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!

 ### Configure It


--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -16,7 +16,7 @@ You need to keep a separate copy of `/etc/gitlab/gitlab-secrets.json`
 from source). This file contains the database encryption key used
 for two-factor authentication. If you restore a GitLab backup without
 restoring the database encryption key, users who have two-factor
-authentication enabled will loose access to your GitLab server.
+authentication enabled will lose access to your GitLab server.

 If you are interested in GitLab CI backup please follow to the [CI backup documentation](https://gitlab.com/gitlab-org/gitlab-ci/blob/master/doc/raketasks/backup_restore.md)*


--- a/doc/update/8.0-to-8.1.md
+++ b/doc/update/8.0-to-8.1.md
+# From 8.0 to 8.1
+
+**NOTE:** GitLab 8.0 introduced several significant changes related to
+installation and configuration which *are not duplicated here*. Be sure you're
+already running a working version of 8.0 before proceeding with this guide.
+
+### 0. Double-check your Git version
+
+**This notice applies only to /usr/local/bin/git**
+
+If you compiled Git from source on your GitLab server then please double-check
+that you are using a version that protects against CVE-2014-9390. For six
+months after this vulnerability became known the GitLab installation guide
+still contained instructions that would install the outdated, 'vulnerable' Git
+version 2.1.2.
+
+Run the following command to get your current Git version:
+
+```sh
+/usr/local/bin/git --version
+```
+
+If you see 'No such file or directory' then you did not install Git according
+to the outdated instructions from the GitLab installation guide and you can go
+to the next step 'Stop server' below.
+
+If you see a version string then it should be v1.8.5.6, v1.9.5, v2.0.5, v2.1.4,
+v2.2.1 or newer. You can use the [instructions in the GitLab source
+installation
+guide](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#1-packages-dependencies)
+to install a newer version of Git.
+
+### 1. Stop server
+
+    sudo service gitlab stop
+
+### 2. Backup
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
+
+### 3. Get latest code
+
+```bash
+sudo -u git -H git fetch --all
+sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically
+```
+
+For GitLab Community Edition:
+
+```bash
+sudo -u git -H git checkout 8-1-stable
+```
+
+OR
+
+For GitLab Enterprise Edition:
+
+```bash
+sudo -u git -H git checkout 8-1-stable-ee
+```
+
+### 4. Update gitlab-shell
+
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch
+sudo -u git -H git checkout v2.6.5
+```
+
+### 5. Install libs, migrations, etc.
+
+```bash
+cd /home/git/gitlab
+
+# MySQL installations (note: the line below states '--without postgres')
+sudo -u git -H bundle install --without postgres development test --deployment
+
+# PostgreSQL installations (note: the line below states '--without mysql')
+sudo -u git -H bundle install --without mysql development test --deployment
+
+# Run database migrations
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+
+# Clean up assets and cache
+sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
+
+# Update init.d script
+sudo cp lib/support/init.d/gitlab /etc/init.d/gitlab
+```
+
+### 6. Update configuration files
+
+#### New configuration options for `gitlab.yml`
+
+There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them manually to your current `gitlab.yml`:
+
+```sh
+git diff origin/8-0-stable:config/gitlab.yml.example origin/8-1-stable:config/gitlab.yml.example
+```
+
+### 7. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 8. Check application status
+
+Check if GitLab and its environment are configured correctly:
+
+    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
+
+To make sure you didn't miss anything run a more thorough check:
+
+    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
+
+If all items are green, then congratulations, the upgrade is complete!
+
+## Things went south? Revert to previous version (8.0)
+
+### 1. Revert the code to the previous version
+
+Follow the [upgrade guide from 7.14 to 8.0](7.14-to-8.0.md), except for the database migration
+(The backup is already migrated to the previous version)
+
+### 2. Restore from the backup
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
+```
+
+If you have more than one backup `*.tar` file(s) please add `BACKUP=timestamp_of_backup` to the command above.
+
+## Troubleshooting
+
+### "You appear to have cloned an empty repository."
+
+See the [7.14 to 8.0 update guide](7.14-to-8.0.md#troubleshooting).
--- a/features/project/source/browse_files.feature
+++ b/features/project/source/browse_files.feature
@@ -205,3 +205,9 @@ Feature: Project Source Browse Files
    And I see the ref 'test' has been selected
    And I visit the 'test' tree
    Then I see the commit data
+
+  @javascript
+  Scenario: I browse code with a leading dot in the directory
+    Given I switch ref to fix
+    And I visit the fix tree
+    Then I see the commit data for a directory with a leading dot
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -113,7 +113,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
  end

  step 'I click status link' do
-    click_link "Builds"
+    find('.commit-ci-menu').click_link "Builds"
  end

  step 'I see builds list' do

--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
@@ -286,6 +286,10 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
    select "'test'", from: 'ref'
  end

+  step "I switch ref to fix" do
+    select "fix", from: 'ref'
+  end
+
  step "I see the ref 'test' has been selected" do
    expect(page).to have_selector '.select2-chosen', text: "'test'"
  end
@@ -294,11 +298,20 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
    visit namespace_project_tree_path(@project.namespace, @project, "'test'")
  end

+  step "I visit the fix tree" do
+    visit namespace_project_tree_path(@project.namespace, @project, "fix/.testdir")
+  end
+
  step 'I see the commit data' do
    expect(page).to have_css('.tree-commit-link', visible: true)
    expect(page).not_to have_content('Loading commit data...')
  end

+  step 'I see the commit data for a directory with a leading dot' do
+    expect(page).to have_css('.tree-commit-link', visible: true)
+    expect(page).not_to have_content('Loading commit data...')
+  end
+
  private

  def set_new_content

--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -249,8 +249,16 @@ module API
        required_attributes! [:note]

        merge_request = user_project.merge_requests.find(params[:merge_request_id])
-        note = merge_request.notes.new(note: params[:note], project_id: user_project.id)
-        note.author = current_user
+
+        authorize! :create_note, merge_request
+
+        opts = {
+          note: params[:note],
+          noteable_type: 'MergeRequest',
+          noteable_id: merge_request.id
+        }
+
+        note = ::Notes::CreateService.new(user_project, current_user, opts).execute

        if note.save
          present note, with: Entities::MRNote

--- a/lib/api/repositories.rb
+++ b/lib/api/repositories.rb
@@ -133,7 +133,7 @@ module API
        authorize! :download_code, user_project

        begin
-          file_path = ArchiveRepositoryService.new(
+          ArchiveRepositoryService.new(
            user_project,
            params[:sha],
            params[:format]
@@ -141,17 +141,6 @@ module API
        rescue
          not_found!('File')
        end
-
-        if file_path && File.exists?(file_path)
-          data = File.open(file_path, 'rb').read
-          basename = File.basename(file_path)
-          header['Content-Disposition'] = "attachment; filename=\"#{basename}\""
-          content_type MIME::Types.type_for(file_path).first.content_type
-          env['api.format'] = :binary
-          present data
-        else
-          redirect request.fullpath
-        end
      end

      # Compare two branches, tags or commits

--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -5,7 +5,7 @@ module Ci
    DEFAULT_STAGES = %w(build test deploy)
    DEFAULT_STAGE = 'test'
    ALLOWED_YAML_KEYS = [:before_script, :image, :services, :types, :stages, :variables]
-    ALLOWED_JOB_KEYS = [:tags, :script, :only, :except, :type, :image, :services, :allow_failure, :type, :stage]
+    ALLOWED_JOB_KEYS = [:tags, :script, :only, :except, :type, :image, :services, :allow_failure, :type, :stage, :when]

    attr_reader :before_script, :image, :services, :variables

@@ -93,6 +93,7 @@ module Ci
        only: job[:only],
        except: job[:except],
        allow_failure: job[:allow_failure] || false,
+        when: job[:when] || 'on_success',
        options: {
          image: job[:image] || @image,
          services: job[:services] || @services
@@ -184,6 +185,10 @@ module Ci
      if job[:allow_failure] && !job[:allow_failure].in?([true, false])
        raise ValidationError, "#{name}: allow_failure parameter should be an boolean"
      end
+
+      if job[:when] && !job[:when].in?(%w(on_success on_failure always))
+        raise ValidationError, "#{name}: when parameter should be on_success, on_failure or always"
+      end
    end

    private

--- a/lib/ci/status.rb
+++ b/lib/ci/status.rb
+module Ci
+  class Status
+    def self.get_status(statuses)
+      statuses.reject! { |status| status.try(&:allow_failure?) }
+
+      if statuses.none?
+        'skipped'
+      elsif statuses.all?(&:success?)
+        'success'
+      elsif statuses.all?(&:pending?)
+        'pending'
+      elsif statuses.any?(&:running?) || statuses.any?(&:pending?)
+        'running'
+      elsif statuses.all?(&:canceled?)
+        'canceled'
+      else
+        'failed'
+      end
+    end
+  end
+end
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -193,7 +193,14 @@ module Grack
    end

    def render_grack_auth_ok
-      [200, { "Content-Type" => "application/json" }, [JSON.dump({ 'GL_ID' => Gitlab::ShellEnv.gl_id(@user) })]]
+      [
+        200,
+        { "Content-Type" => "application/json" },
+        [JSON.dump({
+          'GL_ID' => Gitlab::ShellEnv.gl_id(@user),
+          'RepoPath' => project.repository.path_to_repo,
+        })]
+      ]
    end

    def render_not_found

--- a/lib/gitlab/incoming_email.rb
+++ b/lib/gitlab/incoming_email.rb
@@ -24,12 +24,12 @@ module Gitlab
        match[1]
      end

-      private
-
      def config
        Gitlab.config.incoming_email
      end

+      private
+
      def address_regex
        wildcard_address = config.address
        return nil unless wildcard_address

--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -113,7 +113,25 @@ server {
    proxy_pass http://gitlab;
  }

-  location ~ [-\/\w\.]+\.git\/ {
+  location ~ ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$ {
+    # 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
+    error_page 418 = @gitlab-git-http-server;
+    return 418;
+  }
+
+  location ~ ^/[\w\.-]+/[\w\.-]+/repository/archive {
+    # 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
+    error_page 418 = @gitlab-git-http-server;
+    return 418;
+  }
+
+  location ~ ^/api/v3/projects/.*/repository/archive {
+    # 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
+    error_page 418 = @gitlab-git-http-server;
+    return 418;
+  }
+
+  location @gitlab-git-http-server {
    ## If you use HTTPS make sure you disable gzip compression
    ## to be safe against BREACH attack.
    # gzip off;

--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -160,7 +160,25 @@ server {
    proxy_pass http://gitlab;
  }

-  location ~ [-\/\w\.]+\.git\/ {
+  location ~ ^/[\w\.-]+/[\w\.-]+/(info/refs|git-upload-pack|git-receive-pack)$ {
+    # 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
+    error_page 418 = @gitlab-git-http-server;
+    return 418;
+  }
+
+  location ~ ^/[\w\.-]+/[\w\.-]+/repository/archive {
+    # 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
+    error_page 418 = @gitlab-git-http-server;
+    return 418;
+  }
+
+  location ~ ^/api/v3/projects/.*/repository/archive {
+    # 'Error' 418 is a hack to re-use the @gitlab-git-http-server block
+    error_page 418 = @gitlab-git-http-server;
+    return 418;
+  }
+
+  location @gitlab-git-http-server {
    ## If you use HTTPS make sure you disable gzip compression
    ## to be safe against BREACH attack.
    gzip off;

--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -642,7 +642,6 @@ namespace :gitlab do

      if Gitlab.config.incoming_email.enabled
        check_address_formatted_correctly
-        check_mail_room_config_exists
        check_imap_authentication

        if Rails.env.production?
@@ -744,42 +743,16 @@ namespace :gitlab do
      end
    end

-    def check_mail_room_config_exists
-      print "MailRoom config exists? ... "
-
-      mail_room_config_file = Rails.root.join("config", "mail_room.yml")
-
-      if File.exists?(mail_room_config_file)
-        puts "yes".green
-      else
-        puts "no".red
-        try_fixing_it(
-          "Copy config/mail_room.yml.example to config/mail_room.yml",
-          "Check that the information in config/mail_room.yml is correct"
-        )
-        for_more_information(
-          "doc/incoming_email/README.md"
-        )
-        fix_and_rerun
-      end
-    end
-
    def check_imap_authentication
      print "IMAP server credentials are correct? ... "

-      mail_room_config_file = Rails.root.join("config", "mail_room.yml")
-
-      unless File.exists?(mail_room_config_file)
-        puts "can't check because of previous errors".magenta
-        return
-      end
-
-      config = YAML.load_file(mail_room_config_file)[:mailboxes].first rescue nil
+      config = Gitlab.config.incoming_email

      if config
        begin
-          imap = Net::IMAP.new(config[:host], port: config[:port], ssl: config[:ssl])
-          imap.login(config[:email], config[:password])
+          imap = Net::IMAP.new(config.host, port: config.port, ssl: config.ssl)
+          imap.starttls if config.start_tls
+          imap.login(config.user, config.password)
          connected = true
        rescue
          connected = false
@@ -791,7 +764,7 @@ namespace :gitlab do
      else
        puts "no".red
        try_fixing_it(
-          "Check that the information in config/mail_room.yml is correct"
+          "Check that the information in config/gitlab.yml is correct"
        )
        for_more_information(
          "doc/incoming_email/README.md"

--- a/lib/tasks/migrate/setup_postgresql.rake
+++ b/lib/tasks/migrate/setup_postgresql.rake
 require Rails.root.join('db/migrate/20151007120511_namespaces_projects_path_lower_indexes')
+require Rails.root.join('db/migrate/20151008110232_add_users_lower_username_email_indexes')

 desc 'GitLab | Sets up PostgreSQL'
 task setup_postgresql: :environment do
  NamespacesProjectsPathLowerIndexes.new.up
+  AddUsersLowerUsernameEmailIndexes.new.up
 end
--- a/spec/benchmarks/models/project_team_spec.rb
+++ b/spec/benchmarks/models/project_team_spec.rb
+require 'spec_helper'
+
+describe ProjectTeam, benchmark: true do
+  describe '#max_member_access' do
+    let(:group)   { create(:group) }
+    let(:project) { create(:empty_project, group: group) }
+    let(:user)    { create(:user) }
+
+    before do
+      project.team << [user, :master]
+
+      5.times do
+        project.team << [create(:user), :reporter]
+
+        project.group.add_user(create(:user), :reporter)
+      end
+    end
+
+    benchmark_subject { project.team.max_member_access(user.id) }
+
+    it { is_expected.to iterate_per_second(35000) }
+  end
+end
--- a/spec/benchmarks/models/user_spec.rb
+++ b/spec/benchmarks/models/user_spec.rb
@@ -11,7 +11,9 @@ describe User, benchmark: true do
      end
    end

-    let(:iterations) { 1000 }
+    # The iteration count is based on the query taking little over 1 ms when
+    # using PostgreSQL.
+    let(:iterations) { 900 }

    describe 'using a capitalized username' do
      benchmark_subject { User.by_login('Alice') }

--- a/spec/controllers/projects/repositories_controller_spec.rb
+++ b/spec/controllers/projects/repositories_controller_spec.rb
@@ -33,33 +33,5 @@ describe Projects::RepositoriesController do
        expect(response.status).to eq(404)
      end
    end
-
-    context "when the service doesn't return a path" do
-
-      before do
-        allow(service).to receive(:execute).and_return(nil)
-      end
-
-      it "reloads the page" do
-        get :archive, namespace_id: project.namespace.path, project_id: project.path, ref: "master", format: "zip"
-
-        expect(response).to redirect_to(archive_namespace_project_repository_path(project.namespace, project, ref: "master", format: "zip"))
-      end
-    end
-
-    context "when the service returns a path" do
-
-      let(:path) { Rails.root.join("spec/fixtures/dk.png").to_s }
-
-      before do
-        allow(service).to receive(:execute).and_return(path)
-      end
-
-      it "sends the file" do
-        get :archive, namespace_id: project.namespace.path, project_id: project.path, ref: "master", format: "zip"
-
-        expect(response.body).to eq(File.binread(path))
-      end
-    end
  end
 end
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -9,6 +9,54 @@ describe "Builds" do
    @gl_project.team << [@user, :master]
  end

+  describe "GET /:project/builds" do
+    context "Running scope" do
+      before do
+        @build.run!
+        visit namespace_project_builds_path(@gl_project.namespace, @gl_project)
+      end
+
+      it { expect(page).to have_content 'Running' }
+      it { expect(page).to have_content 'Cancel all' }
+      it { expect(page).to have_content @build.short_sha }
+      it { expect(page).to have_content @build.ref }
+      it { expect(page).to have_content @build.name }
+    end
+
+    context "Finished scope" do
+      before do
+        @build.run!
+        visit namespace_project_builds_path(@gl_project.namespace, @gl_project, scope: :finished)
+      end
+
+      it { expect(page).to have_content 'No builds to show' }
+      it { expect(page).to have_content 'Cancel all' }
+    end
+
+    context "All builds" do
+      before do
+        @gl_project.ci_builds.running_or_pending.each(&:success)
+        visit namespace_project_builds_path(@gl_project.namespace, @gl_project, scope: :all)
+      end
+
+      it { expect(page).to have_content 'All' }
+      it { expect(page).to have_content @build.short_sha }
+      it { expect(page).to have_content @build.ref }
+      it { expect(page).to have_content @build.name }
+      it { expect(page).to_not have_content 'Cancel all' }
+    end
+  end
+
+  describe "GET /:project/builds/:id/cancel_all" do
+    before do
+      @build.run!
+      visit cancel_all_namespace_project_builds_path(@gl_project.namespace, @gl_project)
+    end
+
+    it { expect(page).to have_content 'No builds to show' }
+    it { expect(page).to_not have_content 'Cancel all' }
+  end
+
  describe "GET /:project/builds/:id" do
    before do
      visit namespace_project_build_path(@gl_project.namespace, @gl_project, @build)

--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -99,6 +99,15 @@ describe ApplicationHelper do

      helper.avatar_icon('foo@example.com', 20)
    end
+
+    describe 'using a User' do
+      it 'should return an URL for the avatar' do
+        user = create(:user, avatar: File.open(avatar_file_path))
+
+        expect(helper.avatar_icon(user).to_s).
+          to match("/uploads/user/avatar/#{user.id}/banana_sample.gif")
+      end
+    end
  end

  describe 'gravatar_icon' do

--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
--- a/spec/models/ci/project_spec.rb
+++ b/spec/models/ci/project_spec.rb
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
--- a/spec/models/project_services/bamboo_service_spec.rb
+++ b/spec/models/project_services/bamboo_service_spec.rb
--- a/spec/models/project_services/teamcity_service_spec.rb
+++ b/spec/models/project_services/teamcity_service_spec.rb
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
--- a/spec/services/archive_repository_service_spec.rb
+++ b/spec/services/archive_repository_service_spec.rb
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
--- a/spec/workers/repository_archive_worker_spec.rb
+++ b/spec/workers/repository_archive_worker_spec.rb