Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/token-timing-attack

ecb1c596 · James Lopez · 70623cd4 · 36730e8e · ecb1c596 · ecb1c596
Commit ecb1c596 authored Mar 08, 2016 by James Lopez
356 changed files
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,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/CHANGELOG
+++ b/CHANGELOG
@@ -3,14 +3,48 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.6.0 (unreleased)
  - Contributions to forked projects are included in calendar
  - Improve the formatting for the user page bio (Connor Shea)
+  - Removed the default password from the initial admin account created during
+    setup. A password can be provided during setup (see installation docs), or
+    GitLab will ask the user to create a new one upon first visit.
  - Fix issue when pushing to projects ending in .wiki
  - Fix avatar stretching by providing a cropping feature (Johann Pardanaud)
+  - Don't load all of GitLab in mail_room
+  - Indicate how much an MR diverged from the target branch (Pierre de La Morinerie)
  - Strip leading and trailing spaces in URL validator (evuez)
+  - Return empty array instead of 404 when commit has no statuses in commit status API
+  - Add support for cross-project label references
  - Update documentation to reflect Guest role not being enforced on internal projects
+  - Allow search for logged out users
+  - Don't show Issues/MRs from archived projects in Groups view
+  - Increase the notes polling timeout over time (Roberto Dip)
+  - Show labels in dashboard and group milestone views
+  - Add main language of a project in the list of projects (Tiago Botelho)
+v 8.5.4
+  - Do not cache requests for badges (including builds badge)
+v 8.5.3
+  - Flush repository caches before renaming projects
+  - Sort starred projects on dashboard based on last activity by default
+  - Show commit message in JIRA mention comment
+  - Makes issue page and merge request page usable on mobile browsers.
 v 8.5.2
  - Fix sidebar overlapping content when screen width was below 1200px
+  - Don't repeat labels listed on Labels tab
+  - Bring the "branded appearance" feature from EE to CE
  - Fix error 500 when commenting on a commit
+  - Show days remaining instead of elapsed time for Milestone
+  - Fix broken icons on installations with relative URL (Artem Sidorenko)
+  - Fix issue where tag list wasn't refreshed after deleting a tag
+  - Fix import from gitlab.com (KazSawada)
+  - Improve implementation to check read access to forks and add pagination
+  - Don't show any "2FA required" message if it's not actually required
+  - Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
+  - Update Rails to 4.2.5.2
+  - Fix permissions for deprecated CI build status badge
+  - Don't show "Welcome to GitLab" when the search didn't return any projects
+  - Add Todos documentation
 v 8.5.1
  - Fix group projects styles
@@ -25,7 +59,7 @@ v 8.5.1
  - Fix error 500 when trying to mark an already done todo as "done"
  - Fix an issue where MRs weren't sortable
  - Issues can now be dragged & dropped into empty milestone lists. This is also
