Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee

f20f7b7b · Sytse Sijbrandij · 47980145 · baee27cb · f20f7b7b · f20f7b7b
Commit f20f7b7b authored Mar 14, 2016 by Sytse Sijbrandij
618 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@
 .sass-cache/
 .secret
 .vagrant
+.byebug_history
 Vagrantfile
 backups/*
 config/aws.yml
@@ -23,6 +24,7 @@ config/gitlab.yml
 config/gitlab_ci.yml
 config/initializers/rack_attack.rb
 config/initializers/smtp_settings.rb
+config/initializers/relative_url.rb
 config/resque.yml
 config/unicorn.rb
 config/secrets.yml

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ image: "ruby:2.1"

 services:
  - mysql:latest
+  - postgres:latest
  - redis:latest
  - elasticsearch:latest

@@ -12,17 +13,20 @@ cache:

 variables:
  MYSQL_ALLOW_EMPTY_PASSWORD: "1"
+  # retry tests only in CI environment
+  RSPEC_RETRY_RETRY_COUNT: "3"
  ELASTIC_HOST: "elasticsearch"

+
 before_script:
  - source ./scripts/prepare_build.sh
  - ruby -v
  - which ruby
-  - gem install bundler --no-ri --no-rdoc
+  - retry gem install bundler --no-ri --no-rdoc
  - cp config/gitlab.yml.example config/gitlab.yml
  - touch log/application.log
  - touch log/test.log
-  - bundle install --without postgres production --jobs $(nproc)  "${FLAGS[@]}"
+  - retry bundle install --without postgres production --jobs $(nproc) "${FLAGS[@]}"
  - RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load db:migrate

 stages:
@@ -70,15 +74,6 @@ spec:services:
    - ruby
    - mysql

-spec:benchmark:
-  stage: test
-  script:
-    - RAILS_ENV=test bundle exec rake spec:benchmark
-  tags:
-    - ruby
-    - mysql
-  allow_failure: true
-
 spec:other:
  stage: test
  script:
@@ -242,22 +237,6 @@ spec:services:ruby22:
    - ruby
    - mysql

-spec:benchmark:ruby22:
-  stage: test
-  image: ruby:2.2
-  only:
-  - master
-  script:
-    - RAILS_ENV=test bundle exec rake spec:benchmark
-  cache:
-    key: "ruby22"
-    paths:
-    - vendor
-  tags:
-    - ruby
-    - mysql
-  allow_failure: true
-
 spec:other:ruby22:
  stage: test
  image: ruby:2.2

--- a/CHANGELOG
+++ b/CHANGELOG
--- a/CHANGELOG-EE
+++ b/CHANGELOG-EE
@@ -7,6 +7,21 @@ v 8.6.0 (unreleased)
  - [Elastic] Removing repository and wiki index after removing project
  - [Elastic] Update index on push to wiki
  - [Elastic] Use subprocesses for ElasticSearch index jobs
+  - [Elastic] More accurate as_indexed_json (More stable database indexer)
+  - [Elastic] Fix: Don't index newly created system messages and awards
+  - [Elastic] Fixed exception on branch removing
+
+v 8.5.5
+  - GitLab Geo: Repository synchronization between primary and secondary nodes
+  - Add documentation for GitLab Pages
+  - Fix importing projects from GitHub Enterprise Edition
+  - Fix syntax error in init file
+  - Only show group member roles if explicitly requested
+  - GitLab Geo: Improve GeoNodes Admin screen
+  - GitLab Geo: Avoid locking yourself out when adding a GeoNode
+
+v 8.5.4
+  - [Elastic][Security] Notes exposure

 v 8.5.3
  - Prevent LDAP from downgrading a group's last owner
@@ -15,6 +30,8 @@ v 8.5.3
 v 8.5.2
  - Update LDAP groups asynchronously
  - Fix an issue when weight text was displayed in Issuable collapsed sidebar
+v 8.5.2
+  - Fix importing projects from GitHub Enterprise Edition.

 v 8.5.1
  - Fix adding pages domain to projects in groups

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,6 +8,9 @@
    - [Closing policy for issues and merge requests](#closing-policy-for-issues-and-merge-requests)
    - [Helping others](#helping-others)
    - [I want to contribute!](#i-want-to-contribute)
+    - [Implement design & UI elements](#implement-design-ui-elements)
+        - [Design reference](#design-reference)
+        - [UI development kit](#ui-development-kit)
    - [Issue tracker](#issue-tracker)
        - [Feature proposals](#feature-proposals)
        - [Issue tracker guidelines](#issue-tracker-guidelines)
@@ -83,6 +86,22 @@ GitLab.

 This was inspired by [an article by Kent C. Dodds][medium-up-for-grabs].

+## Implement design & UI elements
+
+### Design reference
+
+The GitLab design reference can be found in the [gitlab-design] project.
+The designs are made using Antetype (`.atype` files). You can use the
+[free Antetype viewer (Mac OSX only)] or grab an exported PNG from the design
+(the PNG is 1:1).
+
+The current designs can be found in the [`gitlab1.atype` file].
+
+### UI development kit
+
+Implemented UI elements can also be found at https://gitlab.com/help/ui. Please
+note that this page isn't comprehensive at this time.
+
 ## Issue tracker

 To get support for your particular problem please use the
@@ -299,13 +318,14 @@ to us than having a minimal commit log. The smaller an MR is the more likely it
 is it will be merged (quickly). After that you can send more MRs to enhance it.

 For examples of feedback on merge requests please look at already
-[closed merge requests][closed-merge-requests]. If you would like quick feedback on your merge
-request feel free to mention one of the Merge Marshalls of the [core team][core-team].
+[closed merge requests][closed-merge-requests]. If you would like quick feedback
+on your merge request feel free to mention one of the Merge Marshalls in the
+[core team][core-team] or one of the
+[Merge request coaches](https://about.gitlab.com/team/).
 Please ensure that your merge request meets the contribution acceptance criteria.

 When having your code reviewed and when reviewing merge requests please take the
-[thoughtbot code review guidelines](https://github.com/thoughtbot/guides/tree/master/code-review)
-into account.
+[Thoughtbot code review guide] into account.

 ### Merge request description format

@@ -343,7 +363,8 @@ description area. Copy-paste it to retain the markdown format.
   to a new table or remove an old table) to aid retrying on failure
 1. Keeps the GitLab code base clean and well structured
 1. Contains functionality we think other users will benefit from too
-1. Doesn't add configuration options since they complicate future changes
+1. Doesn't add configuration options or settings options since they complicate
+   making and testing future changes
 1. Changes after submitting the merge request should be in separate commits
   (no squashing). If necessary, you will be asked to squash when the review is
   over, before merging.
@@ -473,3 +494,7 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor
 [rss-source]: https://github.com/bbatsov/ruby-style-guide/blob/master/README.md#source-code-layout
 [rss-naming]: https://github.com/bbatsov/ruby-style-guide/blob/master/README.md#naming
 [doc-styleguide]: doc/development/doc_styleguide.md "Documentation styleguide"
+[gitlab-design]: https://gitlab.com/gitlab-org/gitlab-design
+[free Antetype viewer (Mac OSX only)]: https://itunes.apple.com/us/app/antetype-viewer/id824152298?mt=12
+[`gitlab1.atype` file]: https://gitlab.com/gitlab-org/gitlab-design/tree/master/gitlab1.atype/
+[Thoughtbot code review guide]: https://github.com/thoughtbot/guides/tree/master/code-review
--- a/GITLAB_SHELL_VERSION
+++ b/GITLAB_SHELL_VERSION
-2.6.10
+2.6.11
--- a/Gemfile
+++ b/Gemfile
@@ -6,9 +6,9 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
 # Responders respond_to and respond_with
 gem 'responders', '~> 2.0'

-# Specify a sprockets version due to security issue
-# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
-gem 'sprockets', '~> 2.12.3'
+# Specify a sprockets version due to increased performance
+# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
+gem 'sprockets', '~> 3.3.5'

 # Default values for AR models
 gem "default_value_for", "~> 3.0.0"
@@ -30,7 +30,7 @@ gem 'omniauth-github',        '~> 1.1.1'
 gem 'omniauth-gitlab',        '~> 1.0.0'
 gem 'omniauth-google-oauth2', '~> 0.2.0'
 gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
-gem 'omniauth-saml',          '~> 1.4.2'
+gem 'omniauth-saml',          '~> 1.5.0'
 gem 'omniauth-shibboleth',    '~> 1.2.0'
 gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd',         '~> 2.2.0'
@@ -54,7 +54,7 @@ gem "browser", '~> 1.0.0'

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

 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
@@ -80,7 +80,7 @@ gem "kaminari", "~> 0.16.3"
 gem "haml-rails", '~> 0.9.0'

 # Files attachments
-gem "carrierwave", '~> 0.9.0'
+gem "carrierwave", '~> 0.10.0'

 # Image editing
 gem "mini_magick", '~> 4.4.0'
@@ -271,9 +271,11 @@ group :development, :test do
  gem 'fuubar', '~> 2.0.0'

  gem 'database_cleaner',   '~> 1.4.0'
-  gem 'factory_girl_rails', '~> 4.3.0'
+  gem 'factory_girl_rails', '~> 4.6.0'
  gem 'rspec-rails',        '~> 3.3.0'
+  gem 'rspec-retry'
  gem 'spinach-rails',      '~> 0.2.1'
+  gem 'spinach-rerun-reporter', '~> 0.0.2'

  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
  gem 'minitest', '~> 5.7.0'
@@ -283,12 +285,12 @@ group :development, :test do

  gem 'capybara',            '~> 2.4.0'
  gem 'capybara-screenshot', '~> 1.0.0'
-  gem 'poltergeist',         '~> 1.8.1'
+  gem 'poltergeist',         '~> 1.9.0'

  gem 'teaspoon', '~> 1.0.0'
  gem 'teaspoon-jasmine', '~> 2.2.0'

-  gem 'spring', '~> 1.3.6'
+  gem 'spring', '~> 1.6.4'
  gem 'spring-commands-rspec',    '~> 1.0.4'
  gem 'spring-commands-spinach',  '~> 1.0.0'
  gem 'spring-commands-teaspoon', '~> 0.0.2'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,10 +117,11 @@ GEM
    capybara-screenshot (1.0.11)
      capybara (>= 1.0, < 3)
      launchy
-    carrierwave (0.9.0)
+    carrierwave (0.10.0)
      activemodel (>= 3.2.0)
      activesupport (>= 3.2.0)
      json (>= 1.7)
+      mime-types (>= 1.16)
    cause (0.1)
    charlock_holmes (0.7.3)
    chunky_png (1.3.5)
@@ -207,10 +208,10 @@ GEM
    excon (0.45.4)
    execjs (2.6.0)
    expression_parser (0.9.0)
-    factory_girl (4.3.0)
+    factory_girl (4.5.0)
      activesupport (>= 3.0.0)
-    factory_girl_rails (4.3.0)
-      factory_girl (~> 4.3.0)
+    factory_girl_rails (4.6.0)
+      factory_girl (~> 4.5.0)
      railties (>= 3.0.0)
    faraday (0.9.2)
      multipart-post (>= 1.2, < 3)
@@ -379,7 +380,7 @@ GEM
    gitlab-license (0.0.4)
    gitlab_emoji (0.3.1)
      gemojione (~> 2.2, >= 2.2.1)
-    gitlab_git (8.2.0)
+    gitlab_git (9.0.1)
      activesupport (~> 4.0)
      charlock_holmes (~> 0.7.3)
      github-linguist (~> 4.7.0)
@@ -431,7 +432,6 @@ GEM
      railties (>= 4.0.1)
    hashie (3.4.3)
    highline (1.7.8)
-    hike (1.2.3)
    hipchat (1.5.2)
      httparty
      mimemagic
@@ -556,8 +556,8 @@ GEM
    omniauth-oauth2 (1.3.1)
      oauth2 (~> 1.0)
      omniauth (~> 1.2)
-    omniauth-saml (1.4.2)
-      omniauth (~> 1.1)
+    omniauth-saml (1.5.0)
+      omniauth (~> 1.3)
      ruby-saml (~> 1.1, >= 1.1.1)
    omniauth-shibboleth (1.2.1)
      omniauth (>= 1.0.0)
@@ -576,7 +576,7 @@ GEM
    parser (2.2.3.0)
      ast (>= 1.1, < 3.0)
    pg (0.18.4)
-    poltergeist (1.8.1)
+    poltergeist (1.9.0)
      capybara (~> 2.1)
      cliver (~> 0.3.1)
      multi_json (~> 1.0)
@@ -703,6 +703,8 @@ GEM
      rspec-expectations (~> 3.3.0)
      rspec-mocks (~> 3.3.0)
      rspec-support (~> 3.3.0)
+    rspec-retry (0.4.5)
+      rspec-core
    rspec-support (3.3.0)
    rubocop (0.35.1)
      astrolabe (~> 1.3)
@@ -714,7 +716,7 @@ GEM
    ruby-fogbugz (0.2.1)
      crack (~> 0.4)
    ruby-progressbar (1.7.5)
-    ruby-saml (1.1.1)
+    ruby-saml (1.1.2)
      nokogiri (>= 1.5.10)
      uuid (~> 2.3)
    ruby2ruby (2.2.0)
@@ -788,18 +790,17 @@ GEM
      capybara (>= 2.0.0)
      railties (>= 3)
      spinach (>= 0.4)
-    spring (1.3.6)
+    spinach-rerun-reporter (0.0.2)
+      spinach (~> 0.8)
+    spring (1.6.4)
    spring-commands-rspec (1.0.4)
      spring (>= 0.9.1)
    spring-commands-spinach (1.0.0)
      spring (>= 0.9.1)
    spring-commands-teaspoon (0.0.2)
      spring (>= 0.9.1)
-    sprockets (2.12.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    sprockets (3.3.5)
+      rack (> 1, < 3)
    sprockets-rails (2.3.3)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
@@ -831,7 +832,7 @@ GEM
      rack (~> 1.0)
    thor (0.19.1)
    thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.2)
    timfel-krb5-auth (0.8.3)
    tinder (1.10.1)
      eventmachine (~> 1.0)
@@ -929,7 +930,7 @@ DEPENDENCIES
  cal-heatmap-rails (~> 3.5.0)
  capybara (~> 2.4.0)
  capybara-screenshot (~> 1.0.0)
-  carrierwave (~> 0.9.0)
+  carrierwave (~> 0.10.0)
  charlock_holmes (~> 0.7.3)
  coffee-rails (~> 4.1.0)
  colorize (~> 0.7.0)
@@ -949,7 +950,7 @@ DEPENDENCIES
  elasticsearch-rails
  email_reply_parser (~> 0.5.8)
  email_spec (~> 1.6.0)
-  factory_girl_rails (~> 4.3.0)
+  factory_girl_rails (~> 4.6.0)
  ffaker (~> 2.0.0)
  flay
  flog
@@ -964,7 +965,7 @@ DEPENDENCIES
  gitlab-flowdock-git-hook (~> 1.0.1)
  gitlab-license (~> 0.0.4)
  gitlab_emoji (~> 0.3.0)
-  gitlab_git (~> 8.2)
+  gitlab_git (~> 9.0)
  gitlab_meta (= 7.0)
  gitlab_omniauth-ldap (~> 1.2.1)
  gollum-lib (~> 4.1.0)
@@ -1007,14 +1008,14 @@ DEPENDENCIES
  omniauth-gitlab (~> 1.0.0)
  omniauth-google-oauth2 (~> 0.2.0)
  omniauth-kerberos (~> 0.3.0)
-  omniauth-saml (~> 1.4.2)
+  omniauth-saml (~> 1.5.0)
  omniauth-shibboleth (~> 1.2.0)
  omniauth-twitter (~> 1.2.0)
  omniauth_crowd (~> 2.2.0)
  org-ruby (~> 0.9.12)
  paranoia (~> 2.0)
  pg (~> 0.18.2)
-  poltergeist (~> 1.8.1)
+  poltergeist (~> 1.9.0)
  pry-rails
  quiet_assets (~> 1.0.2)
  rack-attack (~> 4.3.1)
@@ -1035,6 +1036,7 @@ DEPENDENCIES
  rouge (~> 1.10.1)
  rqrcode-rails3 (~> 0.1.7)
  rspec-rails (~> 3.3.0)
+  rspec-retry
  rubocop (~> 0.35.0)
  ruby-fogbugz (~> 0.2.1)
  sanitize (~> 2.0)
@@ -1053,11 +1055,12 @@ DEPENDENCIES
  six (~> 0.2.0)
  slack-notifier (~> 1.2.0)
  spinach-rails (~> 0.2.1)
-  spring (~> 1.3.6)
+  spinach-rerun-reporter (~> 0.0.2)
+  spring (~> 1.6.4)
  spring-commands-rspec (~> 1.0.4)
  spring-commands-spinach (~> 1.0.0)
  spring-commands-teaspoon (~> 0.0.2)
-  sprockets (~> 2.12.3)
+  sprockets (~> 3.3.5)
  state_machines-activerecord (~> 0.3.0)
  task_list (~> 1.0.2)
  teaspoon (~> 1.0.0)

--- a/PROCESS.md
+++ b/PROCESS.md
--- a/Rakefile
+++ b/Rakefile
@@ -4,4 +4,7 @@

 require File.expand_path('../config/application', __FILE__)

+relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
+require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
+
 Gitlab::Application.load_tasks
--- a/app/assets/javascripts/api.js.coffee
+++ b/app/assets/javascripts/api.js.coffee
@@ -6,6 +6,7 @@
  namespaces_path: "/api/:version/namespaces.json"
  group_projects_path: "/api/:version/groups/:id/projects.json"
  projects_path: "/api/:version/projects.json"
+  labels_path: "/api/:version/projects/:id/labels"

  group: (group_id, callback) ->
    url = Api.buildUrl(Api.group_path)
@@ -63,6 +64,19 @@
    ).done (projects) ->
      callback(projects)

+  newLabel: (project_id, data, callback) ->
+    url = Api.buildUrl(Api.labels_path)
+    url = url.replace(':id', project_id)
+
+    data.private_token = gon.api_token
+    $.ajax(
+      url: url
+      type: "POST"
+      data: data
+      dataType: "json"
+    ).done (label) ->
+      callback(label)
+
  # Return group projects list. Filtered by query
  groupProjects: (group_id, query, callback) ->
    url = Api.buildUrl(Api.group_projects_path)

--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -224,38 +224,38 @@ $ ->
    .off 'breakpoint:change'
    .on 'breakpoint:change', (e, breakpoint) ->
      if breakpoint is 'sm' or breakpoint is 'xs'
-        $gutterIcon = $('.gutter-toggle').find('i')
+        $gutterIcon = $('.js-sidebar-toggle').find('i')
        if $gutterIcon.hasClass('fa-angle-double-right')
          $gutterIcon.closest('a').trigger('click')

  $(document)
-    .off 'click', 'aside .gutter-toggle'
-    .on 'click', 'aside .gutter-toggle', (e) ->
+    .off 'click', '.js-sidebar-toggle'
+    .on 'click', '.js-sidebar-toggle', (e, triggered) ->
      e.preventDefault()
      $this = $(this)
      $thisIcon = $this.find 'i'
+      $allGutterToggleIcons = $('.js-sidebar-toggle i')
      if $thisIcon.hasClass('fa-angle-double-right')
-        $thisIcon
+        $allGutterToggleIcons
          .removeClass('fa-angle-double-right')
          .addClass('fa-angle-double-left')
-        $this
-          .closest('aside')
+        $('aside.right-sidebar')
          .removeClass('right-sidebar-expanded')
          .addClass('right-sidebar-collapsed')
        $('.page-with-sidebar')
          .removeClass('right-sidebar-expanded')
          .addClass('right-sidebar-collapsed')
      else
-        $thisIcon
+        $allGutterToggleIcons
          .removeClass('fa-angle-double-left')
          .addClass('fa-angle-double-right')
-        $this
-          .closest('aside')
+        $('aside.right-sidebar')
          .removeClass('right-sidebar-collapsed')
          .addClass('right-sidebar-expanded')
        $('.page-with-sidebar')
          .removeClass('right-sidebar-collapsed')
          .addClass('right-sidebar-expanded')
+      if not triggered
        $.cookie("collapsed_gutter",
          $('.right-sidebar')
            .hasClass('right-sidebar-collapsed'), { path: '/' })

--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
 class @AwardsHandler
  constructor: (@post_emoji_url, @noteable_type, @noteable_id, @aliases) ->
-    $(".add-award").click (event) =>
+    $(".js-add-award").on "click", (event) =>
      event.stopPropagation()
      event.preventDefault()

@@ -9,27 +9,46 @@ class @AwardsHandler
    $("html").on 'click', (event) ->
      if !$(event.target).closest(".emoji-menu").length
        if $(".emoji-menu").is(":visible")
-          $(".emoji-menu").hide()
+          $(".emoji-menu").removeClass "is-visible"
+
+    $(".awards")
+      .off "click"
+      .on "click", ".js-emoji-btn", @handleClick

    @renderFrequentlyUsedBlock()
-    @setupSearch()
+
+  handleClick: (e) ->
+    e.preventDefault()
+    emoji = $(this)
+      .find(".icon")
+      .data "emoji"
+    awards_handler.addAward emoji

  showEmojiMenu: ->
    if $(".emoji-menu").length
-      $(".emoji-menu").show()
+      if $(".emoji-menu").is ".is-visible"
+        $(".emoji-menu").removeClass "is-visible"
+        $("#emoji_search").blur()
+      else
+        $(".emoji-menu").addClass "is-visible"
        $("#emoji_search").focus()
    else
-      $.get "/emojis", (response) ->
-        $(".add-award").after response
-        $(".emoji-menu").show()
+      $('.js-add-award').addClass "is-loading"
+      $.get "/emojis", (response) =>
+        $('.js-add-award').removeClass "is-loading"
+        $(".js-award-holder").append response
+        setTimeout =>
+          $(".emoji-menu").addClass "is-visible"
          $("#emoji_search").focus()
+          @setupSearch()
+        , 200

  addAward: (emoji) ->
    emoji = @normilizeEmojiName(emoji)
    @postEmoji emoji, =>
      @addAwardToEmojiBar(emoji)

-    $(".emoji-menu").hide()
+    $(".emoji-menu").removeClass "is-visible"

  addAwardToEmojiBar: (emoji) ->
    @addEmojiToFrequentlyUsedList(emoji)
@@ -39,7 +58,7 @@ class @AwardsHandler
      if @isActive(emoji)
        @decrementCounter(emoji)
      else
-        counter = @findEmojiIcon(emoji).siblings(".counter")
+        counter = @findEmojiIcon(emoji).siblings(".js-counter")
        counter.text(parseInt(counter.text()) + 1)
        counter.parent().addClass("active")
        @addMeToAuthorList(emoji)
@@ -53,7 +72,7 @@ class @AwardsHandler
    @findEmojiIcon(emoji).parent().hasClass("active")

  decrementCounter: (emoji) ->
-    counter = @findEmojiIcon(emoji).siblings(".counter")
+    counter = @findEmojiIcon(emoji).siblings(".js-counter")
    emojiIcon = counter.parent()
    if parseInt(counter.text()) > 1
      counter.text(parseInt(counter.text()) - 1)
@@ -70,9 +89,13 @@ class @AwardsHandler

  removeMeFromAuthorList: (emoji) ->
    award_block = @findEmojiIcon(emoji).parent()
-    authors = award_block.attr("data-original-title").split(", ")
+    authors = award_block
+      .attr("data-original-title")
+      .split(", ")
    authors.splice(authors.indexOf("me"),1)
-    award_block.closest(".award").attr("data-original-title", authors.join(", "))
+    award_block
+      .closest(".js-emoji-btn")
+      .attr("data-original-title", authors.join(", "))
    @resetTooltip(award_block)

  addMeToAuthorList: (emoji) ->
@@ -98,14 +121,18 @@ class @AwardsHandler
    emojiCssClass = @resolveNameToCssClass(emoji)

    nodes = []
-    nodes.push("<div class='award active' title='me'>")
-    nodes.push("<div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>")
-    nodes.push("<div class='counter'>1</div>")
-    nodes.push("</div>")
-
-    emoji_node = $(nodes.join("\n")).insertBefore(".awards-controls").find(".emoji-icon").data("emoji", emoji)
-
-    $(".award").tooltip()
+    nodes.push(
+      "<button class='btn award-control js-emoji-btn has_tooltip active' title='me'>",
+      "<div class='icon emoji-icon #{emojiCssClass}' data-emoji='#{emoji}'></div>",
+      "<span class='award-control-text js-counter'>1</span>",
+      "</button>"
+    )
+
+    emoji_node = $(nodes.join("\n"))
+      .insertBefore(".js-award-holder")
+      .find(".emoji-icon")
+      .data("emoji", emoji)
+    $('.award-control').tooltip()

  resolveNameToCssClass: (emoji) ->
    emoji_icon = $(".emoji-menu-content [data-emoji='#{emoji}']")
@@ -128,7 +155,7 @@ class @AwardsHandler
        callback.call()

  findEmojiIcon: (emoji) ->
-    $(".award [data-emoji='#{emoji}']")
+    $(".awards > .js-emoji-btn [data-emoji='#{emoji}']")

  scrollToAwards: ->
    $('body, html').animate({
@@ -164,13 +191,13 @@ class @AwardsHandler
      term = $(ev.target).val()

      # Clean previous search results
-      $("ul.emoji-search,h5.emoji-search").remove()
+      $("ul.emoji-menu-search, h5.emoji-search").remove()

      if term
        # Generate a search result block
        h5 = $("<h5>").text("Search results").addClass("emoji-search")
        found_emojis = @searchEmojis(term).show()
-        ul = $("<ul>").addClass("emoji-search").append(found_emojis)
+        ul = $("<ul>").addClass("emoji-menu-list emoji-menu-search").append(found_emojis)
        $(".emoji-menu-content ul, .emoji-menu-content h5").hide()
        $(".emoji-menu-content").append(h5).append(ul)
      else

--- a/app/assets/javascripts/behaviors/quick_submit.js.coffee
+++ b/app/assets/javascripts/behaviors/quick_submit.js.coffee
 # Quick Submit behavior
 #
-# When an input field with the `js-quick-submit` class receives a "Meta+Enter"
-# (Mac) or "Ctrl+Enter" (Linux/Windows) key combination, its parent form is
-# submitted.
+# When a child field of a form with a `js-quick-submit` class receives a
+# "Meta+Enter" (Mac) or "Ctrl+Enter" (Linux/Windows) key combination, the form
+# is submitted.
 #
 #= require extensions/jquery
 #
 # ### Example Markup
 #
-#   <form action="/foo">
-#     <input type="text" class="js-quick-submit" />
-#     <textarea class="js-quick-submit"></textarea>
+#   <form action="/foo" class="js-quick-submit">
+#     <input type="text" />
+#     <textarea></textarea>
+#     <input type="submit" value="Submit" />
 #   </form>
 #
+isMac = ->
+  navigator.userAgent.match(/Macintosh/)
+
+keyCodeIs = (e, keyCode) ->
+  return false if (e.originalEvent && e.originalEvent.repeat) || e.repeat
+  return e.keyCode == keyCode
+
 $(document).on 'keydown.quick_submit', '.js-quick-submit', (e) ->
-  return if (e.originalEvent && e.originalEvent.repeat) || e.repeat
-  return unless e.keyCode == 13 # Enter
+  return unless keyCodeIs(e, 13) # Enter

-  if navigator.userAgent.match(/Macintosh/)
-    return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey)
-  else
-    return unless (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey)
+  return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey) || (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey)

  e.preventDefault()

  $form = $(e.target).closest('form')
  $form.find('input[type=submit], button[type=submit]').disable()
  $form.submit()
+
+# If the user tabs to a submit button on a `js-quick-submit` form, display a
+# tooltip to let them know they could've used the hotkey
+$(document).on 'keyup.quick_submit', '.js-quick-submit input[type=submit], .js-quick-submit button[type=submit]', (e) ->
+  return unless keyCodeIs(e, 9) # Tab
+
+  if isMac()
+    title = "You can also press &#8984;-Enter"
+  else
+    title = "You can also press Ctrl-Enter"
+
+  $this = $(@)
+  $this.tooltip(
+    container: 'body'
+    html: 'true'
+    placement: 'auto top'
+    title: title
+    trigger: 'manual'
+  ).tooltip('show').one('blur', -> $this.tooltip('hide'))
--- a/app/assets/javascripts/ci/build.coffee
+++ b/app/assets/javascripts/ci/build.coffee
@@ -4,6 +4,8 @@ class CiBuild
  constructor: (build_url, build_status) ->
    clearInterval(CiBuild.interval)

+    @initScrollButtonAffix()
+
    if build_status == "running" || build_status == "pending"
      #
      # Bind autoscroll button to follow build output
@@ -38,4 +40,15 @@ class CiBuild
  checkAutoscroll: ->
    $("html,body").scrollTop $("#build-trace").height()  if "enabled" is $("#autoscroll-button").data("state")

+  initScrollButtonAffix: ->
+    $buildScroll = $('#js-build-scroll')
+    $body = $('body')
+    $buildTrace = $('#build-trace')
+
+    $buildScroll.affix(
+      offset:
+        bottom: ->
+          $body.outerHeight() - ($buildTrace.outerHeight() + $buildTrace.offset().top)
+    )
+
 @CiBuild = CiBuild
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
-@Dashboard =
-  init: ->
-    $(".projects-list-filter").off('keyup')
-    this.initSearch()
-
-  initSearch: ->
-    @timer = null
-    $(".projects-list-filter").on('keyup', ->
-      clearTimeout(@timer)
-      @timer = setTimeout(Dashboard.filterResults, 500)
-    )
-
-  filterResults: =>
-    $('.projects-list-holder').fadeTo(250, 0.5)
-
-    form = null
-    form = $("form#project-filter-form")
-    search = $(".projects-list-filter").val()
-    project_filter_url = form.attr('action') + '?' + form.serialize()
-
-    $.ajax
-      type: "GET"
-      url: form.attr('action')
-      data: form.serialize()
-      complete: ->
-        $('.projects-list-holder').fadeTo(250, 1)
-      success: (data) ->
-        $('.projects-list-holder').replaceWith(data.html)
-        # Change url so if user reload a page - search results are saved
-        history.replaceState {page: project_filter_url}, document.title, project_filter_url
-      dataType: "json"
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -16,8 +16,6 @@ class Dispatcher
    shortcut_handler = null

    switch page
-      when 'explore:projects:index', 'explore:projects:starred', 'explore:projects:trending'
-        Dashboard.init()
      when 'projects:issues:index'
        Issues.init()
        shortcut_handler = new ShortcutsNavigation()
@@ -25,7 +23,7 @@ class Dispatcher
        new Issue()
        shortcut_handler = new ShortcutsIssuable()
        new ZenMode()
-      when 'projects:milestones:show'
+      when 'projects:milestones:show', 'groups:milestones:show', 'dashboard:milestones:show'
        new Milestone()
      when 'projects:milestones:new', 'projects:milestones:edit'
        new ZenMode()
@@ -59,8 +57,6 @@ class Dispatcher
      when 'projects:merge_requests:index'
        shortcut_handler = new ShortcutsNavigation()
        MergeRequests.init()
-      when 'dashboard:show', 'root:show'
-        Dashboard.init()
      when 'dashboard:activity'
        new Activities()
      when 'dashboard:projects:starred'
@@ -78,8 +74,9 @@ class Dispatcher
        shortcut_handler = new ShortcutsNavigation()

        new TreeView() if $('#tree-slider').length
-      when 'groups:show'
+      when 'groups:activity'
        new Activities()
+      when 'groups:show'
        shortcut_handler = new ShortcutsNavigation()
      when 'groups:group_members:index'
        new GroupMembers()
@@ -107,9 +104,6 @@ class Dispatcher
        new ProjectFork()
      when 'projects:artifacts:browse'
        new BuildArtifacts()
-      when 'users:show'
-        new User()
-        new Activities()
      when 'projects:group_links:index'
        new GroupsSelect()
      when 'projects:mirrors:show', 'projects:mirrors:update'

--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
+class GitLabDropdownFilter
+  BLUR_KEYCODES = [27, 40]
+
+  constructor: (@dropdown, @options) ->
+    @input = @dropdown.find(".dropdown-input .dropdown-input-field")
+
+    # Key events
+    timeout = ""
+    @input.on "keyup", (e) =>
+      if e.keyCode is 13 && @input.val() isnt ""
+        if @options.enterCallback
+          @options.enterCallback()
+        return
+
+      clearTimeout timeout
+      timeout = setTimeout =>
+        blur_field = @shouldBlur e.keyCode
+        search_text = @input.val()
+
+        if blur_field
+          @input.blur()
+
+        if @options.remote
+          @options.query search_text, (data) =>
+            @options.callback(data)
+        else
+          @filter search_text
+      , 250
+
+  shouldBlur: (keyCode) ->
+    return BLUR_KEYCODES.indexOf(keyCode) >= 0
+
+  filter: (search_text) ->
+    data = @options.data()
+    results = data
+
+    if search_text isnt ""
+      results = fuzzaldrinPlus.filter(data, search_text,
+        key: @options.keys
+      )
+
+    @options.callback results
+
+class GitLabDropdownRemote
+  constructor: (@dataEndpoint, @options) ->
+
+  execute: ->
+    if typeof @dataEndpoint is "string"
+      @fetchData()
+    else if typeof @dataEndpoint is "function"
+      if @options.beforeSend
+        @options.beforeSend()
+
+      # Fetch the data by calling the data funcfion
+      @dataEndpoint "", (data) =>
+        if @options.success
+          @options.success(data)
+
+        if @options.beforeSend
+          @options.beforeSend()
+
+  # Fetch the data through ajax if the data is a string
+  fetchData: ->
+    $.ajax(
+      url: @dataEndpoint,
+      dataType: @options.dataType,
+      beforeSend: =>
+        if @options.beforeSend
+          @options.beforeSend()
+      success: (data) =>
+        if @options.success
+          @options.success(data)
+    )
+
+class GitLabDropdown
+  LOADING_CLASS = "is-loading"
+  PAGE_TWO_CLASS = "is-page-two"
+  ACTIVE_CLASS = "is-active"
+
+  constructor: (@el, @options) ->
+    self = @
+    @dropdown = $(@el).parent()
+    search_fields = if @options.search then @options.search.fields else [];
+
+    if @options.data
+      # Remote data
+      @remote = new GitLabDropdownRemote @options.data, {
+        dataType: @options.dataType,
+        beforeSend: @toggleLoading.bind(@)
+        success: (data) =>
+          @fullData = data
+
+          @parseData @fullData
+      }
+
+    # Init filiterable
+    if @options.filterable
+      @filter = new GitLabDropdownFilter @dropdown,
+        remote: @options.filterRemote
+        query: @options.data
+        keys: @options.search.fields
+        data: =>
+          return @fullData
+        callback: (data) =>
+          @parseData data
+        enterCallback: =>
+          @selectFirstRow()
+
+    # Event listeners
+    @dropdown.on "shown.bs.dropdown", @opened
+    @dropdown.on "hidden.bs.dropdown", @hidden
+
+    if @dropdown.find(".dropdown-toggle-page").length
+      @dropdown.find(".dropdown-toggle-page, .dropdown-menu-back").on "click", (e) =>
+        e.preventDefault()
+        e.stopPropagation()
+
+        @togglePage()
+
+    if @options.selectable
+      selector = ".dropdown-content a"
+
+      if @dropdown.find(".dropdown-toggle-page").length
+        selector = ".dropdown-page-one .dropdown-content a"
+
+      @dropdown.on "click", selector, (e) ->
+        self.rowClicked $(@)
+
+        if self.options.clicked
+          self.options.clicked()
+
+  toggleLoading: ->
+    $('.dropdown-menu', @dropdown).toggleClass LOADING_CLASS
+
+  togglePage: ->
+    menu = $('.dropdown-menu', @dropdown)
+
+    if menu.hasClass(PAGE_TWO_CLASS)
+      if @remote
+        @remote.execute()
+
+    menu.toggleClass PAGE_TWO_CLASS
+
+  parseData: (data) ->
+    @renderedData = data
+
+    # Render each row
+    html = $.map data, (obj) =>
+      return @renderItem(obj)
+
+    if @options.filterable and data.length is 0
+      # render no matching results
+      html = [@noResults()]
+
+    # Render the full menu
+    full_html = @renderMenu(html.join(""))
+
+    @appendMenu(full_html)
+
+  opened: =>
+    contentHtml = $('.dropdown-content', @dropdown).html()
+    if @remote && contentHtml is ""
+      @remote.execute()
+
+    if @options.filterable
+      @dropdown.find(".dropdown-input-field").focus()
+
+  hidden: =>
+    if @options.filterable
+      @dropdown.find(".dropdown-input-field").blur().val("")
+
+    if @dropdown.find(".dropdown-toggle-page").length
+      $('.dropdown-menu', @dropdown).removeClass PAGE_TWO_CLASS
+
+
+  # Render the full menu
+  renderMenu: (html) ->
+    menu_html = ""
+
+    if @options.renderMenu
+      menu_html = @options.renderMenu(html)
+    else
+      menu_html = "<ul>#{html}</ul>"
+
+    return menu_html
+
+  # Append the menu into the dropdown
+  appendMenu: (html) ->
+    selector = '.dropdown-content'
+    if @dropdown.find(".dropdown-toggle-page").length
+      selector = ".dropdown-page-one .dropdown-content"
+
+    $(selector, @dropdown).html html
+
+  # Render the row
+  renderItem: (data) ->
+    html = ""
+
+    return "<li class='divider'></li>" if data is "divider"
+
+    if @options.renderRow
+      # Call the render function
+      html = @options.renderRow(data)
+    else
+      selected = if @options.isSelected then @options.isSelected(data) else false
+      url = if @options.url then @options.url(data) else "#"
+      text = if @options.text then @options.text(data) else ""
+      cssClass = "";
+
+      if selected
+        cssClass = "is-active"
+
+      html = "<li>"
+      html += "<a href='#{url}' class='#{cssClass}'>"
+      html += text
+      html += "</a>"
+      html += "</li>"
+
+    return html
+
+  noResults: ->
+    html = "<li>"
+    html += "<a href='#' class='is-focused'>"
+    html += "No matching results."
+    html += "</a>"
+    html += "</li>"
+
+  rowClicked: (el) ->
+    fieldName = @options.fieldName
+    field = @dropdown.parent().find("input[name='#{fieldName}']")
+
+    if el.hasClass(ACTIVE_CLASS)
+      field.remove()
+    else
+      fieldName = @options.fieldName
+      selectedIndex = el.parent().index()
+      if @renderedData
+        selectedObject = @renderedData[selectedIndex]
+      value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
+
+      if !value?
+        field.remove()
+
+      if @options.multiSelect
+        oldValue = field.val()
+        if oldValue
+          value = "#{oldValue},#{value}"
+      else
+        @dropdown.find(ACTIVE_CLASS).removeClass ACTIVE_CLASS
+
+      # Toggle active class for the tick mark
+      el.toggleClass "is-active"
+
+      if value
+        if !field.length
+          # Create hidden input for form
+          input = "<input type='hidden' name='#{fieldName}' />"
+          @dropdown.before input
+
+        @dropdown.parent().find("input[name='#{fieldName}']").val value
+
+  selectFirstRow: ->
+    selector = '.dropdown-content li:first-child a'
+    if @dropdown.find(".dropdown-toggle-page").length
+      selector = ".dropdown-page-one .dropdown-content li:first-child a"
+
+    # similute a click on the first link
+    $(selector).trigger "click"
+
+$.fn.glDropdown = (opts) ->
+  return @.each ->
+    new GitLabDropdown @, opts
--- a/app/assets/javascripts/issue_status_select.js.coffee
+++ b/app/assets/javascripts/issue_status_select.js.coffee
+class @IssueStatusSelect
+  constructor: ->
+    $('.js-issue-status').each (i, el) ->
+      fieldName = $(el).data("field-name")
+
+      $(el).glDropdown(
+        selectable: true
+        fieldName: fieldName
+        id: (obj, el) ->
+          $(el).data("id")
+      )
--- a/app/assets/javascripts/labels_select.js.coffee
+++ b/app/assets/javascripts/labels_select.js.coffee
+class @LabelsSelect
+  constructor: ->
+    $('.js-label-select').each (i, dropdown) ->
+      projectId = $(dropdown).data('project-id')
+      labelUrl = $(dropdown).data("labels")
+      selectedLabel = $(dropdown).data('selected')
+      if selectedLabel
+        selectedLabel = selectedLabel.split(",")
+      newLabelField = $('#new_label_name')
+      newColorField = $('#new_label_color')
+      showNo = $(dropdown).data('show-no')
+      showAny = $(dropdown).data('show-any')
+
+      if newLabelField.length
+        $('.suggest-colors-dropdown a').on "click", (e) ->
+          e.preventDefault()
+          e.stopPropagation()
+          newColorField.val $(this).data("color")
+          $('.js-dropdown-label-color-preview')
+            .css 'background-color', $(this).data("color")
+            .addClass 'is-active'
+
+        $('.js-new-label-btn').on "click", (e) ->
+          e.preventDefault()
+          e.stopPropagation()
+
+          if newLabelField.val() isnt "" && newColorField.val() isnt ""
+            $('.js-new-label-btn').disable()
+
+            # Create new label with API
+            Api.newLabel projectId, {
+              name: newLabelField.val()
+              color: newColorField.val()
+            }, (label) ->
+              $('.js-new-label-btn').enable()
+              $('.dropdown-menu-back', $(dropdown).parent()).trigger "click"
+
+      $(dropdown).glDropdown(
+        data: (term, callback) ->
+          # We have to fetch the JS version of the labels list because there is no
+          # public facing JSON url for labels
+          $.ajax(
+            url: labelUrl
+          ).done (data) ->
+            html = $(data)
+            data = []
+            html.find('.label-row a').each ->
+              data.push(
+                title: $(@).text().trim()
+              )
+
+            if showNo
+              data.unshift(
+                id: "0"
+                title: 'No label'
+              )
+
+            if showAny
+              data.unshift(
+                title: 'Any label'
+              )
+
+            if data.length > 2
+              data.splice 2, 0, "divider"
+
+            callback data
+        renderRow: (label) ->
+          if $.isArray(selectedLabel)
+            selected = ""
+            $.each selectedLabel, (i, selectedLbl) ->
+              selectedLbl = selectedLbl.trim()
+              if selected is "" && label.title is selectedLbl
+                selected = "is-active"
+          else
+            selected = if label.title is selectedLabel then "is-active" else ""
+
+          "<li>
+            <a href='#' class='#{selected}'>
+              #{label.title}
+            </a>
+          </li>"
+        filterable: true
+        search:
+          fields: ['title']
+        selectable: true
+        fieldName: $(dropdown).data('field-name')
+        id: (label) ->
+          label.title
+        clicked: ->
+          if $(dropdown).hasClass "js-filter-submit"
+            $(dropdown).parents('form').submit()
+      )
--- a/app/assets/javascripts/markdown_preview.js.coffee
+++ b/app/assets/javascripts/markdown_preview.js.coffee
@@ -6,6 +6,7 @@
 class @MarkdownPreview
  # Minimum number of users referenced before triggering a warning
  referenceThreshold: 10
+  ajaxCache: {}

  showPreview: (form) ->
    preview = form.find('.js-md-preview')
@@ -24,12 +25,16 @@ class @MarkdownPreview
  renderMarkdown: (text, success) ->
    return unless window.markdown_preview_path

+    return success(@ajaxCache.response) if text == @ajaxCache.text
+
    $.ajax
      type: 'POST'
      url: window.markdown_preview_path
      data: { text: text }
      dataType: 'json'
-      success: success
+      success: (response) =>
+        @ajaxCache = text: text, response: response
+        success(response)

  hideReferencedUsers: (form) ->
    referencedUsers = form.find('.referenced-users')
@@ -49,6 +54,7 @@ markdownPreview = new MarkdownPreview()

 previewButtonSelector = '.js-md-preview-button'
 writeButtonSelector   = '.js-md-write-button'
+lastTextareaPreviewed = null

 $.fn.setupMarkdownPreview = ->
  $form = $(this)
@@ -58,10 +64,10 @@ $.fn.setupMarkdownPreview = ->
  form_textarea.on 'input', -> markdownPreview.hideReferencedUsers($form)
  form_textarea.on 'blur',  -> markdownPreview.showPreview($form)

-$(document).on 'click', previewButtonSelector, (e) ->
-  e.preventDefault()
+$(document).on 'markdown-preview:show', (e, $form) ->
+  return unless $form

-  $form = $(this).closest('form')
+  lastTextareaPreviewed = $form.find('textarea.markdown-area')

  # toggle tabs
  $form.find(writeButtonSelector).parent().removeClass('active')
@@ -73,10 +79,10 @@ $(document).on 'click', previewButtonSelector, (e) ->

  markdownPreview.showPreview($form)

-$(document).on 'click', writeButtonSelector, (e) ->
-  e.preventDefault()
+$(document).on 'markdown-preview:hide', (e, $form) ->
+  return unless $form

-  $form = $(this).closest('form')
+  lastTextareaPreviewed = null

  # toggle tabs
  $form.find(writeButtonSelector).parent().addClass('active')
@@ -84,4 +90,30 @@ $(document).on 'click', writeButtonSelector, (e) ->

  # toggle content
  $form.find('.md-write-holder').show()
+  $form.find('textarea.markdown-area').focus()
  $form.find('.md-preview-holder').hide()
+
+$(document).on 'markdown-preview:toggle', (e, keyboardEvent) ->
+  $target = $(keyboardEvent.target)
+
+  if $target.is('textarea.markdown-area')
+    $(document).triggerHandler('markdown-preview:show', [$target.closest('form')])
+    keyboardEvent.preventDefault()
+  else if lastTextareaPreviewed
+    $target = lastTextareaPreviewed
+    $(document).triggerHandler('markdown-preview:hide', [$target.closest('form')])
+    keyboardEvent.preventDefault()
+
+$(document).on 'click', previewButtonSelector, (e) ->
+  e.preventDefault()
+
+  $form = $(this).closest('form')
+
+  $(document).triggerHandler('markdown-preview:show', [$form])
+
+$(document).on 'click', writeButtonSelector, (e) ->
+  e.preventDefault()
+
+  $form = $(this).closest('form')
+
+  $(document).triggerHandler('markdown-preview:hide', [$form])
--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -189,12 +189,11 @@ class @MergeRequestTabs
    $('.container-fluid').removeClass('container-limited')

  shrinkView: ->
-    $gutterIcon = $('.gutter-toggle i')
+    $gutterIcon = $('.js-sidebar-toggle i')

    # Wait until listeners are set
    setTimeout( ->
      # Only when sidebar is collapsed
      if $gutterIcon.is('.fa-angle-double-right')
-        $gutterIcon.closest('a').trigger('click')
+        $gutterIcon.closest('a').trigger('click',[true])
    , 0)
-
--- a/app/assets/javascripts/milestone.js.coffee
+++ b/app/assets/javascripts/milestone.js.coffee
@@ -69,7 +69,7 @@ class @Milestone

    @bindIssuesSorting()
    @bindMergeRequestSorting()
-    @bindTabsSwitching
+    @bindTabsSwitching()

  bindIssuesSorting: ->
    $("#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed").sortable(
@@ -104,7 +104,7 @@ class @Milestone

    ).disableSelection()

-  bindMergeRequestSorting: ->
+  bindTabsSwitching: ->
    $('a[data-toggle="tab"]').on 'show.bs.tab', (e) ->
      currentTabClass  = $(e.target).data('show')
      previousTabClass =  $(e.relatedTarget).data('show')
@@ -113,6 +113,7 @@ class @Milestone
      $(currentTabClass).removeClass('hidden')
      $(currentTabClass).show()

+  bindMergeRequestSorting: ->
    $("#merge_requests-list-unassigned, #merge_requests-list-ongoing, #merge_requests-list-closed").sortable(
      connectWith: ".merge_requests-sortable-list",
      dropOnEmpty: true,

--- a/app/assets/javascripts/milestone_select.js.coffee
+++ b/app/assets/javascripts/milestone_select.js.coffee
+class @MilestoneSelect
+  constructor: ->
+    $('.js-milestone-select').each (i, dropdown) ->
+      projectId = $(dropdown).data('project-id')
+      milestonesUrl = $(dropdown).data('milestones')
+      selectedMilestone = $(dropdown).data('selected')
+      showNo = $(dropdown).data('show-no')
+      showAny = $(dropdown).data('show-any')
+      useId = $(dropdown).data('use-id')
+
+      $(dropdown).glDropdown(
+        data: (term, callback) ->
+          $.ajax(
+            url: milestonesUrl
+          ).done (data) ->
+            html = $(data)
+            data = []
+            html.find('.milestone strong a').each ->
+              link = $(@).attr("href").split("/")
+              data.push(
+                id: link[link.length - 1]
+                title: $(@).text().trim()
+              )
+
+            if showNo
+              data.unshift(
+                id: "0"
+                title: 'No Milestone'
+              )
+
+            if showAny
+              data.unshift(
+                title: 'Any Milestone'
+              )
+
+            if data.length > 2
+              data.splice 2, 0, "divider"
+
+            callback(data)
+        filterable: true
+        search:
+          fields: ['title']
+        selectable: true
+        fieldName: $(dropdown).data('field-name')
+        text: (milestone) ->
+          milestone.title
+        id: (milestone) ->
+          if !useId
+            if milestone.title isnt "Any milestone"
+              milestone.title
+            else
+              ""
+          else
+            milestone.id
+        isSelected: (milestone) ->
+          milestone.title is selectedMilestone
+        clicked: ->
+          if $(dropdown).hasClass "js-filter-submit"
+            $(dropdown).parents('form').submit()
+      )
--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -16,11 +16,13 @@ class @Notes
    @view = view
    @noteable_url = document.URL
    @notesCountBadge ||= $(".issuable-details").find(".notes-tab .badge")
+    @basePollingInterval = 15000
+    @maxPollingSteps = 4

-    @initRefresh()
-    @setupMainTargetNoteForm()
    @cleanBinding()
    @addBinding()
+    @setPollingInterval()
+    @setupMainTargetNoteForm()
    @initTaskList()

  addBinding: ->
@@ -28,8 +30,11 @@ class @Notes
    $(document).on "ajax:success", ".js-main-target-form", @addNote
    $(document).on "ajax:success", ".js-discussion-note-form", @addDiscussionNote

+    # catch note ajax errors
+    $(document).on "ajax:error", ".js-main-target-form", @addNoteError
+
    # change note in UI after update
-    $(document).on "ajax:success", "form.edit_note", @updateNote
+    $(document).on "ajax:success", "form.edit-note", @updateNote

    # Edit note link
    $(document).on "click", ".js-note-edit", @showEditForm
@@ -37,7 +42,7 @@ class @Notes

    # Reopen and close actions for Issue/MR combined with note form submit
    $(document).on "click", ".js-comment-button", @updateCloseButton
-    $(document).on "keyup", ".js-note-text", @updateTargetButtons
+    $(document).on "keyup input", ".js-note-text", @updateTargetButtons

    # remove a note (in general)
    $(document).on "click", ".js-note-delete", @removeNote
@@ -49,6 +54,9 @@ class @Notes
    $(document).on "ajax:complete", ".js-main-target-form", @reenableTargetFormSubmitButton
    $(document).on "ajax:success", ".js-main-target-form", @resetMainTargetForm

+    # reset main target form when clicking discard
+    $(document).on "click", ".js-note-discard", @resetMainTargetForm
+
    # update the file name when an attachment is selected
    $(document).on "change", ".js-note-attachment-input", @updateFormAttachment

@@ -70,7 +78,7 @@ class @Notes
  cleanBinding: ->
    $(document).off "ajax:success", ".js-main-target-form"
    $(document).off "ajax:success", ".js-discussion-note-form"
-    $(document).off "ajax:success", "form.edit_note"
+    $(document).off "ajax:success", "form.edit-note"
    $(document).off "click", ".js-note-edit"
    $(document).off "click", ".note-edit-cancel"
    $(document).off "click", ".js-note-delete"
@@ -83,6 +91,7 @@ class @Notes
    $(document).off "keyup", ".js-note-text"
    $(document).off "click", ".js-note-target-reopen"
    $(document).off "click", ".js-note-target-close"
+    $(document).off "click", ".js-note-discard"

    $('.note .js-task-list-container').taskList('disable')
    $(document).off 'tasklist:changed', '.note .js-task-list-container'
@@ -91,9 +100,11 @@ class @Notes
    clearInterval(Notes.interval)
    Notes.interval = setInterval =>
      @refresh()
-    , 15000
+    , @pollingInterval

  refresh: ->
+    return if @refreshing is true
+    refreshing = true
    if not document.hidden and document.URL.indexOf(@noteable_url) is 0
      @getContent()

@@ -105,12 +116,31 @@ class @Notes
      success: (data) =>
        notes = data.notes
        @last_fetched_at = data.last_fetched_at
+        @setPollingInterval(data.notes.length)
        $.each notes, (i, note) =>
          if note.discussion_with_diff_html?
            @renderDiscussionNote(note)
          else
            @renderNote(note)
+      always: =>
+        @refreshing = false

+  ###
+  Increase @pollingInterval up to 120 seconds on every function call,
+  if `shouldReset` has a truthy value, 'null' or 'undefined' the variable
+  will reset to @basePollingInterval.
+
+  Note: this function is used to gradually increase the polling interval
+  if there aren't new notes coming from the server
+  ###
+  setPollingInterval: (shouldReset = true) ->
+    nthInterval = @basePollingInterval * Math.pow(2, @maxPollingSteps - 1)
+    if shouldReset
+      @pollingInterval = @basePollingInterval
+    else if @pollingInterval < nthInterval
+      @pollingInterval *= 2
+
+    @initRefresh()

  ###
  Render note in main comments area.
@@ -196,7 +226,7 @@ class @Notes
  Resets text and preview.
  Resets buttons.
  ###
-  resetMainTargetForm: ->
+  resetMainTargetForm: (e) =>
    form = $(".js-main-target-form")

    # remove validation errors
@@ -208,6 +238,8 @@ class @Notes

    form.find(".js-note-text").data("autosave").reset()

+    @updateTargetButtons(e)
+
  reenableTargetFormSubmitButton: ->
    form = $(".js-main-target-form")

@@ -251,8 +283,10 @@ class @Notes
    form.removeClass "js-new-note-form"
    form.find('.div-dropzone').remove()

+    # hide discard button
+    form.find('.js-note-discard').hide()
+
    # setup preview buttons
-    form.find(".js-md-write-button, .js-md-preview-button").tooltip placement: "left"
    previewButton = form.find(".js-md-preview-button")

    textarea = form.find(".js-note-text")
@@ -286,6 +320,10 @@ class @Notes
  addNote: (xhr, note, status) =>
    @renderNote(note)

+  addNoteError: (xhr, note, status) =>
+    flash = new Flash('Your comment could not be submitted! Please check your network connection and try again.', 'alert')
+    flash.pinTo('.md-area')
+
  ###
  Called in response to the new note form being submitted

@@ -324,21 +362,25 @@ class @Notes
    note = $(this).closest(".note")
    note.find(".note-body > .note-text").hide()
    note.find(".note-header").hide()
-    base_form = note.find(".note-edit-form")
-    form = base_form.clone().insertAfter(base_form)
-    form.addClass('current-note-edit-form gfm-form')
-    form.find('.div-dropzone').remove()
+    form = note.find(".note-edit-form")
+    isNewForm = form.is(':not(.gfm-form)')
+    if isNewForm
+      form.addClass('gfm-form')
+    form.addClass('current-note-edit-form')
+    form.show()

    # Show the attachment delete link
    note.find(".js-note-attachment-delete").show()

    # Setup markdown form
+    if isNewForm
      GitLab.GfmAutoComplete.setup()
      new DropzoneInput(form)

-    form.show()
    textarea = form.find("textarea")
    textarea.focus()
+
+    if isNewForm
      autosize(textarea)

    # HACK (rspeicher/DouweM): Work around a Chrome 43 bug(?).
@@ -348,6 +390,7 @@ class @Notes
    textarea.val ""
    textarea.val value

+    if isNewForm
      disableButtonIfEmptyField textarea, form.find(".js-comment-button")

  ###
@@ -360,7 +403,9 @@ class @Notes
    note = $(this).closest(".note")
    note.find(".note-body > .note-text").show()
    note.find(".note-header").show()
-    note.find(".current-note-edit-form").remove()
+    note.find(".current-note-edit-form")
+      .removeClass("current-note-edit-form")
+      .hide()

  ###
  Called in response to deleting a note of any kind.
@@ -439,6 +484,11 @@ class @Notes
    form.find("#note_line_code").val dataHolder.data("lineCode")
    form.find("#note_noteable_type").val dataHolder.data("noteableType")
    form.find("#note_noteable_id").val dataHolder.data("noteableId")
+    form.find('.js-note-discard')
+        .show()
+        .removeClass('js-note-discard')
+        .addClass('js-close-discussion-note-form')
+        .text(form.find('.js-close-discussion-note-form').data('cancel-text'))
    @setupNoteForm form
    form.find(".js-note-text").focus()
    form.addClass "js-discussion-note-form"
@@ -538,21 +588,52 @@ class @Notes
  updateCloseButton: (e) =>
    textarea = $(e.target)
    form = textarea.parents('form')
-    form.find('.js-note-target-close').text('Close')
+    closebtn = form.find('.js-note-target-close')
+    closebtn.text(closebtn.data('original-text'))

  updateTargetButtons: (e) =>
    textarea = $(e.target)
    form = textarea.parents('form')
+    reopenbtn = form.find('.js-note-target-reopen')
+    closebtn = form.find('.js-note-target-close')
+    discardbtn = form.find('.js-note-discard')
+
    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')
+      reopentext = reopenbtn.data('alternative-text')
+      closetext = closebtn.data('alternative-text')
+
+      if reopenbtn.text() isnt reopentext
+        reopenbtn.text(reopentext)
+
+      if closebtn.text() isnt closetext
+        closebtn.text(closetext)
+
+      if reopenbtn.is(':not(.btn-comment-and-reopen)')
+        reopenbtn.addClass('btn-comment-and-reopen')
+
+      if closebtn.is(':not(.btn-comment-and-close)')
+        closebtn.addClass('btn-comment-and-close')
+
+      if discardbtn.is(':hidden')
+        discardbtn.show()
    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')
+      reopentext = reopenbtn.data('original-text')
+      closetext = closebtn.data('original-text')
+
+      if reopenbtn.text() isnt reopentext
+        reopenbtn.text(reopentext)
+
+      if closebtn.text() isnt closetext
+        closebtn.text(closetext)
+
+      if reopenbtn.is(':not(.btn-comment-and-reopen)')
+        reopenbtn.removeClass('btn-comment-and-reopen')
+
+      if closebtn.is(':not(.btn-comment-and-close)')
+        closebtn.removeClass('btn-comment-and-close')
+
+      if discardbtn.is(':visible')
+        discardbtn.hide()

  initTaskList: ->
    @enableTaskList()

--- a/app/assets/javascripts/pager.js.coffee
+++ b/app/assets/javascripts/pager.js.coffee
 @Pager =
  init: (@limit = 0, preload, @disable = false) ->
-    @loading = $(".loading")
+    @loading = $('.loading').first()
+
    if preload
      @offset = 0
      @getOld()

--- a/app/assets/javascripts/profile.js.coffee
+++ b/app/assets/javascripts/profile.js.coffee
@@ -4,12 +4,13 @@ class @Profile
    $('.js-preferences-form').on 'change.preference', 'input[type=radio]', ->
      $(this).parents('form').submit()

-    $('.update-username form').on 'ajax:before', ->
-      $('.loading-gif').show()
+    $('.update-username').on 'ajax:before', ->
+      $('.loading-username').show()
      $(this).find('.update-success').hide()
      $(this).find('.update-failed').hide()

-    $('.update-username form').on 'ajax:complete', ->
+    $('.update-username').on 'ajax:complete', ->
+      $('.loading-username').hide()
      $(this).find('.btn-save').enable()
      $(this).find('.loading-gif').hide()

@@ -48,7 +49,7 @@ class @Profile
      $filename.text($filename.data('label'))

    $('.js-upload-user-avatar').on 'click', ->
-      $('.edit_user').submit()
+      $('.edit-user').submit()

    $avatarInput.on "change", ->
      form = $(this).closest("form")
@@ -63,3 +64,11 @@ class @Profile

      fileData = reader.readAsDataURL(this.files[0])

+$ ->
+  # Extract the SSH Key title from its comment
+  $(document).on 'focusout.ssh_key', '#key_key', ->
+    $title  = $('#key_title')
+    comment = $(@).val().match(/^\S+ \S+ (.+)\n?$/)
+
+    if comment && comment.length > 1 && $title.val() == ''
+      $title.val(comment[1]).change()
--- a/app/assets/javascripts/projects_list.js.coffee
+++ b/app/assets/javascripts/projects_list.js.coffee
-class @ProjectsList
-  constructor: ->
-    $(".projects-list .js-expand").on 'click', (e) ->
-      e.preventDefault()
-      list = $(this).closest('.projects-list')
+@ProjectsList =
+  init: ->
+    $(".projects-list-filter").off('keyup')
+    this.initSearch()
+    this.initPagination()

-    $("#filter_projects").on 'keyup', ->
-      ProjectsList.filter_results($("#filter_projects"))
+  initSearch: ->
+    @timer = null
+    $(".projects-list-filter").on('keyup', ->
+      clearTimeout(@timer)
+      @timer = setTimeout(ProjectsList.filterResults, 500)
+    )

-  @filter_results: ($element) ->
-    terms = $element.val()
-    filterSelector = $element.data('filter-selector') || 'span.filter-title'
+  filterResults: =>
+    $('.projects-list-holder').fadeTo(250, 0.5)

-    if not terms
-      $(".projects-list li").show()
-      $('.gl-pagination').show()
-    else
-      $(".projects-list li").each (index) ->
-        $this = $(this)
-        name = $this.find(filterSelector).text()
+    form = null
+    form = $("form#project-filter-form")
+    search = $(".projects-list-filter").val()
+    project_filter_url = form.attr('action') + '?' + form.serialize()

-        if name.toLowerCase().indexOf(terms.toLowerCase()) == -1
-          $this.hide()
-        else
-          $this.show()
-      $('.gl-pagination').hide()
+    $.ajax
+      type: "GET"
+      url: form.attr('action')
+      data: form.serialize()
+      complete: ->
+        $('.projects-list-holder').fadeTo(250, 1)
+      success: (data) ->
+        $('.projects-list-holder').replaceWith(data.html)
+        # Change url so if user reload a page - search results are saved
+        history.replaceState {page: project_filter_url}, document.title, project_filter_url
+      dataType: "json"
+
+  initPagination: ->
+    $('.projects-list-holder .pagination').on('ajax:success', (e, data) ->
+      $('.projects-list-holder').replaceWith(data.html)
+    )
--- a/app/assets/javascripts/shortcuts.js.coffee
+++ b/app/assets/javascripts/shortcuts.js.coffee
@@ -4,17 +4,23 @@ class @Shortcuts
    Mousetrap.reset()
    Mousetrap.bind('?', @selectiveHelp)
    Mousetrap.bind('s', Shortcuts.focusSearch)
+    Mousetrap.bind(['ctrl+shift+p', 'command+shift+p'], @toggleMarkdownPreview)
    Mousetrap.bind('t', -> Turbolinks.visit(findFileURL)) if findFileURL?

  selectiveHelp: (e) =>
    Shortcuts.showHelp(e, @enabledHelp)

+  toggleMarkdownPreview: (e) =>
+    $(document).triggerHandler('markdown-preview:toggle', [e])
+
  @showHelp: (e, location) ->
    if $('#modal-shortcuts').length > 0
      $('#modal-shortcuts').modal('show')
    else
+      url = '/help/shortcuts'
+      url = gon.relative_url_root + url if gon.relative_url_root?
      $.ajax(
-        url: '/help/shortcuts',
+        url: url,
        dataType: 'script',
        success: (e) ->
          if location and location.length > 0
@@ -33,3 +39,14 @@ $(document).on 'click.more_help', '.js-more-help-button', (e) ->
  $(@).remove()
  $('.hidden-shortcut').show()
  e.preventDefault()
+
+Mousetrap.stopCallback = (->
+  defaultStopCallback = Mousetrap.stopCallback
+
+  return (e, element, combo) ->
+    # allowed shortcuts if textarea, input, contenteditable are focused
+    if ['ctrl+shift+p', 'command+shift+p'].indexOf(combo) != -1
+      return false
+    else
+      return defaultStopCallback.apply(@, arguments)
+)()
--- a/app/assets/javascripts/user.js.coffee
+++ b/app/assets/javascripts/user.js.coffee
 class @User
-  constructor: ->
+  constructor: (@opts) ->
    $('.profile-groups-avatars').tooltip("placement": "top")
-    new ProjectsList()
+
+    @initTabs()

    $('.hide-project-limit-message').on 'click', (e) ->
      path = '/'
      $.cookie('hide_project_limit_message', 'false', { path: path })
      $(@).parents('.project-limit-message').remove()
      e.preventDefault()
+
+  initTabs: ->
+    new UserTabs(
+        parentEl: '.user-profile'
+        action: @opts.action
+      )
--- a/app/assets/javascripts/user_tabs.js.coffee
+++ b/app/assets/javascripts/user_tabs.js.coffee
+# UserTabs
+#
+# Handles persisting and restoring the current tab selection and lazily-loading
+# content on the Users#show page.
+#
+# ### Example Markup
+#
+#   <ul class="nav-links">
+#     <li class="activity-tab active">
+#       <a data-action="activity" data-target="#activity" data-toggle="tab" href="/u/username">
+#         Activity
+#       </a>
+#     </li>
+#     <li class="groups-tab">
+#       <a data-action="groups" data-target="#groups" data-toggle="tab" href="/u/username/groups">
+#         Groups
+#       </a>
+#     </li>
+#     <li class="contributed-tab">
+#       <a data-action="contributed" data-target="#contributed" data-toggle="tab" href="/u/username/contributed">
+#         Contributed projects
+#       </a>
+#     </li>
+#     <li class="projects-tab">
+#       <a data-action="projects" data-target="#projects" data-toggle="tab" href="/u/username/projects">
+#         Personal projects
+#       </a>
+#     </li>
+#   </ul>
+#
+#   <div class="tab-content">
+#     <div class="tab-pane" id="activity">
+#       Activity Content
+#     </div>
+#     <div class="tab-pane" id="groups">
+#       Groups Content
+#     </div>
+#     <div class="tab-pane" id="contributed">
+#       Contributed projects content
+#     </div>
+#     <div class="tab-pane" id="projects">
+#       Projects content
+#     </div>
+#   </div>
+#
+#   <div class="loading-status">
+#     <div class="loading">
+#       Loading Animation
+#     </div>
+#   </div>
+#
+class @UserTabs
+  constructor: (opts) ->
+    {
+      @action = 'activity'
+      @defaultAction = 'activity'
+      @parentEl = $(document)
+    } = opts
+
+    # Make jQuery object if selector is provided
+    @parentEl = $(@parentEl) if typeof @parentEl is 'string'
+
+    # Store the `location` object, allowing for easier stubbing in tests
+    @_location = location
+
+    # Set tab states
+    @loaded = {}
+    for item in @parentEl.find('.nav-links a')
+      @loaded[$(item).attr 'data-action'] = false
+
+    # Actions
+    @actions = Object.keys @loaded
+
+    @bindEvents()
+
+    # Set active tab
+    @action = @defaultAction if @action is 'show'
+    @activateTab(@action)
+
+  bindEvents: ->
+    # Toggle event listeners
+    @parentEl
+      .off 'shown.bs.tab', '.nav-links a[data-toggle="tab"]'
+      .on 'shown.bs.tab', '.nav-links a[data-toggle="tab"]', @tabShown
+
+  tabShown: (event) =>
+    $target = $(event.target)
+    action = $target.data('action')
+    source = $target.attr('href')
+
+    @setTab(source, action)
+    @setCurrentAction(action)
+
+  activateTab: (action) ->
+    @parentEl.find(".nav-links .#{action}-tab a").tab('show')
+
+  setTab: (source, action) ->
+    return if @loaded[action] is true
+
+    if action is 'activity'
+      @loadActivities(source)
+
+    if action in ['groups', 'contributed', 'projects']
+      @loadTab(source, action)
+
+  loadTab: (source, action) ->
+    $.ajax
+      beforeSend: => @toggleLoading(true)
+      complete:   => @toggleLoading(false)
+      dataType: 'json'
+      type: 'GET'
+      url: "#{source}.json"
+      success: (data) =>
+        tabSelector = 'div#' + action
+        @parentEl.find(tabSelector).html(data.html)
+        @loaded[action] = true
+
+  loadActivities: (source) ->
+    return if @loaded['activity'] is true
+
+    $calendarWrap = @parentEl.find('.user-calendar')
+    $calendarWrap.load($calendarWrap.data('href'))
+
+    new Activities()
+    @loaded['activity'] = true
+
+  toggleLoading: (status) ->
+    @parentEl.find('.loading-status .loading').toggle(status)
+
+  setCurrentAction: (action) ->
+    # Remove possible actions from URL
+    regExp = new RegExp('\/(' + @actions.join('|') + ')(\.html)?\/?$')
+    new_state = @_location.pathname
+    new_state = new_state.replace(/\/+$/, "") # remove trailing slashes
+    new_state = new_state.replace(regExp, '')
+
+    # Append the new action if we're on a tab other than 'activity'
+    unless action == @defaultAction
+      new_state += "/#{action}"
+
+    # Ensure parameters and hash come along for the ride
+    new_state += @_location.search + @_location.hash
+
+    history.replaceState {turbolinks: true, url: new_state}, document.title, new_state
+
+    new_state
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -3,6 +3,81 @@ class @UsersSelect
    @usersPath = "/autocomplete/users.json"
    @userPath = "/autocomplete/users/:id.json"

+    $('.js-user-search').each (i, dropdown) =>
+      @projectId = $(dropdown).data('project-id')
+      @showCurrentUser = $(dropdown).data('current-user')
+      showNullUser = $(dropdown).data('null-user')
+      showAnyUser = $(dropdown).data('any-user')
+      firstUser = $(dropdown).data('first-user')
+      selectedId = $(dropdown).data('selected')
+
+      $(dropdown).glDropdown(
+        data: (term, callback) =>
+          @users term, (users) =>
+            if term.length is 0
+              showDivider = 0
+
+              if firstUser
+                # Move current user to the front of the list
+                for obj, index in users
+                  if obj.username == firstUser
+                    users.splice(index, 1)
+                    users.unshift(obj)
+                    break
+
+              if showNullUser
+                showDivider += 1
+                users.unshift(
+                  name: 'Unassigned',
+                  id: 0
+                )
+
+              if showAnyUser
+                showDivider += 1
+                name = showAnyUser
+                name = 'Any User' if name == true
+                anyUser = {
+                  name: name,
+                  id: null
+                }
+                users.unshift(anyUser)
+
+            if showDivider
+              users.splice(showDivider, 0, "divider")
+
+            # Send the data back
+            callback users
+        filterable: true
+        filterRemote: true
+        search:
+          fields: ['name', 'username']
+        selectable: true
+        fieldName: $(dropdown).data('field-name')
+        clicked: ->
+          if $(dropdown).hasClass "js-filter-submit"
+            $(dropdown).parents('form').submit()
+        renderRow: (user) ->
+          username = if user.username then "@#{user.username}" else ""
+          avatar = if user.avatar_url then user.avatar_url else false
+          selected = if user.id is selectedId then "is-active" else ""
+          img = ""
+
+          if avatar
+            img = "<img src='#{avatar}' class='avatar avatar-inline' width='30' />"
+
+          "<li>
+            <a href='#' class='dropdown-menu-user-link #{selected}'>
+              #{img}
+              <strong class='dropdown-menu-user-full-name'>
+                #{user.name}
+              </strong>
+              <span class='dropdown-menu-user-username'>
+                #{username}
+              </span>
+            </a>
+          </li>"
+      )
+
    $('.ajax-users-select').each (i, select) =>
      @skipLdap = $(select).hasClass('skip_ldap')
      @projectId = $(select).data('project-id')

--- a/app/assets/stylesheets/framework.scss
+++ b/app/assets/stylesheets/framework.scss
@@ -11,6 +11,7 @@
 @import "framework/calendar.scss";
 @import "framework/callout.scss";
 @import "framework/common.scss";
+@import "framework/dropdowns.scss";
 @import "framework/files.scss";
 @import "framework/filters.scss";
 @import "framework/flash.scss";

--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -28,6 +28,10 @@
  border-bottom: 1px solid $border-color;
  color: $gl-gray;

+  a {
+    color: $md-link-color;
+  }
+
  &.oneline-block {
    line-height: 42px;
  }
@@ -153,3 +157,7 @@
    float: right;
  }
 }
+
+.content-block-small {
+  padding: 10px 0;
+}
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -143,6 +143,19 @@
  }
 }

+.btn-transparent {
+  color: $btn-transparent-color;
+  background-color: transparent;
+  border: 0;
+
+  &:hover,
+  &:active,
+  &:focus {
+    background-color: transparent;
+    box-shadow: none;
+  }
+}
+
 .btn-block {
  width: 100%;
  margin: 0;

--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -6,13 +6,19 @@
 .cdark { color: #444 }

 /** COMMON CLASSES **/
+.prepend-top-0 { margin-top: 0; }
+.prepend-top-5 { margin-top: 5px; }
 .prepend-top-10 { margin-top:10px }
 .prepend-top-default { margin-top: $gl-padding !important; }
 .prepend-top-20 { margin-top:20px }
 .prepend-left-10 { margin-left:10px }
+.prepend-left-default { margin-left: $gl-padding; }
 .prepend-left-20 { margin-left:20px }
+.append-right-5 { margin-right: 5px }
 .append-right-10 { margin-right:10px }
+.append-right-default { margin-right: $gl-padding; }
 .append-right-20 { margin-right:20px }
+.append-bottom-0 { margin-bottom:0 }
 .append-bottom-10 { margin-bottom:10px }
 .append-bottom-15 { margin-bottom:15px }
 .append-bottom-20 { margin-bottom:20px }
@@ -56,25 +62,6 @@ hr {
  margin: $gl-padding 0;
 }

-.dropdown-menu {
-  margin: 6px 0 0;
-}
-
-.dropdown-menu > li > a {
-  text-shadow: none;
-}
-
-.dropdown-menu-align-right {
-  left: auto;
-  right: 0px;
-}
-
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus {
-  background: $gl-primary;
-  color: #FFF;
-}
-
 .str-truncated {
  @include str-truncated;
 }
@@ -314,7 +301,7 @@ table {
 }

 .btn-sign-in {
-  margin-top: 8px;
+  margin-top: 10px;
  text-shadow: none;
 }


--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  margin-left: 2px;
+  vertical-align: middle;
+  border-top: $caret-width-base dashed $dropdown-caret-color;
+  border-right: $caret-width-base solid transparent;
+  border-left: $caret-width-base solid transparent;
+}
+
+.dropdown {
+  position: relative;
+}
+
+.open {
+  .dropdown-menu {
+    display: block;
+  }
+
+  .dropdown-menu-toggle {
+    border-color: $dropdown-toggle-hover-border-color;
+
+    .fa {
+      color: $dropdown-toggle-hover-icon-color;
+    }
+  }
+}
+
+.dropdown-menu-toggle {
+  position: relative;
+  width: 160px;
+  padding: 6px 20px 6px 10px;
+  background-color: $dropdown-toggle-bg;
+  color: $dropdown-toggle-color;
+  font-size: 15px;
+  text-align: left;
+  border: 1px solid $dropdown-toggle-border-color;
+  border-radius: 2px;
+  outline: 0;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+
+  .fa {
+    position: absolute;
+    top: 50%;
+    right: 6px;
+    margin-top: -4px;
+    color: $dropdown-toggle-icon-color;
+    font-size: 10px;
+  }
+
+  &:hover, {
+    border-color: $dropdown-toggle-hover-border-color;
+
+    .fa {
+      color: $dropdown-toggle-hover-icon-color;
+    }
+  }
+}
+
+.dropdown-menu {
+  display: none;
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 9;
+  width: 240px;
+  margin-top: 2px;
+  margin-bottom: 0;
+  padding: 10px 10px;
+  font-size: 14px;
+  font-weight: normal;
+  background-color: $dropdown-bg;
+  border: 1px solid $dropdown-border-color;
+  border-radius: $border-radius-base;
+  box-shadow: 0 2px 4px $dropdown-shadow-color;
+
+  &.is-loading {
+    .dropdown-content {
+      display: none;
+    }
+
+    .dropdown-loading {
+      display: block;
+    }
+  }
+
+  ul {
+    margin: 0;
+    padding: 0;
+  }
+
+  li {
+    text-align: left;
+    list-style: none;
+  }
+
+  .divider {
+    width: 100%;
+    height: 1px;
+    margin-top: 8px;
+    margin-bottom: 8px;
+    background-color: $dropdown-divider-color;
+  }
+
+  a {
+    display: block;
+    position: relative;
+    padding-left: 10px;
+    padding-right: 10px;
+    color: $dropdown-link-color;
+    line-height: 34px;
+    text-overflow: ellipsis;
+    border-radius: 2px;
+    white-space: nowrap;
+    overflow: hidden;
+
+    &:hover,
+    &:focus,
+    &.is-focused {
+      background-color: $dropdown-link-hover-bg;
+      text-decoration: none;
+      outline: 0;
+    }
+  }
+}
+
+.dropdown-menu-paging {
+  .dropdown-page-two,
+  .dropdown-menu-back {
+    display: none;
+  }
+
+  &.is-page-two {
+    .dropdown-page-one {
+      display: none;
+    }
+
+    .dropdown-page-two,
+    .dropdown-menu-back {
+      display: block;
+    }
+  }
+}
+
+.dropdown-menu-user {
+  .avatar {
+    float: left;
+    width: 30px;
+    height: 30px;
+    margin: 0 10px 0 0;
+  }
+}
+
+.dropdown-menu-user-link {
+  padding-top: 7px;
+  padding-bottom: 7px;
+}
+
+.dropdown-menu-user-full-name {
+  display: block;
+  margin-bottom: 2px;
+  font-weight: 600;
+  line-height: 1;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.dropdown-menu-user-username {
+  display: block;
+  line-height: 1;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+}
+
+.dropdown-select {
+  width: 280px;
+}
+
+.dropdown-menu-align-right {
+  left: auto;
+  right: 0;
+}
+
+.dropdown-menu-selectable {
+  a {
+    padding-left: 25px;
+
+    &.is-active {
+      &::before {
+        content: "\f00c";
+        position: absolute;
+        left: 5px;
+        top: 50%;
+        margin-top: -7px;
+        font: normal normal normal 14px/1 FontAwesome;
+        font-size: inherit;
+        text-rendering: auto;
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+      }
+    }
+  }
+}
+
+.dropdown-header {
+  padding-left: 5px;
+  padding-right: 5px;
+  color: $dropdown-header-color;
+  font-size: 13px;
+  line-height: 22px;
+}
+
+.dropdown-title {
+  position: relative;
+  margin-bottom: 10px;
+  padding-left: 30px;
+  padding-right: 30px;
+  padding-bottom: 10px;
+  font-weight: 600;
+  line-height: 1;
+  text-align: center;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  border-bottom: 1px solid $dropdown-divider-color;
+  overflow: hidden;
+}
+
+.dropdown-title-button {
+  position: absolute;
+  top: -1px;
+  padding: 0;
+  color: $dropdown-title-btn-color;
+  font-size: 14px;
+  border: 0;
+  background: none;
+  outline: 0;
+
+  &:hover {
+    color: darken($dropdown-title-btn-color, 15%);
+  }
+}
+
+.dropdown-menu-close {
+  right: 0;
+}
+
+.dropdown-menu-back {
+  left: 0;
+}
+
+.dropdown-input {
+  position: relative;
+  margin-bottom: 10px;
+
+  .fa {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    color: #C7C7C7;
+    font-size: 12px;
+    pointer-events: none;
+  }
+}
+
+.dropdown-input-field {
+  width: 100%;
+  padding: 0 7px;
+  color: $dropdown-input-color;
+  line-height: 30px;
+  border: 1px solid $dropdown-divider-color;
+  border-radius: 2px;
+  outline: 0;
+
+  &:focus {
+    color: $dropdown-link-color;
+    border-color: $dropdown-input-focus-border;
+    box-shadow: 0 0 4px $dropdown-input-focus-shadow;
+
+    + .fa {
+      color: $dropdown-link-color;
+    }
+  }
+
+  &:hover {
+    + .fa {
+      color: $dropdown-link-color;
+    }
+  }
+}
+
+.dropdown-content {
+  max-height: 215px;
+  overflow-y: scroll;
+}
+
+.dropdown-footer {
+  padding-top: 10px;
+  margin-top: 10px;
+  font-size: 13px;
+  border-top: 1px solid $dropdown-divider-color;
+}
+
+.dropdown-footer-list {
+  font-size: 14px;
+
+  a {
+    padding-left: 10px;
+  }
+}
+
+.dropdown-loading {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  display: none;
+  z-index: 9;
+  background-color: $dropdown-loading-bg;
+  font-size: 28px;
+
+  .fa {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    margin-top: -14px;
+    margin-left: -14px;
+  }
+}
+
+.dropdown-menu-labels {
+  .label {
+    position: relative;
+    width: 30px;
+    margin-right: 5px;
+    text-indent: -99999px;
+  }
+}
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -169,6 +169,7 @@
     */
    &.code {
      padding: 0;
+      -webkit-overflow-scrolling: auto; // See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987
    }
  }
 }

--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
 .filter-item {
  margin-right: 6px;
+  vertical-align: top;
 }

 @media (min-width: 800px)  {

--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -69,6 +69,10 @@ label {
  &.inline-label {
    margin: 0;
  }
+
+  &.label-light {
+    font-weight: 600;
+  }
 }

 .inline-input-group {

--- a/app/assets/stylesheets/framework/issue_box.scss
+++ b/app/assets/stylesheets/framework/issue_box.scss
@@ -5,11 +5,20 @@
 */

 .status-box {
+  
+  /* Extra small devices (phones, less than 768px) */
+  /* No media query since this is the default in Bootstrap */
+  padding: 5px 11px;
+  margin-top: 4px;
+  /* Small devices (tablets, 768px and up) */
+  @media (min-width: $screen-sm-min) {
+    padding: 0 $gl-btn-padding;
+    margin-top: 5px;
+  }
+
  @include border-radius(3px);
  display: block;
  float: left;
-  padding: 0 $gl-btn-padding;
-  margin-top: 5px;
  margin-right: 10px;
  color: #FFF;
  font-size: $gl-font-size;

--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -3,6 +3,7 @@
 *
 */
 .well-list {
+  position: relative;
  margin: 0;
  padding: 0;
  list-style: none;

--- a/app/assets/stylesheets/framework/nav.scss
+++ b/app/assets/stylesheets/framework/nav.scss
@@ -63,7 +63,7 @@
    border-bottom: none;

    /* Small devices (phones, tablets, 768px and lower) */
-    @media (max-width: $screen-sm-min) {
+    @media (max-width: $screen-sm-max) {
      width: 100%;
    }
  }
@@ -79,6 +79,10 @@
    > .dropdown {
      margin-right: $gl-padding-top;
      display: inline-block;
+
+      &:last-child {
+        margin-right: 0;
+      }
    }

    > .btn {

--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -13,7 +13,7 @@
    transition-duration: .3s;
  }

-  .home {
+  .gitlab-text-container-link {
    z-index: 1;
    position: absolute;
    left: 0px;
@@ -27,8 +27,15 @@
  }

  &.right-sidebar-expanded {
+    /* Extra small devices (phones, less than 768px) */
+    /* No media query since this is the default in Bootstrap */
+    padding-right: 0;
+    /* Small devices (tablets, 768px and up) */
+    @media (min-width: $screen-sm-min) {
      padding-right: $gutter_width;
    }
+    
+  }
 }

 .sidebar-wrapper {
@@ -199,8 +206,13 @@
  padding-left: $sidebar_width;

  &.right-sidebar-collapsed {
+    /* Extra small devices (phones, less than 768px) */
+    padding-right: 0;
+    /* Small devices (tablets, 768px and up) */
+    @media (min-width: $screen-sm-min) {
      padding-right: $sidebar_collapsed_width;
    }
+  }

  .sidebar-wrapper {
    width: $sidebar_width;
@@ -225,8 +237,13 @@
  padding-left: $sidebar_collapsed_width;

  &.right-sidebar-collapsed {
+    /* Extra small devices (phones, less than 768px) */
+    padding-right: 0;
+    /* Small devices (tablets, 768px and up) */
+    @media (min-width: $screen-sm-min) {
      padding-right: $sidebar_collapsed_width;
    }
+  }

  .sidebar-wrapper {
    width: $sidebar_collapsed_width;
@@ -292,7 +309,13 @@
 }

 .page-sidebar-collapsed {
+  /* Extra small devices (phones, less than 768px) */
+  @include collapsed-sidebar;
+  padding-right: 0;
+  /* Small devices (tablets, 768px and up) */
+  @media (min-width: $screen-sm-min) {
    @include collapsed-sidebar;
+  }
 }

 .page-sidebar-expanded {

--- a/app/assets/stylesheets/framework/tw_bootstrap.scss
+++ b/app/assets/stylesheets/framework/tw_bootstrap.scss
@@ -22,7 +22,7 @@

 // Components
 @import "bootstrap/component-animations";
-@import "bootstrap/dropdowns";
+// @import "bootstrap/dropdowns";
 @import "bootstrap/button-groups";
 @import "bootstrap/input-groups";
 @import "bootstrap/navs";
@@ -167,12 +167,6 @@
  }
 }

-.alert-help {
-  background-color: $background-color;
-  border: 1px solid $border-color;
-  color: $gl-gray;
-}
-
 // Typography =================================================================

 .text-primary,

--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -149,13 +149,13 @@
    }

    &:hover > a.anchor {
-      $size: 16px;
+      $size: 14px;
      position: absolute;
      right: 100%;
      top: 50%;
-      margin-top: -$size/2;
-      margin-right: 0px;
-      padding-right: 20px;
+      margin-top: -11px;
+      margin-right: 0;
+      padding-right: 15px;
      display: inline-block;
      width: $size;
      height: $size;
@@ -196,7 +196,7 @@ body {

 h1, h2, h3, h4, h5, h6 {
  color: $gl-header-color;
-  font-weight: 500;
+  font-weight: 600;
 }

 /** CODE **/

--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -35,6 +35,14 @@ $border-radius-default: 3px;
 $list-title-color: #333333;
 $list-text-color: #555555;

+$btn-transparent-color: #8F8F8F;
+
+$ssh-key-icon-color: #8F8F8F;
+$ssh-key-icon-size: 18px;
+
+$provider-btn-group-border: #E5E5E5;
+$provider-btn-not-active-color: #4688F1;
+
 /*
 * Color schema
 */
@@ -64,7 +72,7 @@ $orange-light: rgba(252, 109, 38, 0.80);
 $orange-normal: #E75E40;
 $orange-dark: #CE5237;

-$red-light: #F43263;
+$red-light: #F06559;
 $red-normal: #E52C5A;
 $red-dark: #D22852;

@@ -88,10 +96,13 @@ $border-orange-light: #fc6d26;
 $border-orange-normal: #CE5237;
 $border-orange-dark: #C14E35;

-$border-red-light: #E52C5A;
+$border-red-light: #F24F41;
 $border-red-normal: #D22852;
 $border-red-dark: #CA264F;

+$help-well-bg: #FAFAFA;
+$help-well-border: #E5E5E5;
+
 /* header */
 $light-grey-header: #faf9f9;

@@ -117,3 +128,34 @@ $deleted: #f77;
 */
 $monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
 $regular_font: 'Source Sans Pro', "Helvetica Neue", Helvetica, Arial, sans-serif;
+
+/*
+* Dropdowns
+*/
+$dropdown-bg: #fff;
+$dropdown-link-color: #555;
+$dropdown-link-hover-bg: rgba(#000, .04);
+$dropdown-border-color: rgba(#000, .1);
+$dropdown-shadow-color: rgba(#000, .1);
+$dropdown-divider-color: rgba(#000, .1);
+$dropdown-header-color: #959494;
+$dropdown-caret-color: #54565B;
+$dropdown-title-btn-color: #BFBFBF;
+$dropdown-input-color: #C7C7C7;
+$dropdown-input-focus-border: rgb(58, 171, 240);
+$dropdown-input-focus-shadow: rgba(#000, .2);
+$dropdown-loading-bg: rgba(#fff, .6);
+
+$dropdown-toggle-bg: #fff;
+$dropdown-toggle-color: #626262;
+$dropdown-toggle-border-color: #EAEAEA;
+$dropdown-toggle-hover-border-color: darken($dropdown-toggle-border-color, 15%);
+$dropdown-toggle-icon-color: #C4C4C4;
+$dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
+
+/*
+ *  Award emoji
+ */
+$award-emoji-menu-bg: #FFF;
+$award-emoji-menu-border: #F1F2F4;
+$award-emoji-new-btn-icon-color: #DCDCDC;
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
 .awards {
-  @include clearfix;
  line-height: 34px;

  .emoji-icon {
    width: 20px;
    height: 20px;
-    margin: 7px 0 0 5px;
-  }
-
-  .award {
-    @include border-radius(5px);
-
-    border: 1px solid;
-    padding: 0px 10px;
-    float: left;
-    margin-right: 5px;
-    border-color: $border-color;
-    cursor: pointer;
-
-    &:hover {
-      background-color: #dce0e5;
-    }
-
-    &.active {
-      border-color: $border-gray-light;
-      background-color: $gray-light;
-
-      &:hover {
-        background-color: #dce0e5;
-      }
-
-      .counter {
-        font-weight: bold;
-      }
-    }
-
-    .icon {
-      float: left;
-      margin-right: 10px;
-    }
-
-    .counter {
-      float: left;
-    }
-  }
-
-  .awards-controls {
-    position: relative;
-    margin-left: 10px;
-    float: left;
-
-    .add-award {
-      font-size: 24px;
-      color: $gl-gray;
-      position: relative;
-      top: 2px;
-
-      &:hover,
-      &:link {
-        text-decoration: none;
-      }
  }
+}

-    .emoji-menu{
+.emoji-menu {
  position: absolute;
  top: 100%;
  left: 0;
+  margin-top: 3px;
  z-index: 1000;
-      display: none;
-      float: left;
  min-width: 160px;
-      padding: 5px 0;
-      margin: 2px 0 0;
  font-size: 14px;
-      text-align: left;
-      list-style: none;
-      background-color: #fff;
-      -webkit-background-clip: padding-box;
-      background-clip: padding-box;
-      border: 1px solid #ccc;
-      border: 1px solid rgba(0,0,0,.15);
-      border-radius: 4px;
-      -webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
+  background-color: $award-emoji-menu-bg;
+  border: 1px solid $award-emoji-menu-border;
+  border-radius: $border-radius-base;
  box-shadow: 0 6px 12px rgba(0,0,0,.175);
+  pointer-events: none;
+  opacity: 0;
+  transform: scale(.2);
+  transform-origin: 0 -45px;
+  transition: all .3s cubic-bezier(.87,-.41,.19,1.44);
+
+  &.is-visible {
+    pointer-events: all;
+    opacity: 1;
+    transform: scale(1);
+  }

  .emoji-menu-content {
    padding: $gl-padding;
@@ -90,36 +37,97 @@
    height: 300px;
    overflow-y: scroll;

-        h5 {
-          clear: left;
+    input.emoji-search{
+      background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAFu0lEQVRIia1WTahkVxH+quqce7vf6zdvJpHoIlkYJ2SiJiIokmQjgoGgIAaEIYuYXWICgojiwkmC4taFwhjcyIDusogEIwwiSSCKPwsdwzAg0SjJ9Izzk5n3+nXfe8+pqizOvd395scfsJqi6dPnnDr11Vc/NJ1OwUTosqJLCmYCHCAC2mSHs+ojZv6AO46Y+20AhIneJsafhPhXVZSXDk7qi+aOLhtQNuBmQtcarAKjTXpn2+l3u2yPunvZSABRucjcAV/eMZuM48/Go/g1d19kc4wq+e8MZjWkbI/P5t2P3RFFbv7SQdyBlBUx8N8OTuqjMcof+N94yMPrY2DMm/ytnb32J0QrY+6AqsHM4Q64O9SKDmerKDD3Oy/tNL9vk342CC8RuU6n0ymCMHb22scu7zQngtASOjUHE1BX4UUAv4b7Ow6qiXCXuz/UdvogAAweDY943/b4cAz0ZlYHXeMsnT07RVb7wMUr8ykI4H5HVkMd5Rcb4/jNURVOL5qErAaAUUdCCIJ5kx5q2nw8m39ImEAAsjpE6PStB0YfMcd1wqqG3Xn7A3PfZyyKnNjaqD4fmE/fCNKshirIyY1xvI+Av6g5QIAIIWX7cJPssboSiBBEeKmsZne0Sb8kzAUWNYyq8NvbDo0fZ6beqxuLmqOOMr/lwOh+YXpXtbjERGja9JyZ9+HxpXKb9Gj5oywRESbj+Cj1ENG1QViTGBl1FbC1We1tbVRfHWIoQkhqH9xbpE92XUbb6VJZ1R4crjRz1JWcDMJvLdoMcyAEhjuwHo8Bfndg3mbszhOY+adVlMtD3po51OwzIQiEaams7oeJhxRw1FFOVpFRRUYIhMBAFRnjOsC8IFHHUA4TQQhgAqpAiIFfGbxkIqj54ayGbL7UoOqHCniAEKHLNr26l+D9wQJzeUwMAnfHvEnLECzZRwRV++d60ptjW9VLZeolEJG6GwCCE0CFVNB+Ay0NEqoQYG4YYFu7B8IEVRt3uRzy/osIoLV9QZimWXGHUMFdmI6M64DUF2Je88R9VZqCSP+QlcF5k+4tCzSsXaqjINuK6UyE0+s/mk6/qFq8oAIL9pqMLhkGsNrOyoOIlszust3aJv0U9+kFdwjTGwWl1YdF+KWlQSZ0Se/psj8yGVdg5tJyfH96EBWmLtoEMwMzMFt031NzGWLLzKhC+KV7H5ZeeaMOPxemma2x68puc0LN3+/u6LJiePS6MKHvn4wu6cPzJj0hsioeMfDrEvjv5r6W9gBvjKJujuKzQ0URIZj75NylvT+mbHfXQa4rwAMaVRTMm/SFyzvNy0yF6+4AM+1ubcSnqkAIUjQKl1RKSbE5jt+vovx1MBqF0WW7/d1Z80ab9BtmuJ3Xk5cJKds9TZt/uLPXvtiTrQ+dIwqfAejUvM1os6FNikXKUHfQ+ekUsXT5u85enJ0CaBSkkGEo1syUQ+DfMdE/4GA1uzupf9zdbzhOmLsF4efHVXjaHHAzmDtGdQRd/Nc5wAEJjNki3XfhyvwVNz80xANrht3LsENY9cBBdN1L9GUyyvFRFZ42t75sBvCQRykbRlU4tT2pPxoCvzx09d4GmPs200M6wKdWSDGK8mppYSWdhAlt0qeaLv+IadXU9/Evq4FAZ8ej+LmtcTxaRX4NWI0Uag5Vg1p5MYg8BnlhXIdPHDow+vTWZvVMVttXDLqkTzZdPj6Qii6cP1cSvIdl3iQkNYyi9HH0I22y+93tY3DcQkTZgQtM+POoCr8x97eylkmtrgKuztrvXJ21x/aNKuqIkZ/fntRfCdcTfhUTAIhRzoDojJD0aSNLLwMzmpT7+JaLtyf1MwDo6qz9djFaUq3t9MlFmy/c1OCSceY9fMsVaL9mvH9ocXdkdWxv1scAePG0THAhMOaLdOw/Gvxfxb1w4eCapyIENUcV5M3/u8FitAxZ25P6GAHT3UX39Srw+QOb1ZffA98Dl2Wy1BYkAAAAAElFTkSuQmCC");
+      background-repeat: no-repeat;
+      background-position: right 5px center;
+      background-size: 16px;
    }
-
-        ul {
-          list-style-type: none;
-          margin-left: -20px;
-          margin-bottom: 20px;
-          overflow: auto;
  }
+}

-        input.emoji-search{
-          background: image-url("icon-search.png") 240px no-repeat;
-        }
+.emoji-menu-list {
+  list-style: none;
+  padding-left: 0;
+  margin-bottom: 0;
+}
+
+.emoji-menu-list-item {
+  padding: 3px;
+  margin-left: 1px;
+  margin-right: 1px;
+}

-        li {
+.emoji-menu-btn {
+  display: block;
  cursor: pointer;
  width: 30px;
  height: 30px;
-          text-align: center;
-          float: left;
-          margin: 3px;
-          list-decorate: none;
-          @include border-radius(5px);
+  padding: 0;
+  background: none;
+  border: 0;
+  border-radius: $border-radius-base;
+  transition: transform .15s cubic-bezier(.3, 0, .2, 2);

  &:hover {
-            background-color: #ccc;
+    background-color: transparent;
+    outline: 0;
+    transform: scale(1.3);
  }
+
+  &:focus,
+  &:active {
+    outline: 0;
  }
+
+  .emoji-icon {
+    display: inline-block;
+    position: relative;
+    top: 3px;
+  }
+}
+
+.award-menu-holder {
+  display: inline-block;
+  position: relative;
+}
+
+.award-control {
+  margin-right: 5px;
+  padding-left: 5px;
+  padding-right: 5px;
+  line-height: 20px;
+  outline: 0;
+
+  &.active,
+  &:active {
+    background-color: $white-dark;
+    box-shadow: none;
+    outline: 0;
+  }
+
+  &.is-loading {
+    .award-control-icon {
+      display: none;
+    }
+
+    .award-control-icon-loading {
+      display: block;
    }
  }
+
+  .icon,
+  .award-control-icon {
+    float: left;
+    margin-right: 5px;
+    font-size: 20px;
+  }
+
+  .award-control-icon-loading {
+    display: none;
+  }
+
+  .award-control-icon {
+    color: $award-emoji-new-btn-icon-color;
  }
 }
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -27,10 +27,25 @@
  }

  .scroll-controls {
-    position: fixed;
-    bottom: 10px;
-    left: 250px;
-    z-index: 100;
+    &.affix-top {
+      position: absolute;
+      top: 10px;
+      right: 25px;
+    }
+
+    &.affix-bottom {
+      position: absolute;
+      right: 25px;
+    }
+
+    &.affix {
+      right: 30px;
+      bottom: 15px;
+
+      @media (min-width: $screen-md-min) {
+        right: 26%;
+      }
+    }

    a {
      display: block;

--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -94,6 +94,7 @@
  position: relative;
  font-family: $monospace_font;
  $left: 12px;
+  overflow: hidden; // See https://gitlab.com/gitlab-org/gitlab-ce/issues/13987
  .max-width-marker {
    width: 72ch;
    color: rgba(0, 0, 0, 0.0);

--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -18,7 +18,8 @@
  }

  .issue-meta {
-    margin-left: 65px
+    display: inline-block;
+    line-height: 20px;
  }
 }


--- a/app/assets/stylesheets/pages/groups.scss
+++ b/app/assets/stylesheets/pages/groups.scss
@@ -44,3 +44,9 @@
    }
  }
 }
+
+.ldap-group-links {
+  .form-actions {
+    margin-bottom: $gl-padding;
+  }
+}
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -151,7 +151,6 @@
  }
 }

-
 .right-sidebar {
  position: fixed;
  top: 58px;
@@ -184,6 +183,13 @@
  }

  &.right-sidebar-collapsed {
+    /* Extra small devices (phones, less than 768px) */
+    display: none;
+    /* Small devices (tablets, 768px and up) */
+    @media (min-width: $screen-sm-min) {
+      display: block
+    }
+
    width: $sidebar_collapsed_width;
    padding-top: 0;

@@ -247,6 +253,10 @@
  }
 }

+.btn-default.gutter-toggle {
+  margin-top: 4px;
+}
+
 .detail-page-description {
  small {
    color: $gray-darkest;

--- a/app/assets/stylesheets/pages/issues.scss
+++ b/app/assets/stylesheets/pages/issues.scss
@@ -99,18 +99,17 @@ form.edit-issue {

    .btn {
      width: 100%;
-      margin-top: -1px;

      &:first-child:not(:last-child) {
-        border-radius: 4px 4px 0 0;
+
      }

      &:not(:first-child):not(:last-child) {
-        border-radius: 0;
+        margin-top: 10px;
      }

      &:last-child:not(:first-child) {
-        border-radius: 0 0 4px 4px;
+        margin-top: 10px;
      }
    }
  }
@@ -134,3 +133,11 @@ form.edit-issue {
  color: $secondary-text;
  margin-left: 52px;
 }
+
+.editor-details {
+  display: block;
+  
+  @media (min-width: $screen-sm-min) {
+    display: inline-block;
+  }
+}
\ No newline at end of file
--- a/app/assets/stylesheets/pages/labels.scss
+++ b/app/assets/stylesheets/pages/labels.scss
@@ -7,6 +7,28 @@
    display: inline-block;
    margin-right: 10px;
  }
+
+  &.suggest-colors-dropdown {
+    margin-bottom: 5px;
+
+    a {
+      @include border-radius(0);
+      width: 36.7px;
+      margin-right: 0;
+      margin-bottom: -5px;
+    }
+  }
+}
+
+.dropdown-label-color-preview {
+  display: none;
+  margin-top: 5px;
+  width: 100%;
+  height: 25px;
+
+  &.is-active {
+    display: block;
+  }
 }

 .label-row {

--- a/app/assets/stylesheets/pages/login.scss
+++ b/app/assets/stylesheets/pages/login.scss
@@ -8,6 +8,10 @@
    max-width: none;
  }

+  .flash-container {
+    margin-bottom: $gl-padding;
+  }
+
  .brand-holder {
    font-size: 18px;
    line-height: 1.5;

--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -19,10 +19,11 @@ li.milestone {
    width: 105px;
  }

-  .issue-row {
+  .issuable-row {
    .color-label {
      border-radius: 2px;
      padding: 3px !important;
+      margin-right: 7px;
    }

    // Issue title
@@ -39,25 +40,20 @@ li.milestone {
    margin-right: 10px;
  }

-  .time-elapsed {
+  .remaining-days {
    color: $orange-light;
  }
 }

-.issues-sortable-list {
-  .issue-detail {
+.issues-sortable-list, .merge_requests-sortable-list {
+  .issuable-detail {
    display: block;
+    margin-top: 7px;

-    .issue-number{
+    .issuable-number {
      color: rgba(0,0,0,0.44);
      margin-right: 5px;
    }
-    .color-label {
-      padding: 6px 10px;
-      margin-right: 7px;
-      margin-top: 10px;
-    }
-
    .avatar {
      float: none;
    }

--- a/app/assets/stylesheets/pages/notifications.scss
+++ b/app/assets/stylesheets/pages/notifications.scss
-.global-notifications-form .level-title {
-  font-size: 15px;
-  color: #333;
-  font-weight: bold;
+.notification-list-item {
+  line-height: 34px;
 }

-.notification-icon-holder {
-  width: 20px;
-  float: left;
+.notification {
+  position: relative;
+  top: 1px;
+
+  > .fa {
+    font-size: 18px;
+  }
 }

 .ns-part {
-  color: $gl-primary;
+  color: $gl-text-green;
 }

 .ns-watch {

--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
-.account-page {
-  fieldset {
-    margin-bottom: 15px;
-    padding-bottom: 15px;
-  }
-}
-
 .profile-avatar-form-option {
  hr {
    margin: 10px 0;
  }
 }

+.avatar-image {
+  @media (min-width: $screen-sm-min) {
+    float: left;
+    margin-bottom: 0;
+  }
+}
+
+.avatar-file-name {
+  position: relative;
+  top: 2px;
+  display: inline-block;
+}
+
+.account-btn-link,
+.profile-settings-sidebar a {
+  color: $md-link-color;
+}
+
 .oauth-buttons {
  .btn-group {
    margin-right: 10px;
@@ -42,6 +53,18 @@
  }
 }

+.account-well {
+  padding: 10px 10px;
+  background-color: $help-well-bg;
+  border: 1px solid $help-well-border;
+  border-radius: $border-radius-base;
+
+  ul {
+    padding-left: 20px;
+    margin-bottom: 0;
+  }
+}
+
 .calendar-hint {
  margin-top: -12px;
  float: right;
@@ -79,6 +102,13 @@
  margin: auto;
 }

+.user-avatar-button {
+  .file-name {
+    display: inline-block;
+    padding-left: 10px;
+  }
+}
+
 .modal-profile-crop {
  .modal-dialog {
    width: 500px;
@@ -114,3 +144,74 @@
    width: auto;
  }
 }
+
+.key-list-item {
+  .key-list-item-info {
+    @media (min-width: $screen-sm-min) {
+      float: left;
+    }
+  }
+
+  .description {
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+}
+
+.key-icon {
+  color: $ssh-key-icon-color;
+  font-size: $ssh-key-icon-size;
+  line-height: 42px;
+}
+
+.key-created-at {
+  line-height: 42px;
+}
+
+.profile-settings-content {
+  a {
+    color: $md-link-color;
+  }
+}
+
+.change-username-title {
+  color: $gl-warning;
+}
+
+.remove-account-title {
+  color: $gl-danger;
+}
+
+.provider-btn-group {
+  display: inline-block;
+  margin-right: 10px;
+  border: 1px solid $provider-btn-group-border;
+  border-radius: 3px;
+
+  &:last-child {
+    margin-right: 0;
+  }
+}
+
+.provider-btn-image {
+  display: inline-block;
+  padding: 5px 10px;
+  border-right: 1px solid $provider-btn-group-border;
+
+  > img {
+    width: 20px;
+  }
+}
+
+.provider-btn {
+  display: inline-block;
+  padding: 5px 10px;
+  margin-left: -3px;
+  line-height: 22px;
+  background-color: $gray-light;
+
+  &.not-active {
+    color: $provider-btn-not-active-color;
+  }
+}
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -49,10 +49,6 @@
    }
  }

-  .project-home-dropdown {
-    margin: 13px 0px 0;
-  }
-
  .notifications-btn {
    margin-top: -28px;

@@ -185,29 +181,6 @@
  }
 }

-.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 ($border-radius-default);
-
-  border: none;
-  padding: 10px 0;
-  font-size: 14px;
-  font-weight: 100;
-
-  li a {
-    color: #5f697a;
-    line-height: 30px;
-
-    &:hover {
-      background-color: #3084bb !important;
-    }
-  }
-
-  i {
-    margin-right: 8px;
-  }
-}
-
 .project-visibility-level-holder {
  .radio {
    margin-bottom: 10px;

--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
 .search-results {
  .search-result-row {
-    border-bottom: 1px solid #DDD;
-    padding-bottom: 15px;
-    margin-bottom: 15px;
+    border-bottom: 1px solid $border-color;
+    padding-bottom: $gl-padding;
+    margin-bottom: $gl-padding;
+
+    &:last-child {
+      border-bottom: none;
+    }
  }
 }


--- a/app/assets/stylesheets/pages/snippets.scss
+++ b/app/assets/stylesheets/pages/snippets.scss
@@ -26,5 +26,13 @@
  margin-right: 10px;
  font-size: $gl-font-size;
  border: 1px solid;
-  line-height: 40px;
+  line-height: 32px;
+}
+
+.markdown-snippet-copy {
+  position: fixed;
+  top: -10px;
+  left: -10px;
+  max-height: 0;
+  max-width: 0;
 }
--- a/app/assets/stylesheets/pages/todos.scss
+++ b/app/assets/stylesheets/pages/todos.scss
@@ -8,6 +8,7 @@
    .badge.todos-pending-count {
      background-color: #7f8fa4;
      margin-top: -5px;
+      font-weight: normal;
    }
  }
 }

--- a/app/controllers/admin/geo_nodes_controller.rb
+++ b/app/controllers/admin/geo_nodes_controller.rb
+class Admin::GeoNodesController < Admin::ApplicationController
+  def index
+    @nodes = GeoNode.all
+    @node = GeoNode.new
+  end
+
+  def create
+    @node = GeoNode.new(geo_node_params)
+
+    if @node.save
+      redirect_to admin_geo_nodes_path, notice: 'Node was successfully created.'
+    else
+      @nodes = GeoNode.all
+      render :index
+    end
+  end
+
+  def destroy
+    @node = GeoNode.find(params[:id])
+    @node.destroy
+
+    redirect_to admin_geo_nodes_path, notice: 'Node was successfully removed.'
+  end
+
+  def repair
+    @node = GeoNode.find(params[:id])
+
+    if @node.primary? || !@node.missing_oauth_application?
+      flash[:notice] = "This node doesn't need to be repaired."
+    elsif @node.save
+      flash[:notice] = 'Node Authentication was successfully repaired.'
+    else
+      flash[:alert] = 'There was a problem repairing Node Authentication.'
+    end
+
+    redirect_to admin_geo_nodes_path
+  end
+
+  private
+
+  def geo_node_params
+    params.require(:geo_node).permit(:url, :primary, geo_node_key_attributes: [:key])
+  end
+end
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -55,7 +55,7 @@ class Admin::GroupsController < Admin::ApplicationController
  private

  def group
-    @group = Group.find_by(path: params[:id])
+    @group ||= Group.find_by(path: params[:id])
  end

  def group_params

--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -102,12 +102,12 @@ class ApplicationController < ActionController::Base
      flash[:alert] = "Your account is blocked. Retry when an admin has unblocked it."
      new_user_session_path
    else
-      stored_location_for(:geo_node) || stored_location_for(:redirect) || stored_location_for(resource) || root_path
+      stored_location_for(:redirect) || stored_location_for(resource) || root_path
    end
  end

  def after_sign_out_path_for(resource)
-    if Gitlab::Geo.readonly?
+    if Gitlab::Geo.secondary?
      Gitlab::Geo.primary_node.url
    else
      current_application_settings.after_sign_out_path || new_user_session_path
@@ -250,6 +250,8 @@ class ApplicationController < ActionController::Base

  def ldap_security_check
    if current_user && current_user.requires_ldap_check?
+      return unless current_user.try_obtain_ldap_lease
+
      unless Gitlab::LDAP::Access.allowed?(current_user)
        sign_out current_user
        flash[:alert] = "Access denied for your LDAP account."

--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -3,6 +3,7 @@ module Ci
    before_action :project
    before_action :authorize_read_project!, except: [:badge]
    before_action :no_cache, only: [:badge]
+    skip_before_action :authenticate_user!, only: [:badge]
    protect_from_forgery

    def show
@@ -18,6 +19,7 @@ module Ci
    #
    def badge
      return render_404 unless @project
+
      image = Ci::ImageForBuildService.new.execute(@project, params)
      send_file image.path, filename: image.name, disposition: 'inline', type:"image/svg+xml"
    end

--- a/app/controllers/concerns/continue_params.rb
+++ b/app/controllers/concerns/continue_params.rb
+module ContinueParams
+  extend ActiveSupport::Concern
+
+  def continue_params
+    continue_params = params[:continue]
+    return nil unless continue_params
+
+    continue_params = continue_params.permit(:to, :notice, :notice_now)
+    return unless continue_params[:to] && continue_params[:to].start_with?('/')
+
+    continue_params
+  end
+end
--- a/app/controllers/concerns/filter_projects.rb
+++ b/app/controllers/concerns/filter_projects.rb
+# == FilterProjects
+#
+# Controller concern to handle projects filtering
+# * by name
+# * by archived state
+#
+module FilterProjects
+  extend ActiveSupport::Concern
+
+  def filter_projects(projects)
+    projects = projects.search(params[:filter_projects]) if params[:filter_projects].present?
+    projects = projects.non_archived if params[:archived].blank?
+    projects
+  end
+end
--- a/app/controllers/concerns/issues_action.rb
+++ b/app/controllers/concerns/issues_action.rb
@@ -2,7 +2,7 @@ module IssuesAction
  extend ActiveSupport::Concern

  def issues
-    @issues = get_issues_collection
+    @issues = get_issues_collection.non_archived
    @issues = @issues.page(params[:page]).per(ApplicationController::PER_PAGE)
    @issues = @issues.preload(:author, :project)


--- a/app/controllers/concerns/merge_requests_action.rb
+++ b/app/controllers/concerns/merge_requests_action.rb
@@ -2,7 +2,7 @@ module MergeRequestsAction
  extend ActiveSupport::Concern

  def merge_requests
-    @merge_requests = get_merge_requests_collection
+    @merge_requests = get_merge_requests_collection.non_archived
    @merge_requests = @merge_requests.page(params[:page]).per(ApplicationController::PER_PAGE)
    @merge_requests = @merge_requests.preload(:author, :target_project)


--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
 class Dashboard::ProjectsController < Dashboard::ApplicationController
+  include FilterProjects
+
  before_action :event_filter

  def index
-    @projects = current_user.authorized_projects.sorted_by_activity.non_archived
-    @projects = @projects.sort(@sort = params[:sort])
+    @projects = current_user.authorized_projects.sorted_by_activity
+    @projects = filter_projects(@projects)
    @projects = @projects.includes(:namespace)
+    @projects = @projects.sort(@sort = params[:sort])
+    @projects = @projects.page(params[:page]).per(PER_PAGE)

-    terms = params['filter_projects']
-
-    if terms.present?
-      @projects = @projects.search(terms)
-    end
-
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if terms.blank?
    @last_push = current_user.recent_push

    respond_to do |format|
@@ -31,17 +28,12 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
  end

  def starred
-    @projects = current_user.starred_projects
+    @projects = current_user.starred_projects.sorted_by_activity
+    @projects = filter_projects(@projects)
    @projects = @projects.includes(:namespace, :forked_from_project, :tags)
    @projects = @projects.sort(@sort = params[:sort])
+    @projects = @projects.page(params[:page]).per(PER_PAGE)

-    terms = params['filter_projects']
-
-    if terms.present?
-      @projects = @projects.search(terms)
-    end
-
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if terms.blank?
    @last_push = current_user.recent_push
    @groups = []


--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
 class Explore::ProjectsController < Explore::ApplicationController
+  include FilterProjects
+
  def index
    @projects = ProjectsFinder.new.execute(current_user)
    @tags = @projects.tags_on(:tags)
    @projects = @projects.tagged_with(params[:tag]) if params[:tag].present?
    @projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present?
-    @projects = @projects.non_archived
-    @projects = @projects.search(params[:search]) if params[:search].present?
-    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
+    @projects = filter_projects(@projects)
    @projects = @projects.sort(@sort = params[:sort])
-    @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
+    @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE)

    respond_to do |format|
      format.html
@@ -22,9 +22,8 @@ class Explore::ProjectsController < Explore::ApplicationController

  def trending
    @projects = TrendingProjectsFinder.new.execute(current_user)
-    @projects = @projects.non_archived
-    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
+    @projects = filter_projects(@projects)
+    @projects = @projects.page(params[:page]).per(PER_PAGE)

    respond_to do |format|
      format.html
@@ -38,9 +37,9 @@ class Explore::ProjectsController < Explore::ApplicationController

  def starred
    @projects = ProjectsFinder.new.execute(current_user)
-    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
+    @projects = filter_projects(@projects)
    @projects = @projects.reorder('star_count DESC')
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
+    @projects = @projects.page(params[:page]).per(PER_PAGE)

    respond_to do |format|
      format.html

--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
 class GroupsController < Groups::ApplicationController
+  include FilterProjects
  include IssuesAction
  include MergeRequestsAction

@@ -14,7 +15,7 @@ class GroupsController < Groups::ApplicationController

  # Load group projects
  before_action :load_projects, except: [:index, :new, :create, :projects, :edit, :update, :autocomplete]
-  before_action :event_filter, only: [:show, :events]
+  before_action :event_filter, only: [:activity]

  layout :determine_layout

@@ -41,7 +42,8 @@ class GroupsController < Groups::ApplicationController
  def show
    @last_push = current_user.recent_push if current_user
    @projects = @projects.includes(:namespace)
-    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
+    @projects = filter_projects(@projects)
+    @projects = @projects.sort(@sort = params[:sort])
    @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?

    @shared_projects = @group.shared_projects
@@ -62,8 +64,10 @@ class GroupsController < Groups::ApplicationController
    end
  end

-  def events
+  def activity
    respond_to do |format|
+      format.html
+
      format.json do
        load_events
        pager_json("events/_events", @events.count)
@@ -106,7 +110,7 @@ class GroupsController < Groups::ApplicationController
  end

  def load_projects
-    @projects ||= ProjectsFinder.new.execute(current_user, group: group).sorted_by_activity.non_archived
+    @projects ||= ProjectsFinder.new.execute(current_user, group: group).sorted_by_activity
  end

  # Dont allow unauthorized access to group

--- a/app/controllers/oauth/geo_auth_controller.rb
+++ b/app/controllers/oauth/geo_auth_controller.rb
+class Oauth::GeoAuthController < ActionController::Base
+  rescue_from Gitlab::Geo::OauthApplicationUndefinedError, with: :undefined_oauth_application
+  rescue_from OAuth2::Error, with: :auth
+
+  def auth
+    oauth = Gitlab::Geo::OauthSession.new(state: params[:state])
+    unless oauth.is_oauth_state_valid?
+      redirect_to root_url
+      return
+    end
+
+    redirect_to oauth.authorize_url(redirect_uri: oauth_geo_callback_url, state: params[:state])
+  end
+
+  def callback
+    oauth = Gitlab::Geo::OauthSession.new(state: params[:state])
+    unless oauth.is_oauth_state_valid?
+      redirect_to new_user_sessions_path
+      return
+    end
+
+    token = oauth.get_token(params[:code], redirect_uri: oauth_geo_callback_url)
+    remote_user = oauth.authenticate_with_gitlab(token)
+
+    user = User.find(remote_user['id'])
+
+    if user && sign_in(user, bypass: true)
+      return_to = oauth.get_oauth_state_return_to
+      redirect_to(return_to || root_path)
+    else
+      invalid_credentials
+    end
+  end
+
+  private
+
+  def undefined_oauth_application
+    @error = 'There are no OAuth application defined for this Geo node. Please ask your administrator to visit "Geo Nodes" on admin screen and click on "Repair authentication".'
+    render :error, layout: 'errors'
+  end
+end
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -23,6 +23,14 @@ class PasswordsController < Devise::PasswordsController
    end
  end

+  def update
+    super do |resource|
+      if resource.valid? && resource.require_password?
+        resource.update_attribute(:password_automatically_set, false)
+      end
+    end
+  end
+
  protected

  def resource_from_email

--- a/app/controllers/profiles/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -3,23 +3,21 @@ class Profiles::KeysController < Profiles::ApplicationController

  def index
    @keys = current_user.keys
+    @key = Key.new
  end

  def show
    @key = current_user.keys.find(params[:id])
  end

-  def new
-    @key = current_user.keys.new
-  end
-
  def create
    @key = current_user.keys.new(key_params)

    if @key.save
      redirect_to profile_key_path(@key)
    else
-      render 'new'
+      @keys = current_user.keys.select(&:persisted?)
+      render :index
    end
  end


--- a/app/controllers/projects/avatars_controller.rb
+++ b/app/controllers/projects/avatars_controller.rb
@@ -7,6 +7,9 @@ class Projects::AvatarsController < Projects::ApplicationController
    @blob = @repository.blob_at_branch('master', @project.avatar_in_git)
    if @blob
      headers['X-Content-Type-Options'] = 'nosniff'
+
+      return if cached_blob?
+
      headers.store(*Gitlab::Workhorse.send_git_blob(@repository, @blob))
      headers['Content-Disposition'] = 'inline'
      headers['Content-Type'] = safe_content_type(@blob)

--- a/app/controllers/projects/badges_controller.rb
+++ b/app/controllers/projects/badges_controller.rb
 class Projects::BadgesController < Projects::ApplicationController
+  before_action :set_no_cache
+
  def build
    respond_to do |format|
      format.html { render_404 }
@@ -8,4 +10,15 @@ class Projects::BadgesController < Projects::ApplicationController
      end
    end
  end
+
+  private
+
+  def set_no_cache
+    expires_now
+
+    # Add some deprecated headers for older agents
+    #
+    response.headers['Pragma'] = 'no-cache'
+    response.headers['Expires'] = 'Fri, 01 Jan 1990 00:00:00 GMT'
+  end
 end
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -3,6 +3,7 @@
 # Not to be confused with CommitsController, plural.
 class Projects::CommitController < Projects::ApplicationController
  include CreatesCommit
+  include DiffHelper

  # Authorize
  before_action :require_non_empty_project
@@ -100,12 +101,10 @@ class Projects::CommitController < Projects::ApplicationController
  def define_show_vars
    return git_not_found! unless commit

-    if params[:w].to_i == 1
-      @diffs = commit.diffs({ ignore_whitespace_change: true })
-    else
-      @diffs = commit.diffs
-    end
+    opts = diff_options
+    opts[:ignore_whitespace_change] = true if params[:format] == 'diff'

+    @diffs = commit.diffs(opts)
    @diff_refs = [commit.parent || commit, commit]
    @notes_count = commit.notes.count


--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
 require 'addressable/uri'

 class Projects::CompareController < Projects::ApplicationController
+  include DiffHelper
+
  # Authorize
  before_action :require_non_empty_project
  before_action :authorize_download_code!
@@ -11,16 +13,14 @@ class Projects::CompareController < Projects::ApplicationController
  end

  def show
-    diff_options = { ignore_whitespace_change: true } if params[:w] == '1'
-
-    compare_result = CompareService.new.
+    compare = CompareService.new.
      execute(@project, @head_ref, @project, @base_ref, diff_options)

-    if compare_result
-      @commits = Commit.decorate(compare_result.commits, @project)
-      @diffs = compare_result.diffs
+    if compare
+      @commits = Commit.decorate(compare.commits, @project)
      @commit = @project.commit(@head_ref)
      @base_commit = @project.merge_base_commit(@base_ref, @head_ref)
+      @diffs = compare.diffs(diff_options)
      @diff_refs = [@base_commit, @commit]
      @line_notes = []
    end

--- a/app/controllers/projects/forks_controller.rb
+++ b/app/controllers/projects/forks_controller.rb
 class Projects::ForksController < Projects::ApplicationController
+  include ContinueParams
+
  # Authorize
  before_action :require_non_empty_project
  before_action :authorize_download_code!
@@ -6,20 +8,24 @@ class Projects::ForksController < Projects::ApplicationController
  def index
    base_query = project.forks.includes(:creator)

-    @forks = if current_user
-               base_query.where('projects.visibility_level IN (?) OR projects.id IN (?)',
-                                Project.public_and_internal_levels,
-                                current_user.authorized_projects.pluck(:id))
-             else
-               base_query.where('projects.visibility_level = ?', Project::PUBLIC)
-             end
-
+    @forks               = base_query.merge(ProjectsFinder.new.execute(current_user))
    @total_forks_count   = base_query.size
    @private_forks_count = @total_forks_count - @forks.size
    @public_forks_count  = @total_forks_count - @private_forks_count

    @sort  = params[:sort] || 'id_desc'
+    @forks = @forks.search(params[:filter_projects]) if params[:filter_projects].present?
    @forks = @forks.order_by(@sort).page(params[:page]).per(PER_PAGE)
+
+    respond_to do |format|
+      format.html
+
+      format.json do
+        render json: {
+          html: view_to_html_string("projects/forks/_projects", projects: @forks)
+        }
+      end
+    end
  end

  def new
@@ -49,15 +55,4 @@ class Projects::ForksController < Projects::ApplicationController
      render :error
    end
  end
-
-  private
-
-  def continue_params
-    continue_params = params[:continue]
-    if continue_params
-      continue_params.permit(:to, :notice, :notice_now)
-    else
-      nil
-    end
-  end
 end
--- a/app/controllers/projects/imports_controller.rb
+++ b/app/controllers/projects/imports_controller.rb
 class Projects::ImportsController < Projects::ApplicationController
+  include ContinueParams
+
  # Authorize
  before_action :authorize_admin_project!
  before_action :require_no_repo, only: [:new, :create]
@@ -42,16 +44,6 @@ class Projects::ImportsController < Projects::ApplicationController

  private

-  def continue_params
-    continue_params = params[:continue]
-
-    if continue_params
-      continue_params.permit(:to, :notice, :notice_now)
-    else
-      nil
-    end
-  end
-
  def finished_notice
    if @project.forked?
      'The project was successfully forked.'

--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
 class Projects::MergeRequestsController < Projects::ApplicationController
+  include DiffHelper
+
  before_action :module_enabled
  before_action :merge_request, only: [
    :edit, :update, :show, :diffs, :commits, :builds, :merge, :merge_check,
@@ -111,7 +113,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
    @commits = @merge_request.compare_commits.reverse
    @commit = @merge_request.last_commit
    @base_commit = @merge_request.diff_base_commit
-    @diffs = @merge_request.compare_diffs
+    @diffs = @merge_request.compare.diffs(diff_options) if @merge_request.compare

    @ci_commit = @merge_request.ci_commit
    @statuses = @ci_commit.statuses if @ci_commit

--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -32,10 +32,6 @@ class Projects::MilestonesController < Projects::ApplicationController
  end

  def show
-    @issues = @milestone.issues
-    @users = @milestone.participants.uniq
-    @merge_requests = @milestone.merge_requests
-    @labels = @milestone.labels
  end

  def create

--- a/app/controllers/projects/raw_controller.rb
+++ b/app/controllers/projects/raw_controller.rb
@@ -13,6 +13,8 @@ class Projects::RawController < Projects::ApplicationController
    if @blob
      headers['X-Content-Type-Options'] = 'nosniff'

+      return if cached_blob?
+
      if @blob.lfs_pointer?
        send_lfs_object
      else

--- a/app/controllers/projects/tags_controller.rb
+++ b/app/controllers/projects/tags_controller.rb
@@ -34,6 +34,11 @@ class Projects::TagsController < Projects::ApplicationController
  def destroy
    DeleteTagService.new(project, current_user).execute(params[:id])

+    respond_to do |format|
+      format.html do
        redirect_to namespace_project_tags_path(@project.namespace, @project)
      end
+      format.js
+    end
+  end
 end
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
 class ProjectsController < ApplicationController
  include ExtractsPath

-  prepend_before_action :render_go_import, only: [:show]
  skip_before_action :authenticate_user!, only: [:show, :activity]
  before_action :project, except: [:new, :create]
  before_action :repository, except: [:new, :create]
@@ -254,16 +253,6 @@ class ProjectsController < ApplicationController
    end
  end

-  def render_go_import
-    return unless params["go-get"] == "1"
-
-    @namespace = params[:namespace_id]
-    @id = params[:project_id] || params[:id]
-    @id = @id.gsub(/\.git\Z/, "")
-
-    render "go_import", layout: false
-  end
-
  def repo_exists?
    project.repository_exists? && !project.empty_repo?
  end

--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
 class SearchController < ApplicationController
+  skip_before_action :authenticate_user!, :reject_blocked
+
  include SearchHelper

  layout 'search'

--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -4,6 +4,7 @@ class SessionsController < Devise::SessionsController

  skip_before_action :check_2fa_requirement, only: [:destroy]

+  prepend_before_action :check_initial_setup, only: [:new]
  prepend_before_action :authenticate_with_two_factor, only: [:create]
  prepend_before_action :store_redirect_path, only: [:new]
  before_action :gitlab_geo_login, only: [:new]
@@ -34,6 +35,22 @@ class SessionsController < Devise::SessionsController

  private

+  # Handle an "initial setup" state, where there's only one user, it's an admin,
+  # and they require a password change.
+  def check_initial_setup
+    return unless User.count == 1
+
+    user = User.admins.last
+
+    return unless user && user.require_password?
+
+    token = user.generate_reset_token
+    user.save
+
+    redirect_to edit_user_password_path(reset_password_token: token),
+      notice: "Please create a password for your new account."
+  end
+
  def user_params
    params.require(:user).permit(:login, :password, :remember_me, :otp_attempt)
  end
@@ -91,13 +108,14 @@ class SessionsController < Devise::SessionsController
  end

  def gitlab_geo_login
-    if !signed_in? && Gitlab::Geo.enabled? && Gitlab::Geo.readonly?
+    if !signed_in? && Gitlab::Geo.enabled? && Gitlab::Geo.secondary?
+      oauth = Gitlab::Geo::OauthSession.new
+
      # share full url with primary node by shared session
-      user_return_to = URI.join(root_url, session[:user_return_to]).to_s
-      session[:geo_node_return_to] = @redirect_to || user_return_to
+      user_return_to = URI.join(root_url, session[:user_return_to].to_s).to_s
+      oauth.return_to = @redirect_to || user_return_to

-      login_uri =  URI.join(Gitlab::Geo.primary_node.url, new_session_path(:user)).to_s
-      redirect_to login_uri
+      redirect_to oauth_geo_auth_url(state: oauth.generate_oauth_state)
    end
  end


--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,13 +3,6 @@ class UsersController < ApplicationController
  before_action :set_user

  def show
-    @contributed_projects = contributed_projects.joined(@user).reject(&:forked?)
-    
-    @projects = PersonalProjectsFinder.new(@user).execute(current_user)
-    @projects = @projects.page(params[:page]).per(PER_PAGE)
-
-    @groups = @user.groups.order_id_desc
-
    respond_to do |format|
      format.html

@@ -25,6 +18,45 @@ class UsersController < ApplicationController
    end
  end

+  def groups
+    load_groups
+
+    respond_to do |format|
+      format.html { render 'show' }
+      format.json do
+        render json: {
+          html: view_to_html_string("shared/groups/_list", groups: @groups)
+        }
+      end
+    end
+  end
+
+  def projects
+    load_projects
+
+    respond_to do |format|
+      format.html { render 'show' }
+      format.json do
+        render json: {
+          html: view_to_html_string("shared/projects/_list", projects: @projects, remote: true)
+        }
+      end
+    end
+  end
+
+  def contributed
+    load_contributed_projects
+
+    respond_to do |format|
+      format.html { render 'show' }
+      format.json do
+        render json: {
+          html: view_to_html_string("shared/projects/_list", projects: @contributed_projects)
+        }
+      end
+    end
+  end
+
  def calendar
    calendar = contributions_calendar
    @timestamps = calendar.timestamps
@@ -35,12 +67,8 @@ class UsersController < ApplicationController
  end

  def calendar_activities
-    @calendar_date = Date.parse(params[:date]) rescue nil
-    @events = []
-
-    if @calendar_date
+    @calendar_date = Date.parse(params[:date]) rescue Date.today
    @events = contributions_calendar.events_by_date(@calendar_date)
-    end

    render 'calendar_activities', layout: false
  end
@@ -69,6 +97,20 @@ class UsersController < ApplicationController
      limit_recent(20, params[:offset])
  end

+  def load_projects
+    @projects =
+      PersonalProjectsFinder.new(@user).execute(current_user)
+      .page(params[:page]).per(PER_PAGE)
+  end
+
+  def load_contributed_projects
+    @contributed_projects = contributed_projects.joined(@user)
+  end
+
+  def load_groups
+    @groups = @user.groups.order_id_desc
+  end
+
  def projects_for_current_user
    ProjectsFinder.new.execute(current_user)
  end

--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -245,10 +245,17 @@ class IssuableFinder
    items
  end

+  def filter_by_upcoming_milestone?
+    params[:milestone_title] == '#upcoming'
+  end
+
  def by_milestone(items)
    if milestones?
      if filter_by_no_milestone?
        items = items.where(milestone_id: [-1, nil])
+      elsif filter_by_upcoming_milestone?
+        upcoming = Milestone.where(project_id: projects).upcoming
+        items = items.joins(:milestone).where(milestones: { title: upcoming.title })
      else
        items = items.joins(:milestone).where(milestones: { title: params[:milestone_title] })

@@ -264,11 +271,9 @@ class IssuableFinder
  def by_label(items)
    if labels?
      if filter_by_no_label?
-        items = items.
-          joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{klass.name}' AND label_links.target_id = #{klass.table_name}.id").
-          where(label_links: { id: nil })
+        items = items.without_label
      else
-        items = items.joins(:labels).where(labels: { title: label_names })
+        items = items.with_label(label_names)

        if projects
          items = items.where(labels: { project_id: projects })

--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
@@ -53,7 +53,10 @@ class ProjectsFinder

  def all_projects(current_user)
    if current_user
-      [current_user.authorized_projects, public_and_internal_projects]
+      [
+        current_user.authorized_projects,
+        public_and_internal_projects
+      ]
    else
      [Project.public_only]
    end

--- a/app/finders/snippets_finder.rb
+++ b/app/finders/snippets_finder.rb
@@ -4,7 +4,7 @@ class SnippetsFinder

    case filter
    when :all then
-      snippets(current_user).fresh.non_expired
+      snippets(current_user).fresh
    when :by_user then
      by_user(current_user, params[:user], params[:scope])
    when :by_project
@@ -27,7 +27,7 @@ class SnippetsFinder
  end

  def by_user(current_user, user, scope)
-    snippets = user.snippets.fresh.non_expired
+    snippets = user.snippets.fresh

    return snippets.are_public unless current_user

@@ -48,7 +48,7 @@ class SnippetsFinder
  end

  def by_project(current_user, project)
-    snippets = project.snippets.fresh.non_expired
+    snippets = project.snippets.fresh

    if current_user
      if project.team.member?(current_user.id)

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -72,7 +72,7 @@ module ApplicationHelper
    if user_or_email.is_a?(User)
      user = user_or_email
    else
-      user = User.find_by(email: user_or_email.downcase)
+      user = User.find_by_any_email(user_or_email.try(:downcase))
    end

    if user

--- a/app/helpers/blob_helper.rb
+++ b/app/helpers/blob_helper.rb
@@ -152,4 +152,25 @@ module BlobHelper
      'application/octet-stream'
    end
  end
+
+  def cached_blob?
+    stale = stale?(etag: @blob.id) # The #stale? method sets cache headers.
+
+    # Because we are opionated we set the cache headers ourselves.
+    response.cache_control[:public] = @project.public?
+
+    if @ref && @commit && @ref == @commit.id
+      # This is a link to a commit by its commit SHA. That means that the blob
+      # is immutable. The only reason to invalidate the cache is if the commit
+      # was deleted or if the user lost access to the repository.
+      response.cache_control[:max_age] = Blob::CACHE_TIME_IMMUTABLE
+    else
+      # A branch or tag points at this blob. That means that the expected blob
+      # value may change over time.
+      response.cache_control[:max_age] = Blob::CACHE_TIME
+    end
+
+    response.etag = @blob.id
+    !stale
+  end
 end
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -42,12 +42,12 @@ module CiStatusHelper
    icon(icon_name + ' fw')
  end

-  def render_ci_status(ci_commit)
+  def render_ci_status(ci_commit, tooltip_placement: 'auto left')
    link_to ci_status_icon(ci_commit),
      ci_status_path(ci_commit),
      class: "ci-status-link ci-status-icon-#{ci_commit.status.dasherize}",
      title: "Build #{ci_status_label(ci_commit)}",
-      data: { toggle: 'tooltip', placement: 'left' }
+      data: { toggle: 'tooltip', placement: tooltip_placement }
  end

  def no_runners_for_project?(project)

--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -211,4 +211,15 @@ module CommitsHelper
  def clean(string)
    Sanitize.clean(string, remove_contents: true)
  end
+
+  def limited_commits(commits)
+    if commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
+      [
+        commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE),
+        commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE
+      ]
+    else
+      [commits, 0]
+    end
+  end
 end
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -12,40 +12,20 @@ module DiffHelper
    params[:view] == 'parallel' ? 'parallel' : 'inline'
  end

-  def allowed_diff_size
-    if diff_hard_limit_enabled?
-      Commit::DIFF_HARD_LIMIT_FILES
-    else
-      Commit::DIFF_SAFE_FILES
-    end
+  def diff_hard_limit_enabled?
+    params[:force_show_diff].present?
  end

-  def allowed_diff_lines
+  def diff_options
+    options = { ignore_whitespace_change: params[:w] == '1' }
    if diff_hard_limit_enabled?
-      Commit::DIFF_HARD_LIMIT_LINES
-    else
-      Commit::DIFF_SAFE_LINES
+      options.merge!(Commit.max_diff_options)
    end
+    options
  end

  def safe_diff_files(diffs, diff_refs)
-    lines = 0
-    safe_files = []
-    diffs.first(allowed_diff_size).each do |diff|
-      lines += diff.diff.lines.count
-      break if lines > allowed_diff_lines
-      safe_files << Gitlab::Diff::File.new(diff, diff_refs)
-    end
-    safe_files
-  end
-
-  def diff_hard_limit_enabled?
-    # Enabling hard limit allows user to see more diff information
-    if params[:force_show_diff].present?
-      true
-    else
-      false
-    end
+    diffs.decorate! { |diff| Gitlab::Diff::File.new(diff, diff_refs) }
  end

  def generate_line_code(file_path, line)

--- a/app/helpers/dropdowns_helper.rb
+++ b/app/helpers/dropdowns_helper.rb
+module DropdownsHelper
+  def dropdown_tag(toggle_text, options: {}, &block)
+    content_tag :div, class: "dropdown" do
+      data_attr = { toggle: "dropdown" }
+
+      if options.has_key?(:data)
+        data_attr = options[:data].merge(data_attr)
+      end
+
+      dropdown_output = dropdown_toggle(toggle_text, data_attr, options)
+
+      dropdown_output << content_tag(:div, class: "dropdown-menu dropdown-select #{options[:dropdown_class] if options.has_key?(:dropdown_class)}") do
+        output = ""
+
+        if options.has_key?(:title)
+          output << dropdown_title(options[:title])
+        end
+
+        if options.has_key?(:filter)
+          output << dropdown_filter(options[:placeholder])
+        end
+
+        output << content_tag(:div, class: "dropdown-content") do
+          capture(&block) if block && !options.has_key?(:footer_content)
+        end
+
+        if block && options.has_key?(:footer_content)
+          output << content_tag(:div, class: "dropdown-footer") do
+            capture(&block)
+          end
+        end
+
+        output << dropdown_loading
+
+        output.html_safe
+      end
+
+      dropdown_output.html_safe
+    end
+  end
+
+  def dropdown_toggle(toggle_text, data_attr, options)
+    content_tag(:button, class: "dropdown-menu-toggle #{options[:toggle_class] if options.has_key?(:toggle_class)}", id: (options[:id] if options.has_key?(:id)), type: "button", data: data_attr) do
+      output = content_tag(:span, toggle_text, class: "dropdown-toggle-text")
+      output << icon('chevron-down')
+      output.html_safe
+    end
+  end
+
+  def dropdown_title(title, back: false)
+    content_tag :div, class: "dropdown-title" do
+      title_output = ""
+
+      if back
+        title_output << content_tag(:button, class: "dropdown-title-button dropdown-menu-back", aria: { label: "Go back" }, type: "button") do
+          icon('arrow-left')
+        end
+      end
+
+      title_output << content_tag(:span, title)
+
+      title_output << content_tag(:button, class: "dropdown-title-button dropdown-menu-close", aria: { label: "Close" }, type: "button") do
+        icon('times')
+      end
+
+      title_output.html_safe
+    end
+  end
+
+  def dropdown_filter(placeholder)
+    content_tag :div, class: "dropdown-input" do
+      filter_output = search_field_tag nil, nil, class: "dropdown-input-field", placeholder: placeholder
+      filter_output << icon('search')
+
+      filter_output.html_safe
+    end
+  end
+
+  def dropdown_content(&block)
+    content_tag(:div, class: "dropdown-content") do
+      if block
+        capture(&block)
+      end
+    end
+  end
+
+  def dropdown_footer(&block)
+    content_tag(:div, class: "dropdown-footer") do
+      if block
+        capture(&block)
+      end
+    end
+  end
+
+  def dropdown_loading
+    content_tag :div, class: "dropdown-loading" do
+      icon('spinner spin')
+    end
+  end
+end
--- a/app/helpers/explore_helper.rb
+++ b/app/helpers/explore_helper.rb
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
--- a/app/helpers/snippets_helper.rb
+++ b/app/helpers/snippets_helper.rb
--- a/app/helpers/sorting_helper.rb
+++ b/app/helpers/sorting_helper.rb
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
--- a/app/models/concerns/milestoneish.rb
+++ b/app/models/concerns/milestoneish.rb
--- a/app/models/diff_line.rb
+++ b/app/models/diff_line.rb
--- a/app/models/geo_node.rb
+++ b/app/models/geo_node.rb
--- a/app/models/geo_node_key.rb
+++ b/app/models/geo_node_key.rb
--- a/app/models/global_label.rb
+++ b/app/models/global_label.rb
--- a/app/models/global_milestone.rb
+++ b/app/models/global_milestone.rb
--- a/app/models/group.rb
+++ b/app/models/group.rb
--- a/app/models/label.rb
+++ b/app/models/label.rb
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
--- a/app/models/note.rb
+++ b/app/models/note.rb
--- a/app/models/personal_snippet.rb
+++ b/app/models/personal_snippet.rb
--- a/app/models/project.rb
+++ b/app/models/project.rb
--- a/app/models/project_services/ci_service.rb
+++ b/app/models/project_services/ci_service.rb
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
--- a/app/models/project_snippet.rb
+++ b/app/models/project_snippet.rb
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
--- a/app/services/commits/revert_service.rb
+++ b/app/services/commits/revert_service.rb
--- a/app/services/compare_service.rb
+++ b/app/services/compare_service.rb
--- a/app/services/geo/base_service.rb
+++ b/app/services/geo/base_service.rb
--- a/app/services/geo/enqueue_update_service.rb
+++ b/app/services/geo/enqueue_update_service.rb
--- a/app/services/geo/notify_nodes_service.rb
+++ b/app/services/geo/notify_nodes_service.rb
--- a/app/services/geo/schedule_repo_update_service.rb
+++ b/app/services/geo/schedule_repo_update_service.rb
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
--- a/app/services/git_tag_push_service.rb
+++ b/app/services/git_tag_push_service.rb
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
--- a/app/services/merge_requests/post_merge_service.rb
+++ b/app/services/merge_requests/post_merge_service.rb
--- a/app/services/search/global_service.rb
+++ b/app/services/search/global_service.rb
--- a/app/services/search/project_service.rb
+++ b/app/services/search/project_service.rb
--- a/app/services/search/snippet_service.rb
+++ b/app/services/search/snippet_service.rb
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
--- a/app/views/abuse_reports/new.html.haml
+++ b/app/views/abuse_reports/new.html.haml
--- a/app/views/admin/broadcast_messages/_form.html.haml
+++ b/app/views/admin/broadcast_messages/_form.html.haml
--- a/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
--- a/app/views/admin/geo_nodes/index.html.haml
+++ b/app/views/admin/geo_nodes/index.html.haml
--- a/app/views/admin/users/keys.html.haml
+++ b/app/views/admin/users/keys.html.haml
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
--- a/app/views/dashboard/milestones/_issue.html.haml
+++ b/app/views/dashboard/milestones/_issue.html.haml
--- a/app/views/dashboard/milestones/_issues.html.haml
+++ b/app/views/dashboard/milestones/_issues.html.haml
--- a/app/views/dashboard/milestones/_merge_request.html.haml
+++ b/app/views/dashboard/milestones/_merge_request.html.haml
--- a/app/views/dashboard/milestones/_merge_requests.html.haml
+++ b/app/views/dashboard/milestones/_merge_requests.html.haml
--- a/app/views/dashboard/milestones/_milestone.html.haml
+++ b/app/views/dashboard/milestones/_milestone.html.haml
--- a/app/views/dashboard/milestones/show.html.haml
+++ b/app/views/dashboard/milestones/show.html.haml
--- a/app/views/dashboard/projects/_projects.html.haml
+++ b/app/views/dashboard/projects/_projects.html.haml
--- a/app/views/dashboard/projects/index.html.haml
+++ b/app/views/dashboard/projects/index.html.haml
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
--- a/app/views/emojis/index.html.haml
+++ b/app/views/emojis/index.html.haml
--- a/app/views/explore/projects/_dropdown.html.haml
+++ b/app/views/explore/projects/_dropdown.html.haml
--- a/app/views/explore/projects/_filter.html.haml
+++ b/app/views/explore/projects/_filter.html.haml
--- a/app/views/explore/projects/_projects.html.haml
+++ b/app/views/explore/projects/_projects.html.haml
--- a/app/views/explore/projects/index.html.haml
+++ b/app/views/explore/projects/index.html.haml
--- a/app/views/groups/_activities.html.haml
+++ b/app/views/groups/_activities.html.haml
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
--- a/app/views/groups/activity.html.haml
+++ b/app/views/groups/activity.html.haml
--- a/app/views/groups/group_members/_group_member.html.haml
+++ b/app/views/groups/group_members/_group_member.html.haml
--- a/app/views/groups/milestones/_issue.html.haml
+++ b/app/views/groups/milestones/_issue.html.haml
--- a/app/views/groups/milestones/_issues.html.haml
+++ b/app/views/groups/milestones/_issues.html.haml
--- a/app/views/groups/milestones/_merge_request.html.haml
+++ b/app/views/groups/milestones/_merge_request.html.haml
--- a/app/views/groups/milestones/_merge_requests.html.haml
+++ b/app/views/groups/milestones/_merge_requests.html.haml
--- a/app/views/groups/milestones/_milestone.html.haml
+++ b/app/views/groups/milestones/_milestone.html.haml
--- a/app/views/groups/milestones/new.html.haml
+++ b/app/views/groups/milestones/new.html.haml
--- a/app/views/groups/milestones/show.html.haml
+++ b/app/views/groups/milestones/show.html.haml
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
--- a/app/views/help/_shortcuts.html.haml
+++ b/app/views/help/_shortcuts.html.haml
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
--- a/app/views/layouts/ci/_page.html.haml
+++ b/app/views/layouts/ci/_page.html.haml
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
--- a/app/views/layouts/header/_public.html.haml
+++ b/app/views/layouts/header/_public.html.haml
--- a/app/views/layouts/nav/_admin.html.haml
+++ b/app/views/layouts/nav/_admin.html.haml
--- a/app/views/layouts/nav/_group.html.haml
+++ b/app/views/layouts/nav/_group.html.haml
--- a/app/views/layouts/nav/_group_settings.html.haml
+++ b/app/views/layouts/nav/_group_settings.html.haml
--- a/app/views/layouts/nav/_project_settings.html.haml
+++ b/app/views/layouts/nav/_project_settings.html.haml
--- a/app/views/oauth/geo_auth/error.html.haml
+++ b/app/views/oauth/geo_auth/error.html.haml
--- a/app/views/profiles/_event_table.html.haml
+++ b/app/views/profiles/_event_table.html.haml
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
--- a/app/views/profiles/audit_log.html.haml
+++ b/app/views/profiles/audit_log.html.haml
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
--- a/app/views/profiles/keys/_form.html.haml
+++ b/app/views/profiles/keys/_form.html.haml
--- a/app/views/profiles/keys/_key.html.haml
+++ b/app/views/profiles/keys/_key.html.haml
--- a/app/views/profiles/keys/_key_details.html.haml
+++ b/app/views/profiles/keys/_key_details.html.haml
--- a/app/views/profiles/keys/_key_table.html.haml
+++ b/app/views/profiles/keys/_key_table.html.haml
--- a/app/views/profiles/keys/index.html.haml
+++ b/app/views/profiles/keys/index.html.haml
--- a/app/views/profiles/keys/new.html.haml
+++ b/app/views/profiles/keys/new.html.haml
--- a/app/views/profiles/notifications/_settings.html.haml
+++ b/app/views/profiles/notifications/_settings.html.haml
--- a/app/views/profiles/notifications/show.html.haml
+++ b/app/views/profiles/notifications/show.html.haml
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
--- a/app/views/profiles/two_factor_auths/new.html.haml
+++ b/app/views/profiles/two_factor_auths/new.html.haml
--- a/app/views/projects/blob/_editor.html.haml
+++ b/app/views/projects/blob/_editor.html.haml
--- a/app/views/projects/blob/_image.html.haml
+++ b/app/views/projects/blob/_image.html.haml
--- a/app/views/projects/blob/_new_dir.html.haml
+++ b/app/views/projects/blob/_new_dir.html.haml
--- a/app/views/projects/blob/_remove.html.haml
+++ b/app/views/projects/blob/_remove.html.haml
--- a/app/views/projects/blob/_upload.html.haml
+++ b/app/views/projects/blob/_upload.html.haml
--- a/app/views/projects/blob/edit.html.haml
+++ b/app/views/projects/blob/edit.html.haml
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
--- a/app/views/projects/branches/destroy.js.haml
+++ b/app/views/projects/branches/destroy.js.haml
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
--- a/app/views/projects/buttons/_download.html.haml
+++ b/app/views/projects/buttons/_download.html.haml
--- a/app/views/projects/commits/_commit_list.html.haml
+++ b/app/views/projects/commits/_commit_list.html.haml
--- a/app/views/projects/commits/_commits.html.haml
+++ b/app/views/projects/commits/_commits.html.haml
--- a/app/views/projects/commits/_head.html.haml
+++ b/app/views/projects/commits/_head.html.haml
--- a/app/views/projects/diffs/_diffs.html.haml
+++ b/app/views/projects/diffs/_diffs.html.haml
--- a/app/views/projects/diffs/_text_file.html.haml
+++ b/app/views/projects/diffs/_text_file.html.haml
--- a/app/views/projects/diffs/_warning.html.haml
+++ b/app/views/projects/diffs/_warning.html.haml
--- a/app/views/projects/forks/_projects.html.haml
+++ b/app/views/projects/forks/_projects.html.haml
--- a/app/views/projects/forks/index.html.haml
+++ b/app/views/projects/forks/index.html.haml
--- a/app/views/projects/go_import.html.haml
+++ b/app/views/projects/go_import.html.haml
--- a/app/views/projects/hooks/index.html.haml
+++ b/app/views/projects/hooks/index.html.haml
--- a/app/views/projects/issues/_discussion.html.haml
+++ b/app/views/projects/issues/_discussion.html.haml
--- a/app/views/projects/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.html.haml
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
--- a/app/views/projects/labels/_form.html.haml
+++ b/app/views/projects/labels/_form.html.haml
--- a/app/views/projects/labels/_label.html.haml
+++ b/app/views/projects/labels/_label.html.haml
--- a/app/views/projects/merge_requests/_discussion.html.haml
+++ b/app/views/projects/merge_requests/_discussion.html.haml
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.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/merge_requests/show/_diffs.html.haml
+++ b/app/views/projects/merge_requests/show/_diffs.html.haml
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
--- a/app/views/projects/milestones/_form.html.haml
+++ b/app/views/projects/milestones/_form.html.haml
--- a/app/views/projects/milestones/_issue.html.haml
+++ b/app/views/projects/milestones/_issue.html.haml
--- a/app/views/projects/milestones/_issues.html.haml
+++ b/app/views/projects/milestones/_issues.html.haml
--- a/app/views/projects/milestones/_merge_request.html.haml
+++ b/app/views/projects/milestones/_merge_request.html.haml
--- a/app/views/projects/milestones/_merge_requests.html.haml
+++ b/app/views/projects/milestones/_merge_requests.html.haml
--- a/app/views/projects/milestones/_milestone.html.haml
+++ b/app/views/projects/milestones/_milestone.html.haml
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
--- a/app/views/projects/notes/_edit_form.html.haml
+++ b/app/views/projects/notes/_edit_form.html.haml
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
--- a/app/views/projects/releases/edit.html.haml
+++ b/app/views/projects/releases/edit.html.haml
--- a/app/views/projects/tags/destroy.js.haml
+++ b/app/views/projects/tags/destroy.js.haml
--- a/app/views/projects/tags/new.html.haml
+++ b/app/views/projects/tags/new.html.haml
--- a/app/views/projects/wikis/_form.html.haml
+++ b/app/views/projects/wikis/_form.html.haml
--- a/app/views/search/_filter.html.haml
+++ b/app/views/search/_filter.html.haml
--- a/app/views/search/_form.html.haml
+++ b/app/views/search/_form.html.haml
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
--- a/app/views/search/results/_snippet_blob.html.haml
+++ b/app/views/search/results/_snippet_blob.html.haml
--- a/app/views/shared/_commit_message_container.html.haml
+++ b/app/views/shared/_commit_message_container.html.haml
--- a/app/views/shared/_no_ssh.html.haml
+++ b/app/views/shared/_no_ssh.html.haml
--- a/app/views/shared/groups/_list.html.haml
+++ b/app/views/shared/groups/_list.html.haml
--- a/app/views/shared/issuable/_filter.html.haml
+++ b/app/views/shared/issuable/_filter.html.haml
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
--- a/app/views/shared/milestones/_issuable.html.haml
+++ b/app/views/shared/milestones/_issuable.html.haml
--- a/app/views/shared/milestones/_issuables.html.haml
+++ b/app/views/shared/milestones/_issuables.html.haml
--- a/app/views/shared/milestones/_issues_tab.html.haml
+++ b/app/views/shared/milestones/_issues_tab.html.haml
--- a/app/views/shared/milestones/_labels_tab.html.haml
+++ b/app/views/shared/milestones/_labels_tab.html.haml
--- a/app/views/shared/milestones/_merge_requests_tab.haml
+++ b/app/views/shared/milestones/_merge_requests_tab.haml
--- a/app/views/shared/milestones/_milestone.html.haml
+++ b/app/views/shared/milestones/_milestone.html.haml
--- a/app/views/shared/milestones/_participants_tab.html.haml
+++ b/app/views/shared/milestones/_participants_tab.html.haml
--- a/app/views/shared/milestones/_summary.html.haml
+++ b/app/views/shared/milestones/_summary.html.haml
--- a/app/views/shared/milestones/_tabs.html.haml
+++ b/app/views/shared/milestones/_tabs.html.haml
--- a/app/views/shared/milestones/_top.html.haml
+++ b/app/views/shared/milestones/_top.html.haml
--- a/app/views/shared/projects/_dropdown.html.haml
+++ b/app/views/shared/projects/_dropdown.html.haml
--- a/app/views/shared/projects/_list.html.haml
+++ b/app/views/shared/projects/_list.html.haml
--- a/app/views/shared/projects/_project.html.haml
+++ b/app/views/shared/projects/_project.html.haml
--- a/app/views/shared/snippets/_blob.html.haml
+++ b/app/views/shared/snippets/_blob.html.haml
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
--- a/app/views/votes/_votes_block.html.haml
+++ b/app/views/votes/_votes_block.html.haml
--- a/app/workers/geo_bulk_notify_worker.rb
+++ b/app/workers/geo_bulk_notify_worker.rb
--- a/app/workers/geo_repository_update_worker.rb
+++ b/app/workers/geo_repository_update_worker.rb
--- a/app/workers/irker_worker.rb
+++ b/app/workers/irker_worker.rb
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
--- a/config/application.rb
+++ b/config/application.rb
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
--- a/config/initializers/go_get.rb
+++ b/config/initializers/go_get.rb
--- a/config/initializers/mysql_ignore_postgresql_options.rb
+++ b/config/initializers/mysql_ignore_postgresql_options.rb
--- a/config/initializers/postgresql_opclasses_support.rb
+++ b/config/initializers/postgresql_opclasses_support.rb
--- a/config/initializers/relative_url.rb.sample
+++ b/config/initializers/relative_url.rb.sample
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
--- a/config/mail_room.yml
+++ b/config/mail_room.yml
--- a/config/routes.rb
+++ b/config/routes.rb
--- a/db/fixtures/production/001_admin.rb
+++ b/db/fixtures/production/001_admin.rb
--- a/db/migrate/20160204144558_add_real_size_to_merge_request_diffs.rb
+++ b/db/migrate/20160204144558_add_real_size_to_merge_request_diffs.rb
--- a/db/migrate/20160221013512_add_geo_node_key_to_geo_node.rb
+++ b/db/migrate/20160221013512_add_geo_node_key_to_geo_node.rb
--- a/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
+++ b/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
--- a/db/migrate/20160229034258_add_doorkeeper_application_to_geo_node.rb
+++ b/db/migrate/20160229034258_add_doorkeeper_application_to_geo_node.rb
--- a/db/migrate/20160229193553_add_main_language_to_repository.rb
+++ b/db/migrate/20160229193553_add_main_language_to_repository.rb
--- a/db/migrate/20160305220806_remove_expires_at_from_snippets.rb
+++ b/db/migrate/20160305220806_remove_expires_at_from_snippets.rb
--- a/db/migrate/20160307221555_disallow_blank_line_code_on_note.rb
+++ b/db/migrate/20160307221555_disallow_blank_line_code_on_note.rb
--- a/db/migrate/20160309140734_fix_todos.rb
+++ b/db/migrate/20160309140734_fix_todos.rb
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/doc/README.md
+++ b/doc/README.md
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
--- a/doc/api/users.md
+++ b/doc/api/users.md
--- a/doc/ci/README.md
+++ b/doc/ci/README.md
--- a/doc/ci/api/README.md
+++ b/doc/ci/api/README.md
--- a/doc/ci/api/builds.md
+++ b/doc/ci/api/builds.md
--- a/doc/ci/api/commits.md
+++ b/doc/ci/api/commits.md
--- a/doc/ci/api/projects.md
+++ b/doc/ci/api/projects.md
--- a/doc/ci/api/runners.md
+++ b/doc/ci/api/runners.md
--- a/doc/ci/enable_or_disable_ci.md
+++ b/doc/ci/enable_or_disable_ci.md
--- a/doc/ci/examples/README.md
+++ b/doc/ci/examples/README.md
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
--- a/doc/development/README.md
+++ b/doc/development/README.md
--- a/doc/development/benchmarking.md
+++ b/doc/development/benchmarking.md
--- a/doc/development/doc_styleguide.md
+++ b/doc/development/doc_styleguide.md
--- a/doc/development/sql.md
+++ b/doc/development/sql.md
--- a/doc/hooks/custom_hooks.md
+++ b/doc/hooks/custom_hooks.md
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
--- a/doc/install/relative_url.md
+++ b/doc/install/relative_url.md
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
--- a/doc/integration/ldap.md
+++ b/doc/integration/ldap.md
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
--- a/doc/integration/slack.md
+++ b/doc/integration/slack.md
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
--- a/doc/pages/README.md
+++ b/doc/pages/README.md
--- a/doc/pages/img/pages_create_project.png
+++ b/doc/pages/img/pages_create_project.png
--- a/doc/pages/img/pages_create_user_page.png
+++ b/doc/pages/img/pages_create_user_page.png
--- a/doc/pages/img/pages_dns_details.png
+++ b/doc/pages/img/pages_dns_details.png
--- a/doc/pages/img/pages_multiple_domains.png
+++ b/doc/pages/img/pages_multiple_domains.png
--- a/doc/pages/img/pages_new_domain_button.png
+++ b/doc/pages/img/pages_new_domain_button.png
--- a/doc/pages/img/pages_remove.png
+++ b/doc/pages/img/pages_remove.png
--- a/doc/pages/img/pages_upload_cert.png
+++ b/doc/pages/img/pages_upload_cert.png
--- a/doc/project_services/jira.md
+++ b/doc/project_services/jira.md
--- a/doc/raketasks/README.md
+++ b/doc/raketasks/README.md
--- a/doc/raketasks/web_hooks.md
+++ b/doc/raketasks/web_hooks.md
--- a/doc/security/README.md
+++ b/doc/security/README.md
--- a/doc/security/webhooks.md
+++ b/doc/security/webhooks.md
--- a/doc/update/8.4-to-8.5.md
+++ b/doc/update/8.4-to-8.5.md
--- a/doc/update/8.5-to-8.6.md
+++ b/doc/update/8.5-to-8.6.md
--- a/doc/update/8.6-ce-to-ee.md
+++ b/doc/update/8.6-ce-to-ee.md
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.md
--- a/doc/update/upgrader.md
+++ b/doc/update/upgrader.md
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
--- a/doc/workflow/img/todos_icon.png
+++ b/doc/workflow/img/todos_icon.png
--- a/doc/workflow/img/todos_index.png
+++ b/doc/workflow/img/todos_index.png
--- a/doc/workflow/lfs/lfs_administration.md
+++ b/doc/workflow/lfs/lfs_administration.md
--- a/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
+++ b/doc/workflow/lfs/manage_large_binaries_with_git_lfs.md
--- a/doc/workflow/todos.md
+++ b/doc/workflow/todos.md
--- a/features/dashboard/archived_projects.feature
+++ b/features/dashboard/archived_projects.feature
--- a/features/explore/projects.feature
+++ b/features/explore/projects.feature
--- a/features/group/milestones.feature
+++ b/features/group/milestones.feature
--- a/features/groups.feature
+++ b/features/groups.feature
--- a/features/profile/ssh_keys.feature
+++ b/features/profile/ssh_keys.feature
--- a/features/project/badges/build.feature
+++ b/features/project/badges/build.feature
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
--- a/features/project/network_graph.feature
+++ b/features/project/network_graph.feature
--- a/features/search.feature
+++ b/features/search.feature
--- a/features/steps/dashboard/archived_projects.rb
+++ b/features/steps/dashboard/archived_projects.rb
--- a/features/steps/dashboard/issues.rb
+++ b/features/steps/dashboard/issues.rb
--- a/features/steps/dashboard/merge_requests.rb
+++ b/features/steps/dashboard/merge_requests.rb
--- a/features/steps/group/milestones.rb
+++ b/features/steps/group/milestones.rb
--- a/features/steps/groups.rb
+++ b/features/steps/groups.rb
--- a/features/steps/profile/profile.rb
+++ b/features/steps/profile/profile.rb
--- a/features/steps/profile/ssh_keys.rb
+++ b/features/steps/profile/ssh_keys.rb
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
--- a/features/steps/project/badges/build.rb
+++ b/features/steps/project/badges/build.rb
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
--- a/features/steps/project/hooks.rb
+++ b/features/steps/project/hooks.rb
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
--- a/features/steps/project/issues/filter_labels.rb
+++ b/features/steps/project/issues/filter_labels.rb
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
--- a/features/steps/project/issues/milestones.rb
+++ b/features/steps/project/issues/milestones.rb
--- a/features/steps/project/merge_requests.rb
+++ b/features/steps/project/merge_requests.rb
--- a/features/steps/project/merge_requests/acceptance.rb
+++ b/features/steps/project/merge_requests/acceptance.rb
--- a/features/steps/project/merge_requests/revert.rb
+++ b/features/steps/project/merge_requests/revert.rb
--- a/features/steps/project/network_graph.rb
+++ b/features/steps/project/network_graph.rb
--- a/features/steps/project/snippets.rb
+++ b/features/steps/project/snippets.rb
--- a/features/steps/project/source/browse_files.rb
+++ b/features/steps/project/source/browse_files.rb
--- a/features/steps/search.rb
+++ b/features/steps/search.rb
--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
--- a/features/steps/shared/issuable.rb
+++ b/features/steps/shared/issuable.rb
--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
--- a/features/steps/shared/paths.rb
+++ b/features/steps/shared/paths.rb
--- a/features/steps/shared/user.rb
+++ b/features/steps/shared/user.rb
--- a/features/support/env.rb
+++ b/features/support/env.rb
--- a/features/support/rerun.rb
+++ b/features/support/rerun.rb
--- a/features/user.feature
+++ b/features/user.feature
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
--- a/lib/api/geo.rb
+++ b/lib/api/geo.rb
--- a/lib/banzai.rb
+++ b/lib/banzai.rb
--- a/lib/banzai/filter/abstract_reference_filter.rb
+++ b/lib/banzai/filter/abstract_reference_filter.rb
--- a/lib/banzai/filter/gollum_tags_filter.rb
+++ b/lib/banzai/filter/gollum_tags_filter.rb
--- a/lib/banzai/filter/label_reference_filter.rb
+++ b/lib/banzai/filter/label_reference_filter.rb
--- a/lib/banzai/filter/yaml_front_matter_filter.rb
+++ b/lib/banzai/filter/yaml_front_matter_filter.rb
--- a/lib/banzai/filter_array.rb
+++ b/lib/banzai/filter_array.rb
--- a/lib/banzai/pipeline/base_pipeline.rb
+++ b/lib/banzai/pipeline/base_pipeline.rb
--- a/lib/banzai/pipeline/broadcast_message_pipeline.rb
+++ b/lib/banzai/pipeline/broadcast_message_pipeline.rb
--- a/lib/banzai/pipeline/combined_pipeline.rb
+++ b/lib/banzai/pipeline/combined_pipeline.rb
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_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/pre_process_pipeline.rb
+++ b/lib/banzai/pipeline/pre_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/renderer.rb
+++ b/lib/banzai/renderer.rb
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
--- a/lib/elastic/application_search.rb
+++ b/lib/elastic/application_search.rb
--- a/lib/elastic/indexer.rb
+++ b/lib/elastic/indexer.rb
--- a/lib/elastic/issues_search.rb
+++ b/lib/elastic/issues_search.rb
--- a/lib/elastic/merge_requests_search.rb
+++ b/lib/elastic/merge_requests_search.rb
--- a/lib/elastic/milestones_search.rb
+++ b/lib/elastic/milestones_search.rb
--- a/lib/elastic/notes_search.rb
+++ b/lib/elastic/notes_search.rb
--- a/lib/elastic/projects_search.rb
+++ b/lib/elastic/projects_search.rb
--- a/lib/gitlab/authority_analyzer.rb
+++ b/lib/gitlab/authority_analyzer.rb
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
--- a/lib/gitlab/bitbucket_import/importer.rb
+++ b/lib/gitlab/bitbucket_import/importer.rb
--- a/lib/gitlab/compare_result.rb
+++ b/lib/gitlab/compare_result.rb
--- a/lib/gitlab/devise_failure.rb
+++ b/lib/gitlab/devise_failure.rb
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
--- a/lib/gitlab/diff/parser.rb
+++ b/lib/gitlab/diff/parser.rb
--- a/lib/gitlab/elastic/search_results.rb
+++ b/lib/gitlab/elastic/search_results.rb
--- a/lib/gitlab/elastic/snippet_search_results.rb
+++ b/lib/gitlab/elastic/snippet_search_results.rb
--- a/lib/gitlab/email/message/repository_push.rb
+++ b/lib/gitlab/email/message/repository_push.rb
--- a/lib/gitlab/exclusive_lease.rb
+++ b/lib/gitlab/exclusive_lease.rb
--- a/lib/gitlab/geo.rb
+++ b/lib/gitlab/geo.rb
--- a/lib/gitlab/geo/oauth_session.rb
+++ b/lib/gitlab/geo/oauth_session.rb
--- a/lib/gitlab/geo/update_queue.rb
+++ b/lib/gitlab/geo/update_queue.rb
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
--- a/lib/gitlab/git_access_wiki.rb
+++ b/lib/gitlab/git_access_wiki.rb
--- a/lib/gitlab/github_import/client.rb
+++ b/lib/gitlab/github_import/client.rb
--- a/lib/gitlab/github_import/importer.rb
+++ b/lib/gitlab/github_import/importer.rb
--- a/lib/gitlab/github_import/pull_request_formatter.rb
+++ b/lib/gitlab/github_import/pull_request_formatter.rb
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
--- a/lib/gitlab/middleware/go.rb
+++ b/lib/gitlab/middleware/go.rb
--- a/lib/gitlab/middleware/readonly_geo.rb
+++ b/lib/gitlab/middleware/readonly_geo.rb
--- a/lib/gitlab/project_search_results.rb
+++ b/lib/gitlab/project_search_results.rb
--- a/lib/gitlab/push_data_builder.rb
+++ b/lib/gitlab/push_data_builder.rb
--- a/lib/gitlab/redis_config.rb
+++ b/lib/gitlab/redis_config.rb
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
--- a/lib/gitlab/user_access.rb
+++ b/lib/gitlab/user_access.rb
--- a/lib/tasks/brakeman.rake
+++ b/lib/tasks/brakeman.rake
--- a/lib/tasks/cache.rake
+++ b/lib/tasks/cache.rake
--- a/lib/tasks/gemojione.rake
+++ b/lib/tasks/gemojione.rake
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
--- a/lib/tasks/gitlab/elastic.rake
+++ b/lib/tasks/gitlab/elastic.rake
--- a/lib/tasks/gitlab/web_hook.rake
+++ b/lib/tasks/gitlab/web_hook.rake
--- a/lib/tasks/spec.rake
+++ b/lib/tasks/spec.rake
--- a/lib/tasks/spinach.rake
+++ b/lib/tasks/spinach.rake
--- a/public/logo.svg
+++ b/public/logo.svg
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
--- a/spec/benchmarks/finders/issues_finder_spec.rb
+++ b/spec/benchmarks/finders/issues_finder_spec.rb
--- a/spec/benchmarks/finders/trending_projects_finder_spec.rb
+++ b/spec/benchmarks/finders/trending_projects_finder_spec.rb
--- a/spec/benchmarks/lib/gitlab/markdown/reference_filter_spec.rb
+++ b/spec/benchmarks/lib/gitlab/markdown/reference_filter_spec.rb
--- a/spec/benchmarks/models/milestone_spec.rb
+++ b/spec/benchmarks/models/milestone_spec.rb
--- a/spec/benchmarks/models/project_spec.rb
+++ b/spec/benchmarks/models/project_spec.rb
--- a/spec/benchmarks/models/project_team_spec.rb
+++ b/spec/benchmarks/models/project_team_spec.rb
--- a/spec/benchmarks/models/user_spec.rb
+++ b/spec/benchmarks/models/user_spec.rb
--- a/spec/benchmarks/services/projects/create_service_spec.rb
+++ b/spec/benchmarks/services/projects/create_service_spec.rb
--- a/spec/config/mail_room_spec.rb
+++ b/spec/config/mail_room_spec.rb
--- a/spec/controllers/ci/projects_controller_spec.rb
+++ b/spec/controllers/ci/projects_controller_spec.rb
--- a/spec/controllers/commit_controller_spec.rb
+++ b/spec/controllers/commit_controller_spec.rb
--- a/spec/controllers/projects/compare_controller_spec.rb
+++ b/spec/controllers/projects/compare_controller_spec.rb
--- a/spec/controllers/projects/forks_controller_spec.rb
+++ b/spec/controllers/projects/forks_controller_spec.rb
--- a/spec/controllers/projects/imports_controller_spec.rb
+++ b/spec/controllers/projects/imports_controller_spec.rb
--- a/spec/controllers/projects/repositories_controller_spec.rb
+++ b/spec/controllers/projects/repositories_controller_spec.rb
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
--- a/spec/factories.rb
+++ b/spec/factories.rb
--- a/spec/factories/abuse_reports.rb
+++ b/spec/factories/abuse_reports.rb
--- a/spec/factories/broadcast_messages.rb
+++ b/spec/factories/broadcast_messages.rb
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
--- a/spec/factories/ci/commits.rb
+++ b/spec/factories/ci/commits.rb
--- a/spec/factories/ci/runner_projects.rb
+++ b/spec/factories/ci/runner_projects.rb
--- a/spec/factories/ci/runners.rb
+++ b/spec/factories/ci/runners.rb
--- a/spec/factories/ci/trigger_requests.rb
+++ b/spec/factories/ci/trigger_requests.rb
--- a/spec/factories/ci/triggers.rb
+++ b/spec/factories/ci/triggers.rb
--- a/spec/factories/ci/variables.rb
+++ b/spec/factories/ci/variables.rb
--- a/spec/factories/deploy_keys_projects.rb
+++ b/spec/factories/deploy_keys_projects.rb
--- a/spec/factories/doorkeeper.rb
+++ b/spec/factories/doorkeeper.rb
--- a/spec/factories/emails.rb
+++ b/spec/factories/emails.rb
--- a/spec/factories/events.rb
+++ b/spec/factories/events.rb
--- a/spec/factories/forked_project_links.rb
+++ b/spec/factories/forked_project_links.rb
--- a/spec/factories/geo_node_keys.rb
+++ b/spec/factories/geo_node_keys.rb
--- a/spec/factories/geo_nodes.rb
+++ b/spec/factories/geo_nodes.rb
--- a/spec/factories/group_hooks.rb
+++ b/spec/factories/group_hooks.rb
--- a/spec/factories/groups.rb
+++ b/spec/factories/groups.rb
--- a/spec/factories/identities.rb
+++ b/spec/factories/identities.rb
--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
--- a/spec/factories/keys.rb
+++ b/spec/factories/keys.rb
--- a/spec/factories/label_links.rb
+++ b/spec/factories/label_links.rb
--- a/spec/factories/labels.rb
+++ b/spec/factories/labels.rb
--- a/spec/factories/ldap_group_links.rb
+++ b/spec/factories/ldap_group_links.rb
--- a/spec/factories/lfs_objects.rb
+++ b/spec/factories/lfs_objects.rb
--- a/spec/factories/lfs_objects_projects.rb
+++ b/spec/factories/lfs_objects_projects.rb
--- a/spec/factories/licenses.rb
+++ b/spec/factories/licenses.rb
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
--- a/spec/factories/milestones.rb
+++ b/spec/factories/milestones.rb
--- a/spec/factories/namespaces.rb
+++ b/spec/factories/namespaces.rb
--- a/spec/factories/notes.rb
+++ b/spec/factories/notes.rb
--- a/spec/factories/personal_snippets.rb
+++ b/spec/factories/personal_snippets.rb
--- a/spec/factories/project_hooks.rb
+++ b/spec/factories/project_hooks.rb
--- a/spec/factories/project_members.rb
+++ b/spec/factories/project_members.rb
--- a/spec/factories/project_snippets.rb
+++ b/spec/factories/project_snippets.rb
--- a/spec/factories/protected_branches.rb
+++ b/spec/factories/protected_branches.rb
--- a/spec/factories/releases.rb
+++ b/spec/factories/releases.rb
--- a/spec/factories/sent_notifications.rb
+++ b/spec/factories/sent_notifications.rb
--- a/spec/factories/service_hooks.rb
+++ b/spec/factories/service_hooks.rb
--- a/spec/factories/services.rb
+++ b/spec/factories/services.rb
--- a/spec/factories/snippets.rb
+++ b/spec/factories/snippets.rb
--- a/spec/factories/spam_logs.rb
+++ b/spec/factories/spam_logs.rb
--- a/spec/factories/system_hooks.rb
+++ b/spec/factories/system_hooks.rb
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
--- a/spec/features/issues/filter_by_milestone_spec.rb
+++ b/spec/features/issues/filter_by_milestone_spec.rb
--- a/spec/features/login_spec.rb
+++ b/spec/features/login_spec.rb
--- a/spec/features/merge_requests/filter_by_milestone_spec.rb
+++ b/spec/features/merge_requests/filter_by_milestone_spec.rb
--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
--- a/spec/finders/snippets_finder_spec.rb
+++ b/spec/finders/snippets_finder_spec.rb
--- a/spec/fixtures/mail_room_disabled.yml
+++ b/spec/fixtures/mail_room_disabled.yml
--- a/spec/fixtures/mail_room_enabled.yml
+++ b/spec/fixtures/mail_room_enabled.yml
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
--- a/spec/helpers/diff_helper_spec.rb
+++ b/spec/helpers/diff_helper_spec.rb
--- a/spec/helpers/visibility_level_helper_spec.rb
+++ b/spec/helpers/visibility_level_helper_spec.rb
--- a/spec/javascripts/fixtures/behaviors/quick_submit.html.haml
+++ b/spec/javascripts/fixtures/behaviors/quick_submit.html.haml
--- a/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
+++ b/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
--- a/spec/lib/banzai/filter/label_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/label_reference_filter_spec.rb
--- a/spec/lib/banzai/filter/yaml_front_matter_filter_spec.rb
+++ b/spec/lib/banzai/filter/yaml_front_matter_filter_spec.rb
--- a/spec/lib/banzai/filter_array_spec.rb
+++ b/spec/lib/banzai/filter_array_spec.rb
--- a/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
--- a/spec/lib/elastic/issue_spec.rb
+++ b/spec/lib/elastic/issue_spec.rb
--- a/spec/lib/elastic/merge_request_spec.rb
+++ b/spec/lib/elastic/merge_request_spec.rb
--- a/spec/lib/elastic/milestone_spec.rb
+++ b/spec/lib/elastic/milestone_spec.rb
--- a/spec/lib/elastic/note_spec.rb
+++ b/spec/lib/elastic/note_spec.rb
--- a/spec/lib/elastic/project_spec.rb
+++ b/spec/lib/elastic/project_spec.rb
--- a/spec/lib/elastic/snippet_spec.rb
+++ b/spec/lib/elastic/snippet_spec.rb
--- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb
+++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb
--- a/spec/lib/gitlab/diff/parser_spec.rb
+++ b/spec/lib/gitlab/diff/parser_spec.rb
--- a/spec/lib/gitlab/elastic/project_search_results_spec.rb
+++ b/spec/lib/gitlab/elastic/project_search_results_spec.rb
--- a/spec/lib/gitlab/elastic/search_results_spec.rb
+++ b/spec/lib/gitlab/elastic/search_results_spec.rb
--- a/spec/lib/gitlab/email/message/repository_push_spec.rb
+++ b/spec/lib/gitlab/email/message/repository_push_spec.rb
--- a/spec/lib/gitlab/exclusive_lease_spec.rb
+++ b/spec/lib/gitlab/exclusive_lease_spec.rb
--- a/spec/lib/gitlab/geo/oauth_session_spec.rb
+++ b/spec/lib/gitlab/geo/oauth_session_spec.rb
--- a/spec/lib/gitlab/geo/update_queue_spec.rb
+++ b/spec/lib/gitlab/geo/update_queue_spec.rb
--- a/spec/lib/gitlab/geo_spec.rb
+++ b/spec/lib/gitlab/geo_spec.rb
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
--- a/spec/lib/gitlab/git_access_wiki_spec.rb
+++ b/spec/lib/gitlab/git_access_wiki_spec.rb
--- a/spec/lib/gitlab/github_import/client_spec.rb
+++ b/spec/lib/gitlab/github_import/client_spec.rb
--- a/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+++ b/spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
--- a/spec/lib/gitlab/middleware/go_spec.rb
+++ b/spec/lib/gitlab/middleware/go_spec.rb
--- a/spec/lib/gitlab/middleware/readonly_geo_spec.rb
+++ b/spec/lib/gitlab/middleware/readonly_geo_spec.rb
--- a/spec/lib/gitlab/project_search_results_spec.rb
+++ b/spec/lib/gitlab/project_search_results_spec.rb
--- a/spec/lib/gitlab/search_results_spec.rb
+++ b/spec/lib/gitlab/search_results_spec.rb
--- a/spec/lib/gitlab/snippet_search_results_spec.rb
+++ b/spec/lib/gitlab/snippet_search_results_spec.rb
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
--- a/spec/models/geo_node_key_spec.rb
+++ b/spec/models/geo_node_key_spec.rb
--- a/spec/models/geo_node_spec.rb
+++ b/spec/models/geo_node_spec.rb
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
--- a/spec/models/hooks/service_hook_spec.rb
+++ b/spec/models/hooks/service_hook_spec.rb
--- a/spec/models/hooks/web_hook_spec.rb
+++ b/spec/models/hooks/web_hook_spec.rb
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
--- a/spec/models/label_spec.rb
+++ b/spec/models/label_spec.rb
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
--- a/spec/models/project_snippet_spec.rb
+++ b/spec/models/project_snippet_spec.rb
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
--- a/spec/models/snippet_spec.rb
+++ b/spec/models/snippet_spec.rb
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
--- a/spec/requests/api/branches_spec.rb
+++ b/spec/requests/api/branches_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/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
--- a/spec/requests/api/fork_spec.rb
+++ b/spec/requests/api/fork_spec.rb
--- a/spec/requests/api/geo_spec.rb
+++ b/spec/requests/api/geo_spec.rb
--- a/spec/requests/api/project_members_spec.rb
+++ b/spec/requests/api/project_members_spec.rb
--- a/spec/requests/api/project_snippets_spec.rb
+++ b/spec/requests/api/project_snippets_spec.rb
--- a/spec/requests/api/projects_spec.rb
+++ b/spec/requests/api/projects_spec.rb
--- a/spec/requests/api/repositories_spec.rb
+++ b/spec/requests/api/repositories_spec.rb
--- a/spec/requests/api/runners_spec.rb
+++ b/spec/requests/api/runners_spec.rb
--- a/spec/requests/api/tags_spec.rb
+++ b/spec/requests/api/tags_spec.rb
--- a/spec/requests/api/triggers_spec.rb
+++ b/spec/requests/api/triggers_spec.rb
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
--- a/spec/requests/api/variables_spec.rb
+++ b/spec/requests/api/variables_spec.rb
--- a/spec/routing/routing_spec.rb
+++ b/spec/routing/routing_spec.rb
--- a/spec/services/delete_tag_service_spec.rb
+++ b/spec/services/delete_tag_service_spec.rb
--- a/spec/services/geo/enqueue_update_service_spec.rb
+++ b/spec/services/geo/enqueue_update_service_spec.rb
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
--- a/spec/services/git_tag_push_service_spec.rb
+++ b/spec/services/git_tag_push_service_spec.rb
--- a/spec/services/merge_requests/refresh_service_spec.rb
+++ b/spec/services/merge_requests/refresh_service_spec.rb
--- a/spec/services/projects/import_service_spec.rb
+++ b/spec/services/projects/import_service_spec.rb
--- a/spec/services/projects/update_service_spec.rb
+++ b/spec/services/projects/update_service_spec.rb
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
--- a/spec/support/matchers/benchmark_matchers.rb
+++ b/spec/support/matchers/benchmark_matchers.rb
--- a/spec/workers/post_receive_spec.rb
+++ b/spec/workers/post_receive_spec.rb