-  possible with MRs
+    possible with MRs
  - Changed padding & background color for highlighted notes
  - Re-add the newrelic_rpm gem which was removed without any deprecation or warning (Stan Hu)
  - Update sentry-raven gem to 0.15.6

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,24 +3,27 @@
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 - [Contribute to GitLab](#contribute-to-gitlab)
-  - [Contributor license agreement](#contributor-license-agreement)
+    - [Contributor license agreement](#contributor-license-agreement)
-  - [Security vulnerability disclosure](#security-vulnerability-disclosure)
+    - [Security vulnerability disclosure](#security-vulnerability-disclosure)
-  - [Closing policy for issues and merge requests](#closing-policy-for-issues-and-merge-requests)
+    - [Closing policy for issues and merge requests](#closing-policy-for-issues-and-merge-requests)
-  - [Helping others](#helping-others)
+    - [Helping others](#helping-others)
-  - [I want to contribute!](#i-want-to-contribute)
+    - [I want to contribute!](#i-want-to-contribute)
-  - [Issue tracker](#issue-tracker)
+    - [Implement design & UI elements](#implement-design-ui-elements)
-      - [Feature proposals](#feature-proposals)
+        - [Design reference](#design-reference)
-      - [Issue tracker guidelines](#issue-tracker-guidelines)
+        - [UI development kit](#ui-development-kit)
-      - [Issue weight](#issue-weight)
+    - [Issue tracker](#issue-tracker)
-      - [Regression issues](#regression-issues)
+        - [Feature proposals](#feature-proposals)
-  - [Merge requests](#merge-requests)
+        - [Issue tracker guidelines](#issue-tracker-guidelines)
-      - [Merge request guidelines](#merge-request-guidelines)
+        - [Issue weight](#issue-weight)
-      - [Merge request description format](#merge-request-description-format)
+        - [Regression issues](#regression-issues)
-      - [Contribution acceptance criteria](#contribution-acceptance-criteria)
+    - [Merge requests](#merge-requests)
-  - [Changes for Stable Releases](#changes-for-stable-releases)
+        - [Merge request guidelines](#merge-request-guidelines)
-  - [Definition of done](#definition-of-done)
+        - [Merge request description format](#merge-request-description-format)
-  - [Style guides](#style-guides)
+        - [Contribution acceptance criteria](#contribution-acceptance-criteria)
-  - [Code of conduct](#code-of-conduct)
+    - [Changes for Stable Releases](#changes-for-stable-releases)
+    - [Definition of done](#definition-of-done)
+    - [Style guides](#style-guides)
+    - [Code of conduct](#code-of-conduct)
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
@@ -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
+[closed merge requests][closed-merge-requests]. If you would like quick feedback
-request feel free to mention one of the Merge Marshalls of the [core team][core-team].
+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)
+[Thoughtbot code review guide] into account.
-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/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
+# Specify a sprockets version due to increased performance
-# See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
+# See https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
-gem 'sprockets', '~> 2.12.3'
+gem 'sprockets', '~> 3.3.5'
 # Default values for AR models
 gem "default_value_for", "~> 3.0.0"
@@ -50,7 +50,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
@@ -75,7 +75,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'
@@ -260,10 +260,10 @@ group :development, :test do
  gem 'awesome_print', '~> 1.2.0', require: false
  gem 'fuubar', '~> 2.0.0'
-  gem 'database_cleaner', '~> 1.4.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-rails',        '~> 3.3.0'
-  gem 'spinach-rails', '~> 0.2.1'
+  gem 'spinach-rails',      '~> 0.2.1'
  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
  gem 'minitest', '~> 5.7.0'
@@ -278,7 +278,7 @@ group :development, :test do
  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)
@@ -194,10 +195,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_rails (4.6.0)
-      factory_girl (~> 4.3.0)
+      factory_girl (~> 4.5.0)
      railties (>= 3.0.0)
    faraday (0.9.2)
      multipart-post (>= 1.2, < 3)
@@ -357,7 +358,7 @@ GEM
      posix-spawn (~> 0.3)
    gitlab_emoji (0.3.1)
      gemojione (~> 2.2, >= 2.2.1)
-    gitlab_git (8.2.0)
+    gitlab_git (9.0.0)
      activesupport (~> 4.0)
      charlock_holmes (~> 0.7.3)
      github-linguist (~> 4.7.0)
@@ -407,7 +408,6 @@ GEM
      railties (>= 4.0.1)
    hashie (3.4.3)
    highline (1.7.8)
-    hike (1.2.3)
    hipchat (1.5.2)
      httparty
      mimemagic
@@ -764,18 +764,15 @@ GEM
      capybara (>= 2.0.0)
      railties (>= 3)
      spinach (>= 0.4)
-    spring (1.3.6)
+    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)
+    sprockets (3.3.5)
-      hike (~> 1.2)
+      rack (> 1, < 3)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
    sprockets-rails (2.3.3)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
@@ -807,7 +804,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)
@@ -902,7 +899,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)
@@ -920,7 +917,7 @@ DEPENDENCIES
  dropzonejs-rails (~> 0.7.1)
  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
@@ -933,7 +930,7 @@ DEPENDENCIES
  github-markup (~> 1.3.1)
  gitlab-flowdock-git-hook (~> 1.0.1)
  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)
@@ -1020,11 +1017,11 @@ DEPENDENCIES
  six (~> 0.2.0)
  slack-notifier (~> 1.2.0)
  spinach-rails (~> 0.2.1)
-  spring (~> 1.3.6)
+  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/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -220,41 +220,41 @@ $ ->
    .off 'breakpoint:change'
    .on 'breakpoint:change', (e, breakpoint) ->
      if breakpoint is 'sm' or breakpoint is 'xs'
-        $gutterIcon = $('.gutter-toggle').find('i')
+        $gutterIcon = $('aside .gutter-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) ->
+    .on 'click', 'aside .gutter-toggle', (e, triggered) ->
      e.preventDefault()
      $this = $(this)
      $thisIcon = $this.find 'i'
+      $allGutterToggleIcons = $('.gutter-toggle i')
      if $thisIcon.hasClass('fa-angle-double-right')
-        $thisIcon
+        $allGutterToggleIcons
          .removeClass('fa-angle-double-right')
          .addClass('fa-angle-double-left')
-        $this
+        $('aside.right-sidebar')
-          .closest('aside')
          .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
+        $('aside.right-sidebar')
-          .closest('aside')
          .removeClass('right-sidebar-collapsed')
          .addClass('right-sidebar-expanded')
        $('.page-with-sidebar')
          .removeClass('right-sidebar-collapsed')
          .addClass('right-sidebar-expanded')
-      $.cookie("collapsed_gutter",
+      if not triggered
-        $('.right-sidebar')
+        $.cookie("collapsed_gutter",
-          .hasClass('right-sidebar-collapsed'), { path: '/' })
+          $('.right-sidebar')
+            .hasClass('right-sidebar-collapsed'), { path: '/' })
  bootstrapBreakpoint = undefined;
  checkBootstrapBreakpoints = ->

--- 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"
+# When a child field of a form with a `js-quick-submit` class receives a
-# (Mac) or "Ctrl+Enter" (Linux/Windows) key combination, its parent form is
+# "Meta+Enter" (Mac) or "Ctrl+Enter" (Linux/Windows) key combination, the form
-# submitted.
+# is submitted.
 #
 #= require extensions/jquery
 #
 # ### Example Markup
 #
-#   <form action="/foo">
+#   <form action="/foo" class="js-quick-submit">
-#     <input type="text" class="js-quick-submit" />
+#     <input type="text" />
-#     <textarea class="js-quick-submit"></textarea>
+#     <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 keyCodeIs(e, 13) # Enter
-  return unless e.keyCode == 13 # Enter
-  if navigator.userAgent.match(/Macintosh/)
+  return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey) || (e.ctrlKey && !e.altKey && !e.metaKey && !e.shiftKey)
-    return unless (e.metaKey && !e.altKey && !e.ctrlKey && !e.shiftKey)
-  else
-    return unless (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/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'
@@ -107,9 +103,6 @@ class Dispatcher
        new ProjectFork()
      when 'projects:artifacts:browse'
        new BuildArtifacts()
-      when 'users:show'
-        new User()
-        new Activities()
    switch path.first()
      when 'admin'

--- a/app/assets/javascripts/merge_request_tabs.js.coffee
+++ b/app/assets/javascripts/merge_request_tabs.js.coffee
@@ -195,6 +195,6 @@ class @MergeRequestTabs
    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')
@@ -112,7 +112,8 @@ class @Milestone
      $(previousTabClass).hide()
      $(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/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: ->
@@ -37,7 +39,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
@@ -91,9 +93,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 +109,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.

--- 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
@@ -48,7 +48,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 +63,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
+@ProjectsList =
-  constructor: ->
+  init: ->
-    $(".projects-list .js-expand").on 'click', (e) ->
+    $(".projects-list-filter").off('keyup')
-      e.preventDefault()
+    this.initSearch()
-      list = $(this).closest('.projects-list')
-    $("#filter_projects").on 'keyup', ->
+  initSearch: ->
-      ProjectsList.filter_results($("#filter_projects"))
+    @timer = null
+    $(".projects-list-filter").on('keyup', ->
+      clearTimeout(@timer)
+      @timer = setTimeout(ProjectsList.filterResults, 500)
+    )
-  @filter_results: ($element) ->
+  filterResults: =>
-    terms = $element.val()
+    $('.projects-list-holder').fadeTo(250, 0.5)
-    filterSelector = $element.data('filter-selector') || 'span.filter-title'
-    if not terms
+    form = null
-      $(".projects-list li").show()
+    form = $("form#project-filter-form")
-      $('.gl-pagination').show()
+    search = $(".projects-list-filter").val()
-    else
+    project_filter_url = form.attr('action') + '?' + form.serialize()
-      $(".projects-list li").each (index) ->
-        $this = $(this)
-        name = $this.find(filterSelector).text()
-        if name.toLowerCase().indexOf(terms.toLowerCase()) == -1
+    $.ajax
-          $this.hide()
+      type: "GET"
-        else
+      url: form.attr('action')
-          $this.show()
+      data: form.serialize()
-      $('.gl-pagination').hide()
+      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/shortcuts.js.coffee
+++ b/app/assets/javascripts/shortcuts.js.coffee
@@ -13,8 +13,10 @@ class @Shortcuts
    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

--- 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/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/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,11 +6,15 @@
 .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-20 { margin-right:20px }
 .append-bottom-10 { margin-bottom:10px }
@@ -56,25 +60,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;
 }
@@ -305,7 +290,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 {
+  display: none;
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 9999;
+  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;
+  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 {
+      background-color: $dropdown-link-hover-bg;
+      text-decoration: none;
+    }
+  }
+}
+.dropdown-menu-align-right {
+  left: auto;
+  right: 0;
+}
+.dropdown-menu-selectable {
+  a {
+    padding-left: 25px;
+    &.is-active {
+      &::before {
+        content: "\f00c";
+        position: absolute;
+        left: 4px;
+        top: 8px;
+        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: 10px;
+  padding-right: 10px;
+  color: $dropdown-header-color;
+  font-size: 13px;
+  line-height: 22px;
+}
--- a/app/assets/stylesheets/framework/forms.scss
+++ b/app/assets/stylesheets/framework/forms.scss
@@ -28,15 +28,15 @@ input[type='search'].search-input {
  }
  &.search-input:-moz-placeholder { /* Firefox 18- */
-    text-align: center;  
+    text-align: center;
  }
  &.search-input::-moz-placeholder {  /* Firefox 19+ */
-    text-align: center;  
+    text-align: center;
  }
-  &.search-input:-ms-input-placeholder {  
+  &.search-input:-ms-input-placeholder {
-    text-align: center; 
+    text-align: center;
  }
 }
@@ -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
@@ -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,7 +27,14 @@
  }
  &.right-sidebar-expanded {
-    padding-right: $gutter_width;
+    /* 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;
+    }
  }
 }
@@ -199,7 +206,12 @@
  padding-left: $sidebar_width;
  &.right-sidebar-collapsed {
-    padding-right: $sidebar_collapsed_width;
+    /* 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 {
@@ -225,7 +237,12 @@
  padding-left: $sidebar_collapsed_width;
  &.right-sidebar-collapsed {
-    padding-right: $sidebar_collapsed_width;
+    /* 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 {
@@ -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
@@ -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
@@ -34,6 +34,12 @@ $error-exclamation-point: #E62958;
 $border-radius-default: 3px;
 $list-title-color: #333333;
 $list-text-color: #555555;
+$profile-settings-link-color: $md-link-color;
+$btn-transparent-color: #8F8F8F;
+$ssh-key-icon-color: #8F8F8F;
+$ssh-key-icon-size: 18px;
 /*
 * Color schema
@@ -92,6 +98,9 @@ $border-red-light: #E52C5A;
 $border-red-normal: #D22852;
 $border-red-dark: #CA264F;
+$help-well-bg: #FAFAFA;
+$help-well-border: #E5E5E5;
 /* header */
 $light-grey-header: #faf9f9;
@@ -117,3 +126,15 @@ $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;
--- 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/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/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 {
+.issues-sortable-list, .merge_requests-sortable-list {
-  .issue-detail {
+  .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 {
+.notification-list-item {
-  font-size: 15px;
+  line-height: 34px;
-  color: #333;
-  font-weight: bold;
 }
-.notification-icon-holder {
+.notification {
-  width: 20px;
+  position: relative;
-  float: left;
+  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
@@ -5,12 +5,24 @@
  }
 }
-.profile-avatar-form-option {
+.avatar-image {
-  hr {
+  @media (min-width: $screen-sm-min) {
-    margin: 10px 0;
+    float: left;
+    margin-bottom: 0;
  }
 }
+.avatar-file-name {
+  position: relative;
+  top: 2px;
+  display: inline-block;
+}
+.account-btn-link,
+.profile-settings-sidebar a {
+  color: $profile-settings-link-color;
+}
 .oauth-buttons {
  .btn-group {
    margin-right: 10px;
@@ -42,6 +54,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 +103,13 @@
  margin: auto;
 }
+.user-avatar-button {
+  .file-name {
+    display: inline-block;
+    padding-left: 10px;
+  }
+}
 .modal-profile-crop {
  .modal-dialog {
    width: 500px;
@@ -114,3 +145,33 @@
    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: $profile-settings-link-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;
+    border-bottom: 1px solid $border-color;
-    padding-bottom: 15px;
+    padding-bottom: $gl-padding;
-    margin-bottom: 15px;
+    margin-bottom: $gl-padding;
+    &:last-child {
+      border-bottom: none;
+    }
  }
 }

--- 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/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/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
@@ -6,7 +6,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
    @projects = @projects.sort(@sort = params[:sort])
    @projects = @projects.includes(:namespace)
-    terms = params['filter_projects']
+    terms = params[:filter_projects]
    if terms.present?
      @projects = @projects.search(terms)
@@ -31,11 +31,11 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
  end
  def starred
-    @projects = current_user.starred_projects
+    @projects = current_user.starred_projects.sorted_by_activity
    @projects = @projects.includes(:namespace, :forked_from_project, :tags)
    @projects = @projects.sort(@sort = params[:sort])
-    terms = params['filter_projects']
+    terms = params[:filter_projects]
    if terms.present?
      @projects = @projects.search(terms)

--- 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/profiles/two_factor_auths_controller.rb
+++ b/app/controllers/profiles/two_factor_auths_controller.rb
@@ -12,11 +12,13 @@ class Profiles::TwoFactorAuthsController < Profiles::ApplicationController
    current_user.save! if current_user.changed?
-    if two_factor_grace_period_expired?
+    if two_factor_authentication_required?
-      flash.now[:alert] = 'You must enable Two-factor Authentication for your account.'
+      if two_factor_grace_period_expired?
-    else
+        flash.now[:alert] = 'You must enable Two-factor Authentication for your account.'
-      grace_period_deadline = current_user.otp_grace_period_started_at + two_factor_grace_period.hours
+      else
-      flash.now[:alert] = "You must enable Two-factor Authentication for your account before #{l(grace_period_deadline)}."
+        grace_period_deadline = current_user.otp_grace_period_started_at + two_factor_grace_period.hours
+        flash.now[:alert] = "You must enable Two-factor Authentication for your account before #{l(grace_period_deadline)}."
+      end
    end
    @qr_code = build_qr_code

--- 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
+    opts = diff_options
-      @diffs = commit.diffs({ ignore_whitespace_change: true })
+    opts[:ignore_whitespace_change] = true if params[:format] == 'diff'
-    else
-      @diffs = commit.diffs
-    end
+    @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 = CompareService.new.
-    compare_result = CompareService.new.
      execute(@project, @head_ref, @project, @base_ref, diff_options)
-    if compare_result
+    if compare
-      @commits = Commit.decorate(compare_result.commits, @project)
+      @commits = Commit.decorate(compare.commits, @project)
-      @diffs = compare_result.diffs
      @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
@@ -6,20 +6,24 @@ class Projects::ForksController < Projects::ApplicationController
  def index
    base_query = project.forks.includes(:creator)
-    @forks = if current_user
+    @forks               = base_query.merge(ProjectsFinder.new.execute(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
    @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

--- 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])
-    redirect_to namespace_project_tags_path(@project.namespace, @project)
+    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/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,8 +4,10 @@ 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 :auto_sign_in_with_provider, only: [:new]
  before_action :load_recaptcha
@@ -33,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

--- 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
+    @calendar_date = Date.parse(params[:date]) rescue Date.today
-    @events = []
+    @events = contributions_calendar.events_by_date(@calendar_date)
-    if @calendar_date
-      @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
@@ -263,11 +263,9 @@ class IssuableFinder
  def by_label(items)
    if labels?
      if filter_by_no_label?
-        items = items.
+        items = items.without_label
-          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 })
      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/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/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
+  def diff_hard_limit_enabled?
-    if diff_hard_limit_enabled?
+    params[:force_show_diff].present?
-      Commit::DIFF_HARD_LIMIT_FILES
-    else
-      Commit::DIFF_SAFE_FILES
-    end
  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
+      options.merge!(Commit.max_diff_options)
-    else
-      Commit::DIFF_SAFE_LINES
    end
+    options
  end
  def safe_diff_files(diffs, diff_refs)
-    lines = 0
+    diffs.decorate! { |diff| Gitlab::Diff::File.new(diff, diff_refs) }
-    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
  end
  def generate_line_code(file_path, line)

--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -50,6 +50,8 @@ module GitlabMarkdownHelper
    context[:project] ||= @project
+    text = Banzai.pre_process(text, context)
    html = Banzai.render(text, context)
    context.merge!(

--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -10,6 +10,15 @@ module IconsHelper
    options.include?(:base) ? fa_stacked_icon(names, options) : fa_icon(names, options)
  end
+  def audit_icon(names, options = {})
+    case names
+    when "standard"
+      names = "key"
+    end
+    options.include?(:base) ? fa_stacked_icon(names, options) : fa_icon(names, options)
+  end
  def spinner(text = nil, visible = false)
    css_class = 'loading'
    css_class << ' hide' unless visible
@@ -37,7 +46,7 @@ module IconsHelper
      else # Gitlab::VisibilityLevel::PUBLIC
        'globe'
      end
    name << " fw" if fw
    icon(name)

--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -50,19 +50,25 @@ module LabelsHelper
    @project.labels.pluck(:title)
  end
-  def render_colored_label(label)
+  def render_colored_label(label, label_suffix = '')
    label_color = label.color || Label::DEFAULT_COLOR
    text_color = text_color_for_bg(label_color)
    # Intentionally not using content_tag here so that this method can be called
    # by LabelReferenceFilter
    span = %(<span class="label color-label") +
-      %( style="background-color: #{label_color}; color: #{text_color}">) +
+      %(style="background-color: #{label_color}; color: #{text_color}">) +
-      escape_once(label.name) + '</span>'
+      %(#{escape_once(label.name)}#{label_suffix}</span>)
    span.html_safe
  end
+  def render_colored_cross_project_label(label)
+    label_suffix = label.project.name_with_namespace
+    label_suffix = " <i>in #{escape_once(label_suffix)}</i>"
+    render_colored_label(label, label_suffix)
+  end
  def suggested_colors
    [
      '#0033CC',
@@ -119,5 +125,6 @@ module LabelsHelper
  end
  # Required for Banzai::Filter::LabelReferenceFilter
-  module_function :render_colored_label, :text_color_for_bg, :escape_once
+  module_function :render_colored_label, :render_colored_cross_project_label,
+                  :text_color_for_bg, :escape_once
 end
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -9,6 +9,32 @@ module MilestonesHelper
    end
  end
+  def milestones_label_path(opts = {})
+    if @project
+      namespace_project_issues_path(@project.namespace, @project, opts)
+    elsif @group
+      issues_group_path(@group, opts)
+    else
+      issues_dashboard_path(opts)
+    end
+  end
+  def milestones_browse_issuables_path(milestone, type:)
+    opts = { milestone_title: milestone.title }
+    if @project
+      polymorphic_path([@project.namespace.becomes(Namespace), @project, type], opts)
+    elsif @group
+      polymorphic_url([type, @group], opts)
+    else
+      polymorphic_url([type, :dashboard], opts)
+    end
+  end
+  def milestone_issues_by_label_count(milestone, label, state:)
+    milestone.issues.with_label(label.title).send(state).size
+  end
  def milestone_progress_bar(milestone)
    options = {
      class: 'progress-bar progress-bar-success',
@@ -36,4 +62,14 @@ module MilestonesHelper
    options_from_collection_for_select(grouped_milestones, 'name', 'title', params[:milestone_title])
  end
+  def milestone_remaining_days(milestone)
+    if milestone.expired?
+      content_tag(:strong, 'expired')
+    elsif milestone.due_date
+      days    = milestone.remaining_days
+      content = content_tag(:strong, days)
+      content << " #{'day'.pluralize(days)} remaining"
+    end
+  end
 end
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -38,12 +38,16 @@ module ProjectsHelper
    author_html << image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt:'') if opts[:avatar]
    # Build name span tag
-    author_html << content_tag(:span, sanitize(author.name), class: opts[:author_class]) if opts[:name]
+    if opts[:by_username]
+      author_html << content_tag(:span, sanitize("@#{author.username}"), class: opts[:author_class]) if opts[:name]
+    else
+      author_html << content_tag(:span, sanitize(author.name), class: opts[:author_class]) if opts[:name]
+    end
    author_html = author_html.html_safe
    if opts[:name]
-      link_to(author_html, user_path(author), class: "author_link").html_safe
+      link_to(author_html, user_path(author), class: "author_link #{"#{opts[:mobile_classes]}" if opts[:mobile_classes]}").html_safe
    else
      title = opts[:title].sub(":name", sanitize(author.name))
      link_to(author_html, user_path(author), class: "author_link has_tooltip", data: { 'original-title'.to_sym => title, container: 'body' } ).html_safe

--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -188,6 +188,7 @@ class Ability
    def project_dev_rules
      @project_dev_rules ||= project_report_rules + [
        :admin_merge_request,
+        :update_merge_request,
        :create_commit_status,
        :update_commit_status,
        :create_build,
@@ -212,7 +213,6 @@ class Ability
      @project_master_rules ||= project_dev_rules + [
        :push_code_to_protected_branches,
        :update_project_snippet,
-        :update_merge_request,
        :admin_milestone,
        :admin_project_snippet,
        :admin_project_member,

--- a/app/models/blob.rb
+++ b/app/models/blob.rb
 # Blob is a Rails-specific wrapper around Gitlab::Git::Blob objects
 class Blob < SimpleDelegator
+  CACHE_TIME = 60 # Cache raw blobs referred to by a (mutable) ref for 1 minute
+  CACHE_TIME_IMMUTABLE = 3600 # Cache blobs referred to by an immutable reference for 1 hour
  # Wrap a Gitlab::Git::Blob object, or return nil when given nil
  #
  # This method prevents the decorated object from evaluating to "truthy" when

--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -12,12 +12,7 @@ class Commit
  attr_accessor :project
-  # Safe amount of changes (files and lines) in one commit to render
+  DIFF_SAFE_LINES = Gitlab::Git::DiffCollection::DEFAULT_LIMITS[:max_lines]
-  # Used to prevent 500 error on huge commits by suppressing diff
-  #
-  # User can force display of diff above this size
-  DIFF_SAFE_FILES  = 100 unless defined?(DIFF_SAFE_FILES)
-  DIFF_SAFE_LINES  = 5000 unless defined?(DIFF_SAFE_LINES)
  # Commits above this size will not be rendered in HTML
  DIFF_HARD_LIMIT_FILES = 1000 unless defined?(DIFF_HARD_LIMIT_FILES)
@@ -36,13 +31,20 @@ class Commit
    # Calculate number of lines to render for diffs
    def diff_line_count(diffs)
-      diffs.reduce(0) { |sum, d| sum + d.diff.lines.count }
+      diffs.reduce(0) { |sum, d| sum + Gitlab::Git::Util.count_lines(d.diff) }
    end
    # Truncate sha to 8 characters
    def truncate_sha(sha)
      sha[0..7]
    end
+    def max_diff_options
+      {
+        max_files: DIFF_HARD_LIMIT_FILES,
+        max_lines: DIFF_HARD_LIMIT_LINES,
+      }
+    end
  end
  attr_accessor :raw

--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -29,15 +29,19 @@ module Issuable
    scope :assigned, -> { where("assignee_id IS NOT NULL") }
    scope :unassigned, -> { where("assignee_id IS NULL") }
    scope :of_projects, ->(ids) { where(project_id: ids) }
+    scope :of_milestones, ->(ids) { where(milestone_id: ids) }
    scope :opened, -> { with_state(:opened, :reopened) }
    scope :only_opened, -> { with_state(:opened) }
    scope :only_reopened, -> { with_state(:reopened) }
    scope :closed, -> { with_state(:closed) }
    scope :order_milestone_due_desc, -> { joins(:milestone).reorder('milestones.due_date DESC, milestones.id DESC') }
    scope :order_milestone_due_asc, -> { joins(:milestone).reorder('milestones.due_date ASC, milestones.id ASC') }
+    scope :with_label, ->(title) { joins(:labels).where(labels: { title: title }) }
+    scope :without_label, -> { joins("LEFT OUTER JOIN label_links ON label_links.target_type = '#{name}' AND label_links.target_id = #{table_name}.id").where(label_links: { id: nil }) }
    scope :join_project, -> { joins(:project) }
    scope :references_project, -> { references(:project) }
+    scope :non_archived, -> { join_project.merge(Project.non_archived) }
    delegate :name,
             :email,

--- a/app/models/concerns/milestoneish.rb
+++ b/app/models/concerns/milestoneish.rb
+module Milestoneish
+  def closed_items_count
+    issues.closed.size + merge_requests.closed_and_merged.size
+  end
+  def total_items_count
+    issues.size + merge_requests.size
+  end
+  def complete?
+    total_items_count == closed_items_count
+  end
+  def percent_complete
+    ((closed_items_count * 100) / total_items_count).abs
+  rescue ZeroDivisionError
+    0
+  end
+  def remaining_days
+    return 0 if !due_date || expired?
+    (due_date - Date.today).to_i
+  end
+end
--- a/app/models/diff_line.rb
+++ b/app/models/diff_line.rb
-class DiffLine
-  attr_accessor :type, :content, :num, :code
-end
--- a/app/models/global_label.rb
+++ b/app/models/global_label.rb
@@ -2,16 +2,19 @@ class GlobalLabel
  attr_accessor :title, :labels
  alias_attribute :name, :title
+  delegate :color, :description, to: :@first_label
  def self.build_collection(labels)
    labels = labels.group_by(&:title)
-    labels.map do |title, label|
+    labels.map do |title, labels|
-      new(title, label)
+      new(title, labels)
    end
  end
  def initialize(title, labels)
    @title = title
    @labels = labels
+    @first_label = labels.find { |lbl| lbl.description.present? } || labels.first
  end
 end
--- a/app/models/global_milestone.rb
+++ b/app/models/global_milestone.rb
 class GlobalMilestone
+  include Milestoneish
  attr_accessor :title, :milestones
  alias_attribute :name, :title
@@ -28,33 +30,7 @@ class GlobalMilestone
  end
  def projects
-    milestones.map { |milestone| milestone.project }
+    @projects ||= Project.for_milestones(milestones.map(&:id))
-  end
-  def issue_count
-    milestones.map { |milestone| milestone.issues.count }.sum
-  end
-  def merge_requests_count
-    milestones.map { |milestone| milestone.merge_requests.count }.sum
-  end
-  def open_items_count
-    milestones.map { |milestone| milestone.open_items_count }.sum
-  end
-  def closed_items_count
-    milestones.map { |milestone| milestone.closed_items_count }.sum
-  end
-  def total_items_count
-    milestones.map { |milestone| milestone.total_items_count }.sum
-  end
-  def percent_complete
-    ((closed_items_count * 100) / total_items_count).abs
-  rescue ZeroDivisionError
-    0
  end
  def state
@@ -76,35 +52,20 @@ class GlobalMilestone
  end
  def issues
-    @issues ||= milestones.map(&:issues).flatten.group_by(&:state)
+    @issues ||= Issue.of_milestones(milestones.map(&:id)).includes(:project)
  end
  def merge_requests
-    @merge_requests ||= milestones.map(&:merge_requests).flatten.group_by(&:state)
+    @merge_requests ||= MergeRequest.of_milestones(milestones.map(&:id)).includes(:target_project)
  end
  def participants
    @participants ||= milestones.map(&:participants).flatten.compact.uniq
  end
-  def opened_issues
+  def labels
-    issues.values_at("opened", "reopened").compact.flatten
+    @labels ||= GlobalLabel.build_collection(milestones.map(&:labels).flatten)
-  end
+                           .sort_by!(&:title)
-  def closed_issues
-    issues['closed']
-  end
-  def opened_merge_requests
-    merge_requests.values_at("opened", "reopened").compact.flatten
-  end
-  def closed_merge_requests
-    merge_requests.values_at("closed", "merged", "locked").compact.flatten
-  end
-  def complete?
-    total_items_count == closed_items_count
  end
  def due_date

--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -27,6 +27,7 @@ class Label < ActiveRecord::Base
  belongs_to :project
  has_many :label_links, dependent: :destroy
  has_many :issues, through: :label_links, source: :target, source_type: 'Issue'
+  has_many :merge_requests, through: :label_links, source: :target, source_type: 'MergeRequest'
  validates :color, color: true, allow_blank: false
  validates :project, presence: true, unless: Proc.new { |service| service.template? }
@@ -47,10 +48,15 @@ class Label < ActiveRecord::Base
    '~'
  end
+  ##
  # Pattern used to extract label references from text
+  #
+  # This pattern supports cross-project references.
+  #
  def self.reference_pattern
    %r{
-      #{reference_prefix}
+      (#{Project.reference_pattern})?
+      #{Regexp.escape(reference_prefix)}
      (?:
        (?<label_id>\d+) | # Integer-based label ID, or
        (?<label_name>
@@ -61,24 +67,31 @@ class Label < ActiveRecord::Base
    }x
  end
+  def self.link_reference_pattern
+    nil
+  end
+  ##
  # Returns the String necessary to reference this Label in Markdown
  #
  # format - Symbol format to use (default: :id, optional: :name)
  #
-  # Note that its argument differs from other objects implementing Referable. If
-  # a non-Symbol argument is given (such as a Project), it will default to :id.
-  #
  # Examples:
  #
-  #   Label.first.to_reference        # => "~1"
+  #   Label.first.to_reference                # => "~1"
-  #   Label.first.to_reference(:name) # => "~\"bug\""
+  #   Label.first.to_reference(format: :name) # => "~\"bug\""
+  #   Label.first.to_reference(project)       # => "gitlab-org/gitlab-ce~1"
  #
  # Returns a String
-  def to_reference(format = :id)
+  #
-    if format == :name && !name.include?('"')
+  def to_reference(from_project = nil, format: :id)
-      %(#{self.class.reference_prefix}"#{name}")
+    format_reference = label_format_reference(format)
+    reference = "#{self.class.reference_prefix}#{format_reference}"
+    if cross_project_reference?(from_project)
+      project.to_reference + reference
    else
-      "#{self.class.reference_prefix}#{id}"
+      reference
    end
  end
@@ -90,7 +103,23 @@ class Label < ActiveRecord::Base
    issues.closed.count
  end
+  def open_merge_requests_count
+    merge_requests.opened.count
+  end
  def template?
    template
  end
+  private
+  def label_format_reference(format = :id)
+    raise StandardError, 'Unknown format' unless [:id, :name].include?(format)
+    if format == :name && !name.include?('"')
+      %("#{name}")
+    else
+      id
+    end
+  end
 end
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -48,7 +48,7 @@ class MergeRequest < ActiveRecord::Base
  after_create :create_merge_request_diff
  after_update :update_merge_request_diff
-  delegate :commits, :diffs, :diffs_no_whitespace, to: :merge_request_diff, prefix: nil
+  delegate :commits, :diffs, :real_size, to: :merge_request_diff, prefix: nil
  # When this attribute is true some MR validation is ignored
  # It allows us to close or modify broken merge requests
@@ -56,8 +56,7 @@ class MergeRequest < ActiveRecord::Base
  # Temporary fields to store compare vars
  # when creating new merge request
-  attr_accessor :can_be_created, :compare_failed,
+  attr_accessor :can_be_created, :compare_commits, :compare
-    :compare_commits, :compare_diffs
  state_machine :state, initial: :opened do
    event :close do
@@ -138,9 +137,7 @@ class MergeRequest < ActiveRecord::Base
  scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
  scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) }
  scope :of_projects, ->(ids) { where(target_project_id: ids) }
-  scope :opened, -> { with_states(:opened, :reopened) }
  scope :merged, -> { with_state(:merged) }
-  scope :closed, -> { with_state(:closed) }
  scope :closed_and_merged, -> { with_states(:closed, :merged) }
  scope :join_project, -> { joins(:target_project) }
@@ -182,6 +179,10 @@ class MergeRequest < ActiveRecord::Base
    merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
  end
+  def diff_size
+    merge_request_diff.size
+  end
  def diff_base_commit
    if merge_request_diff
      merge_request_diff.base_commit
@@ -487,6 +488,16 @@ class MergeRequest < ActiveRecord::Base
    end
  end
+  def state_icon_name
+    if merged?
+      "check"
+    elsif closed?
+      "times"
+    else
+      "circle-o"
+    end
+  end
  def target_sha
    @target_sha ||= target_project.repository.commit(target_branch).sha
  end
@@ -524,6 +535,29 @@ class MergeRequest < ActiveRecord::Base
    end
  end
+  def diverged_commits_count
+    cache = Rails.cache.read(:"merge_request_#{id}_diverged_commits")
+    if cache.blank? || cache[:source_sha] != source_sha || cache[:target_sha] != target_sha
+      cache = {
+        source_sha: source_sha,
+        target_sha: target_sha,
+        diverged_commits_count: compute_diverged_commits_count
+      }
+      Rails.cache.write(:"merge_request_#{id}_diverged_commits", cache)
+    end
+    cache[:diverged_commits_count]
+  end
+  def compute_diverged_commits_count
+    Gitlab::Git::Commit.between(target_project.repository.raw_repository, source_sha, target_sha).size
+  end
+  def diverged_from_target_branch?
+    diverged_commits_count > 0
+  end
  def ci_commit
    @ci_commit ||= source_project.ci_commit(last_commit.id) if last_commit && source_project
  end

--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -19,14 +19,15 @@ class MergeRequestDiff < ActiveRecord::Base
  # Prevent store of diff if commits amount more then 500
  COMMITS_SAFE_SIZE = 500
-  attr_reader :commits, :diffs, :diffs_no_whitespace
  belongs_to :merge_request
  delegate :target_branch, :source_branch, to: :merge_request, prefix: nil
  state_machine :state, initial: :empty do
    state :collected
+    state :overflow
+    # Deprecated states: these are no longer used but these values may still occur
+    # in the database.
    state :timeout
    state :overflow_commits_safe_size
    state :overflow_diff_files_limit
@@ -43,19 +44,23 @@ class MergeRequestDiff < ActiveRecord::Base
    reload_diffs
  end
-  def diffs
+  def size
-    @diffs ||= (load_diffs(st_diffs) || [])
+    real_size.presence || diffs.size
  end
-  def diffs_no_whitespace
+  def diffs(options={})
-    compare_result = Gitlab::CompareResult.new(
+    if options[:ignore_whitespace_change]
-      Gitlab::Git::Compare.new(
+      @diffs_no_whitespace ||= begin
-        self.repository.raw_repository,
+        compare = Gitlab::Git::Compare.new(
-        self.target_branch,
+          self.repository.raw_repository,
-        self.source_sha,
+          self.target_branch,
-      ), { ignore_whitespace_change: true }
+          self.source_sha,
-    )
+        )
-    @diffs_no_whitespace ||= load_diffs(dump_commits(compare_result.diffs))
+        compare.diffs(options)
+      end
+    else
+      @diffs ||= load_diffs(st_diffs, options)
+    end
  end
  def commits
@@ -94,16 +99,18 @@ class MergeRequestDiff < ActiveRecord::Base
    end
  end
-  def load_diffs(raw)
+  def load_diffs(raw, options)
-    if raw.respond_to?(:map)
+    if raw.respond_to?(:each)
-      raw.map { |hash| Gitlab::Git::Diff.new(hash) }
+      Gitlab::Git::DiffCollection.new(raw, options)
+    else
+      Gitlab::Git::DiffCollection.new([])
    end
  end
  # Collect array of Git::Commit objects
  # between target and source branches
  def unmerged_commits
-    commits = compare_result.commits
+    commits = compare.commits
    if commits.present?
      commits = Commit.decorate(commits, merge_request.source_project).
@@ -133,27 +140,21 @@ class MergeRequestDiff < ActiveRecord::Base
    if commits.size.zero?
      self.state = :empty
-    elsif commits.size > COMMITS_SAFE_SIZE
-      self.state = :overflow_commits_safe_size
    else
-      new_diffs = unmerged_diffs
+      diff_collection = unmerged_diffs
-    end
-    if new_diffs.any?
+      if diff_collection.overflow?
-      if new_diffs.size > Commit::DIFF_HARD_LIMIT_FILES
+        # Set our state to 'overflow' to make the #empty? and #collected?
-        self.state = :overflow_diff_files_limit
+        # methods (generated by StateMachine) return false.
-        new_diffs = new_diffs.first(Commit::DIFF_HARD_LIMIT_LINES)
+        self.state = :overflow
      end
-      if new_diffs.sum { |diff| diff.diff.lines.count } > Commit::DIFF_HARD_LIMIT_LINES
+      self.real_size = diff_collection.real_size
-        self.state = :overflow_diff_lines_limit
-        new_diffs = new_diffs.first(Commit::DIFF_HARD_LIMIT_LINES)
-      end
-    end
-    if new_diffs.present?
+      if diff_collection.any?
-      new_diffs = dump_commits(new_diffs)
+        new_diffs = dump_diffs(diff_collection)
-      self.state = :collected
+        self.state = :collected
+      end
    end
    self.st_diffs = new_diffs
@@ -166,10 +167,7 @@ class MergeRequestDiff < ActiveRecord::Base
  # Collect array of Git::Diff objects
  # between target and source branches
  def unmerged_diffs
-    compare_result.diffs || []
+    compare.diffs(Commit.max_diff_options)
-  rescue Gitlab::Git::Diff::TimeoutError
-    self.state = :timeout
-    []
  end
  def repository
@@ -181,18 +179,16 @@ class MergeRequestDiff < ActiveRecord::Base
    source_commit.try(:sha)
  end
-  def compare_result
+  def compare
-    @compare_result ||=
+    @compare ||=
      begin
        # Update ref for merge request
        merge_request.fetch_ref
-        Gitlab::CompareResult.new(
+        Gitlab::Git::Compare.new(
-          Gitlab::Git::Compare.new(
+          self.repository.raw_repository,
-            self.repository.raw_repository,
+          self.target_branch,
-            self.target_branch,
+          self.source_sha
-            self.source_sha
-          )
        )
      end
  end

--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -24,12 +24,13 @@ class Milestone < ActiveRecord::Base
  include Sortable
  include Referable
  include StripAttribute
+  include Milestoneish
  belongs_to :project
  has_many :issues
  has_many :labels, -> { distinct.reorder('labels.title') },  through: :issues
  has_many :merge_requests
-  has_many :participants, through: :issues, source: :assignee
+  has_many :participants, -> { distinct.reorder('users.name') }, through: :issues, source: :assignee
  scope :active, -> { with_state(:active) }
  scope :closed, -> { with_state(:closed) }
@@ -92,37 +93,6 @@ class Milestone < ActiveRecord::Base
    end
  end
-  def open_items_count
-    self.issues.opened.count + self.merge_requests.opened.count
-  end
-  def closed_items_count
-    self.issues.closed.count + self.merge_requests.closed_and_merged.count
-  end
-  def total_items_count
-    self.issues.count + self.merge_requests.count
-  end
-  def percent_complete
-    ((closed_items_count * 100) / total_items_count).abs
-  rescue ZeroDivisionError
-    0
-  end
-  # Returns the elapsed time (in percent) since the Milestone creation date until today.
-  # If the Milestone doesn't have a due_date then returns 0 since we can't calculate the elapsed time.
-  # If the Milestone is overdue then it returns 100%.
-  def percent_time_used
-    return 0 unless due_date
-    return 100 if expired?
-    duration = ((created_at - due_date.to_datetime) / 1.day)
-    days_elapsed = ((created_at - Time.now) / 1.day)
-    ((days_elapsed.to_f / duration) * 100).floor
-  end
  def expires_at
    if due_date
      if due_date.past?

--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -39,6 +39,7 @@ class Note < ActiveRecord::Base
  has_many :todos, dependent: :destroy
+  delegate :gfm_reference, :local_reference, to: :noteable
  delegate :name, to: :project, prefix: true
  delegate :name, :email, to: :author, prefix: true
@@ -87,7 +88,7 @@ class Note < ActiveRecord::Base
        next if discussion_ids.include?(note.discussion_id)
        # don't group notes for the main target
-        if !note.for_diff_line? && note.noteable_type == "MergeRequest"
+        if !note.for_diff_line? && note.for_merge_request?
          discussions << [note]
        else
          discussions << notes.select do |other_note|
@@ -131,9 +132,11 @@ class Note < ActiveRecord::Base
  end
  def find_diff
-    return nil unless noteable && noteable.diffs.present?
+    return nil unless noteable
+    return @diff if defined?(@diff)
-    @diff ||= noteable.diffs.find do |d|
+    # Don't use ||= because nil is a valid value for @diff
+    @diff = noteable.diffs(Commit.max_diff_options).find do |d|
      Digest::SHA1.hexdigest(d.new_path) == diff_file_index if d.new_path
    end
  end
@@ -165,20 +168,16 @@ class Note < ActiveRecord::Base
  def active?
    return true unless self.diff
    return false unless noteable
+    return @active if defined?(@active)
-    noteable.diffs.each do |mr_diff|
+    diffs = noteable.diffs(Commit.max_diff_options)
-      next unless mr_diff.new_path == self.diff.new_path
+    notable_diff = diffs.find { |d| d.new_path == self.diff.new_path }
-      lines = Gitlab::Diff::Parser.new.parse(mr_diff.diff.lines.to_a)
+    return @active = false if notable_diff.nil?
-      lines.each do |line|
+    parsed_lines = Gitlab::Diff::Parser.new.parse(notable_diff.diff.each_line)
-        if line.text == diff_line
+    # We cannot use ||= because @active may be false
-          return true
+    @active = parsed_lines.any? { |line_obj| line_obj.text == diff_line }
-        end
-      end
-    end
-    false
  end
  def outdated?
@@ -263,7 +262,7 @@ class Note < ActiveRecord::Base
  end
  def diff_lines
-    @diff_lines ||= Gitlab::Diff::Parser.new.parse(diff.diff.lines)
+    @diff_lines ||= Gitlab::Diff::Parser.new.parse(diff.diff.each_line)
  end
  def highlighted_diff_lines
@@ -315,20 +314,6 @@ class Note < ActiveRecord::Base
    nil
  end
-  # Mentionable override.
-  def gfm_reference(from_project = nil)
-    noteable.gfm_reference(from_project)
-  end
-  # Mentionable override.
-  def local_reference
-    noteable
-  end
-  def noteable_type_name
-    noteable_type.downcase if noteable_type.present?
-  end
  # FIXME: Hack for polymorphic associations with STI
  #        For more information visit http://api.rubyonrails.org/classes/ActiveRecord/Associations/ClassMethods.html#label-Polymorphic+Associations
  def noteable_type=(noteable_type)
@@ -348,10 +333,6 @@ class Note < ActiveRecord::Base
    Event.reset_event_cache_for(self)
  end
-  def system?
-    read_attribute(:system)
-  end
  def downvote?
    is_award && note == "thumbsdown"
  end
@@ -385,7 +366,7 @@ class Note < ActiveRecord::Base
  private
  def awards_supported?
-    (noteable.kind_of?(Issue) || noteable.is_a?(MergeRequest)) && !for_diff_line?
+    (for_issue? || for_merge_request?) && !for_diff_line?
  end
  def contains_emoji_only?

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -215,6 +215,7 @@ class Project < ActiveRecord::Base
  scope :public_only, -> { where(visibility_level: Project::PUBLIC) }
  scope :public_and_internal_only, -> { where(visibility_level: Project.public_and_internal_levels) }
  scope :non_archived, -> { where(archived: false) }
+  scope :for_milestones, ->(ids) { joins(:milestones).where('milestones.id' => ids).distinct }
  state_machine :import_status, initial: :none do
    event :import_start do
@@ -278,7 +279,7 @@ class Project < ActiveRecord::Base
    end
    def search_by_title(query)
-      where('projects.archived = ?', false).where('LOWER(projects.name) LIKE :query', query: "%#{query.downcase}%")
+      non_archived.where('LOWER(projects.name) LIKE :query', query: "%#{query.downcase}%")
    end
    def find_with_namespace(id)
@@ -711,6 +712,8 @@ class Project < ActiveRecord::Base
    old_path_with_namespace = File.join(namespace_dir, path_was)
    new_path_with_namespace = File.join(namespace_dir, path)
+    expire_caches_before_rename(old_path_with_namespace)
    if gitlab_shell.mv_repository(old_path_with_namespace, new_path_with_namespace)
      # If repository moved successfully we need to send update instructions to users.
      # However we cannot allow rollback since we moved repository
@@ -739,6 +742,22 @@ class Project < ActiveRecord::Base
    Gitlab::UploadsTransfer.new.rename_project(path_was, path, namespace.path)
  end
+  # Expires various caches before a project is renamed.
+  def expire_caches_before_rename(old_path)
+    repo = Repository.new(old_path, self)
+    wiki = Repository.new("#{old_path}.wiki", self)
+    if repo.exists?
+      repo.expire_cache
+      repo.expire_emptiness_caches
+    end
+    if wiki.exists?
+      wiki.expire_cache
+      wiki.expire_emptiness_caches
+    end
+  end
  def hook_attrs
    {
      name: name,

--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -108,7 +108,8 @@ class JiraService < IssueTrackerService
      },
      entity: {
        name: noteable_name.humanize.downcase,
-        url: entity_url
+        url: entity_url,
+        title: noteable.title
      }
    }
@@ -196,10 +197,11 @@ class JiraService < IssueTrackerService
    user_url = data[:user][:url]
    entity_name = data[:entity][:name]
    entity_url = data[:entity][:url]
+    entity_title = data[:entity][:title]
    project_name = data[:project][:name]
    message = {
-      body: "[#{user_name}|#{user_url}] mentioned this issue in [a #{entity_name} of #{project_name}|#{entity_url}]."
+      body: %Q{[#{user_name}|#{user_url}] mentioned this issue in [a #{entity_name} of #{project_name}|#{entity_url}]:\n'#{entity_title}'}
    }
    unless existing_comment?(issue_name, message[:body])

--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -654,30 +654,38 @@ class Repository
    end
  end
-  def revert(user, commit, base_branch, target_branch = nil)
+  def revert(user, commit, base_branch, revert_tree_id = nil)
-    source_sha    = find_branch(base_branch).target
+    source_sha = find_branch(base_branch).target
-    target_branch ||= base_branch
+    revert_tree_id ||= check_revert_content(commit, base_branch)
-    args          = [commit.id, source_sha]
-    args          << { mainline: 1 } if commit.merge_commit?
-    revert_index = rugged.revert_commit(*args)
+    return false unless revert_tree_id
-    return false if revert_index.conflicts?
-    tree_id = revert_index.write_tree(rugged)
-    return false unless diff_exists?(source_sha, tree_id)
-    commit_with_hooks(user, target_branch) do |ref|
+    commit_with_hooks(user, base_branch) do |ref|
      committer = user_to_committer(user)
      source_sha = Rugged::Commit.create(rugged,
        message: commit.revert_message,
        author: committer,
        committer: committer,
-        tree: tree_id,
+        tree: revert_tree_id,
        parents: [rugged.lookup(source_sha)],
        update_ref: ref)
    end
  end
+  def check_revert_content(commit, base_branch)
+    source_sha = find_branch(base_branch).target
+    args       = [commit.id, source_sha]
+    args       << { mainline: 1 } if commit.merge_commit?
+    revert_index = rugged.revert_commit(*args)
+    return false if revert_index.conflicts?
+    tree_id = revert_index.write_tree(rugged)
+    return false unless diff_exists?(source_sha, tree_id)
+    tree_id
+  end
  def diff_exists?(sha1, sha2)
    rugged.diff(sha1, sha2).size > 0
  end
@@ -804,6 +812,12 @@ class Repository
    raw_repository.ls_files(actual_ref)
  end
+  def main_language
+    unless empty?
+      Linguist::Repository.new(rugged, rugged.head.target_id).language
+    end
+  end
  private
  def cache

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -169,7 +169,7 @@ class User < ActiveRecord::Base
  validates :avatar_crop_x, :avatar_crop_y, :avatar_crop_size,
    numericality: { only_integer: true },
    presence: true,
-    if: ->(user) { user.avatar? }
+    if: ->(user) { user.avatar? && user.avatar_changed? }
  before_validation :generate_password, on: :create
  before_validation :restricted_signup_domains, on: :create
@@ -362,17 +362,19 @@ class User < ActiveRecord::Base
  def disable_two_factor!
    update_attributes(
-      two_factor_enabled:        false,
+      two_factor_enabled:          false,
-      encrypted_otp_secret:      nil,
+      encrypted_otp_secret:        nil,
-      encrypted_otp_secret_iv:   nil,
+      encrypted_otp_secret_iv:     nil,
-      encrypted_otp_secret_salt: nil,
+      encrypted_otp_secret_salt:   nil,
-      otp_backup_codes:          nil
+      otp_grace_period_started_at: nil,
+      otp_backup_codes:            nil
    )
  end
  def namespace_uniq
    # Return early if username already failed the first uniqueness validation
-    return if self.errors[:username].include?('has already been taken')
+    return if self.errors.key?(:username) &&
+      self.errors[:username].include?('has already been taken')
    namespace_name = self.username
    existing_namespace = Namespace.by_path(namespace_name)

--- a/app/services/commits/revert_service.rb
+++ b/app/services/commits/revert_service.rb
@@ -17,28 +17,28 @@ module Commits
    def commit
      revert_into = @create_merge_request ? @commit.revert_branch_name : @target_branch
+      revert_tree_id = repository.check_revert_content(@commit, @target_branch)
-      if @create_merge_request
+      if revert_tree_id
-        # Temporary branch exists and contains the revert commit
+        create_target_branch(revert_into) if @create_merge_request
-        return success if repository.find_branch(revert_into)
-        create_target_branch
+        repository.revert(current_user, @commit, revert_into, revert_tree_id)
-      end
+        success
+      else
-      unless repository.revert(current_user, @commit, revert_into)
        error_msg = "Sorry, we cannot revert this #{params[:revert_type_title]} automatically.
                     It may have already been reverted, or a more recent commit may have updated some of its content."
        raise ReversionError, error_msg
      end
-      success
    end
    private
-    def create_target_branch
+    def create_target_branch(new_branch)
+      # Temporary branch exists and contains the revert commit
+      return success if repository.find_branch(new_branch)
      result = CreateBranchService.new(@project, current_user)
-                                  .execute(@commit.revert_branch_name, @target_branch, source_project: @source_project)
+                                  .execute(new_branch, @target_branch, source_project: @source_project)
      if result[:status] == :error
        raise ReversionError, "There was an error creating the source branch: #{result[:message]}"

--- a/app/services/compare_service.rb
+++ b/app/services/compare_service.rb
 require 'securerandom'
 # Compare 2 branches for one repo or between repositories
-# and return Gitlab::CompareResult object that responds to commits and diffs
+# and return Gitlab::Git::Compare object that responds to commits and diffs
 class CompareService
  def execute(source_project, source_branch, target_project, target_branch, diff_options = {})
    source_commit = source_project.commit(source_branch)
@@ -20,12 +20,10 @@ class CompareService
      )
    end
-    Gitlab::CompareResult.new(
+    Gitlab::Git::Compare.new(
-      Gitlab::Git::Compare.new(
+      target_project.repository.raw_repository,
-        target_project.repository.raw_repository,
+      target_branch,
-        target_branch,
+      source_sha,
-        source_sha,
-      ), diff_options
    )
  end
 end
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -14,6 +14,7 @@ class GitPushService < BaseService
  #  3. Recognizes cross-references from commit messages
  #  4. Executes the project's web hooks
  #  5. Executes the project's services
+  #  6. Checks if the project's main language has changed
  #
  def execute
    @project.repository.after_push_commit(branch_name)
@@ -42,11 +43,24 @@ class GitPushService < BaseService
      @push_commits = @project.repository.commits_between(params[:oldrev], params[:newrev])
      process_commit_messages
    end
+    # Checks if the main language has changed in the project and if so
+    # it updates it accordingly
+    update_main_language
    # Update merge requests that may be affected by this push. A new branch
    # could cause the last commit of a merge request to change.
    update_merge_requests
  end
+  def update_main_language
+    current_language = @project.repository.main_language
+    unless current_language == @project.main_language
+      return @project.update_attributes(main_language: current_language)
+    end
+    true
+  end
  protected
  def update_merge_requests

--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -5,9 +5,7 @@ module MergeRequests
      # Set MR attributes
      merge_request.can_be_created = false
-      merge_request.compare_failed = false
      merge_request.compare_commits = []
-      merge_request.compare_diffs = []
      merge_request.source_project = project unless merge_request.source_project
      merge_request.target_project ||= (project.forked_from_project || project)
      merge_request.target_branch ||= merge_request.target_project.default_branch
@@ -21,35 +19,23 @@ module MergeRequests
        return build_failed(merge_request, message)
      end
-      compare_result = CompareService.new.execute(
+      compare = CompareService.new.execute(
        merge_request.source_project,
        merge_request.source_branch,
        merge_request.target_project,
        merge_request.target_branch,
      )
-      commits = compare_result.commits
+      commits = compare.commits
      # At this point we decide if merge request can be created
      # If we have at least one commit to merge -> creation allowed
      if commits.present?
        merge_request.compare_commits = Commit.decorate(commits, merge_request.source_project)
        merge_request.can_be_created = true
-        merge_request.compare_failed = false
+        merge_request.compare = compare
-        # Try to collect diff for merge request.
-        diffs = compare_result.diffs
-        if diffs.present?
-          merge_request.compare_diffs = diffs
-        elsif diffs == false
-          merge_request.can_be_created = false
-          merge_request.compare_failed = true
-        end
      else
        merge_request.can_be_created = false
-        merge_request.compare_failed = false
      end
      commits = merge_request.compare_commits

--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -66,7 +66,7 @@ class SystemNoteService
  def self.change_label(noteable, project, author, added_labels, removed_labels)
    labels_count = added_labels.count + removed_labels.count
-    references     = ->(label) { label.to_reference(:id) }
+    references     = ->(label) { label.to_reference(format: :id) }
    added_labels   = added_labels.map(&references).join(' ')
    removed_labels = removed_labels.map(&references).join(' ')

--- a/app/views/abuse_reports/new.html.haml
+++ b/app/views/abuse_reports/new.html.haml
@@ -2,7 +2,7 @@
 %h3.page-title Report abuse
 %p Please use this form to report users who create spam issues, comments or behave inappropriately.
 %hr
-= form_for @abuse_report, html: { class: 'form-horizontal js-requires-input'} do |f|
+= form_for @abuse_report, html: { class: 'form-horizontal js-quick-submit js-requires-input'} do |f|
  = f.hidden_field :user_id
  - if @abuse_report.errors.any?
    .alert.alert-danger
@@ -16,7 +16,7 @@
  .form-group
    = f.label :message, class: 'control-label'
    .col-sm-10
-      = f.text_area :message, class: "form-control js-quick-submit", rows: 2, required: true, value: sanitize(@ref_url)
+      = f.text_area :message, class: "form-control", rows: 2, required: true, value: sanitize(@ref_url)
      .help-block
        Explain the problem with this user. If appropriate, provide a link to the relevant issue or comment.

--- a/app/views/admin/broadcast_messages/_form.html.haml
+++ b/app/views/admin/broadcast_messages/_form.html.haml
@@ -3,7 +3,7 @@
  .js-broadcast-message-preview
    = render_broadcast_message(@broadcast_message.message.presence || "Your message here")
-= form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form form-horizontal js-requires-input'} do |f|
+= form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form form-horizontal js-quick-submit js-requires-input'} do |f|
  -if @broadcast_message.errors.any?
    .alert.alert-danger
      - @broadcast_message.errors.full_messages.each do |msg|
@@ -11,7 +11,7 @@
  .form-group
    = f.label :message, class: 'control-label'
    .col-sm-10
-      = f.text_area :message, class: "form-control js-quick-submit js-autosize",
+      = f.text_area :message, class: "form-control js-autosize",
        required: true,
        data: { preview_path: preview_admin_broadcast_messages_path }
  .form-group.js-toggle-colors-container

--- a/app/views/admin/users/keys.html.haml
+++ b/app/views/admin/users/keys.html.haml
- page_title "Keys", @user.name, "Users"
+- page_title "SSH Keys", @user.name, "Users"
 = render 'admin/users/head'
 = render 'profiles/keys/key_table', admin: true
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -14,7 +14,7 @@
  .nav-controls
    = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
-      = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control input-short projects-list-filter', spellcheck: false, id: 'project-filter-form-field'
+      = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control input-short projects-list-filter', spellcheck: false, id: 'project-filter-form-field', tabindex: "2"
    = render 'explore/projects/dropdown'
    - if current_user.can_create_project?
      = link_to new_project_path, class: 'btn btn-new' do

--- a/app/views/dashboard/milestones/_issue.html.haml
+++ b/app/views/dashboard/milestones/_issue.html.haml
-%li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid }
-  %span.milestone-row
-    - project = issue.project
-    %strong #{project.name_with_namespace} &middot;
-    = link_to [project.namespace.becomes(Namespace), project, issue] do
-      %span.cgray ##{issue.iid}
-    = link_to_gfm issue.title, [project.namespace.becomes(Namespace), project, issue], title: issue.title
-  .pull-right.assignee-icon
-    - if issue.assignee
-      = image_tag avatar_icon(issue.assignee, 16), class: "avatar s16"
--- a/app/views/dashboard/milestones/_issues.html.haml
+++ b/app/views/dashboard/milestones/_issues.html.haml
-.panel.panel-default
-  .panel-heading= title
-  %ul{ class: "well-list issues-sortable-list" }
-    - if issues
-      - issues.each do |issue|
-        = render 'issue', issue: issue
--- a/app/views/dashboard/milestones/_merge_request.html.haml
+++ b/app/views/dashboard/milestones/_merge_request.html.haml
-%li{ id: dom_id(merge_request, 'sortable'),  class: 'mr-row', 'data-iid' => merge_request.iid }
-  %span.milestone-row
-    - project = merge_request.project
-    %strong #{project.name_with_namespace} &middot;
-    = link_to [project.namespace.becomes(Namespace), project, merge_request] do
-      %span.cgray ##{merge_request.iid}
-    = link_to_gfm merge_request.title, [project.namespace.becomes(Namespace), project, merge_request], title: merge_request.title
-  .pull-right.assignee-icon
-    - if merge_request.assignee
-      = image_tag avatar_icon(merge_request.assignee, 16), class: "avatar s16"
--- a/app/views/dashboard/milestones/_merge_requests.html.haml
+++ b/app/views/dashboard/milestones/_merge_requests.html.haml
-.panel.panel-default
-  .panel-heading= title
-  %ul{ class: "well-list merge_requests-sortable-list" }
-    - if merge_requests
-      - merge_requests.each do |merge_request|
-        = render 'merge_request', merge_request: merge_request
--- a/app/views/dashboard/milestones/_milestone.html.haml
+++ b/app/views/dashboard/milestones/_milestone.html.haml
-%li{class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: dom_id(milestone.milestones.first) }
+= render 'shared/milestones/milestone',
-  .row
+          milestone_path: dashboard_milestone_path(milestone.safe_title, title: milestone.title),
-    .col-sm-6
+          issues_path: issues_dashboard_path(milestone_title: milestone.title),
-      %strong
+          merge_requests_path: merge_requests_dashboard_path(milestone_title: milestone.title),
-        = link_to_gfm truncate(milestone.title, length: 100), dashboard_milestone_path(milestone.safe_title, title: milestone.title)
+          milestone: milestone,
-    .col-sm-6
+          dashboard: true
-      .pull-right.light #{milestone.percent_complete}% complete
-  .row
-    .col-sm-6
-      = link_to issues_dashboard_path(milestone_title: milestone.title) do
-        = pluralize milestone.issue_count, 'Issue'
-      &middot;
-      = link_to merge_requests_dashboard_path(milestone_title: milestone.title) do
-        = pluralize milestone.merge_requests_count, 'Merge Request'
-    .col-sm-6
-      = milestone_progress_bar(milestone)
-  .row
-    .col-sm-6
-      .expiration
-        = render 'shared/milestone_expired', milestone: milestone
-      .projects
-        - milestone.milestones.each do |milestone|
-          = link_to milestone_path(milestone) do
-            %span.label.label-gray
-              = milestone.project.name_with_namespace
--- 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/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/_projects.html.haml
+++ b/app/views/groups/_projects.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/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/profiles/_event_table.html.haml
+++ b/app/views/profiles/_event_table.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/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/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/issues/_form.html.haml
+++ b/app/views/projects/issues/_form.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/_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/_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/_form.html.haml
+++ b/app/views/shared/issuable/_form.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/_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/users/show.html.haml
+++ b/app/views/users/show.html.haml
--- a/app/workers/irker_worker.rb
+++ b/app/workers/irker_worker.rb
--- a/config/application.rb
+++ b/config/application.rb
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
--- a/config/initializers/relative_url.rb.sample
+++ b/config/initializers/relative_url.rb.sample
--- 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/20160229193553_add_main_language_to_repository.rb
+++ b/db/migrate/20160229193553_add_main_language_to_repository.rb
--- a/db/schema.rb
+++ b/db/schema.rb
--- a/doc/api/commits.md
+++ b/doc/api/commits.md
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.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/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
--- a/doc/development/doc_styleguide.md
+++ b/doc/development/doc_styleguide.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/integration/README.md
+++ b/doc/integration/README.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/markdown/markdown.md
+++ b/doc/markdown/markdown.md
--- a/doc/project_services/jira.md
+++ b/doc/project_services/jira.md
--- a/doc/update/8.4-to-8.5.md
+++ b/doc/update/8.4-to-8.5.md
--- a/doc/update/patch_versions.md
+++ b/doc/update/patch_versions.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/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/search.feature
+++ b/features/search.feature
--- 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/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/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/search.rb
+++ b/features/steps/search.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/user.feature
+++ b/features/user.feature
--- 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/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/gitlab/compare_result.rb
+++ b/lib/gitlab/compare_result.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/email/message/repository_push.rb
+++ b/lib/gitlab/email/message/repository_push.rb
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
--- a/lib/tasks/brakeman.rake
+++ b/lib/tasks/brakeman.rake
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
--- 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/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/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/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/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/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/login_spec.rb
+++ b/spec/features/login_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/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/gitlab/diff/parser_spec.rb
+++ b/spec/lib/gitlab/diff/parser_spec.rb
--- a/spec/lib/gitlab/email/message/repository_push_spec.rb
+++ b/spec/lib/gitlab/email/message/repository_push_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/note_spec.rb
+++ b/spec/models/note_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/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/project_members_spec.rb
+++ b/spec/requests/api/project_members_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/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/git_push_service_spec.rb
+++ b/spec/services/git_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/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb