From f4ed780ef5fc76b7704742d4886ac435c3e5ab98 Mon Sep 17 00:00:00 2001
From: George Andrinopoulos <geoandri@gmail.com>
Date: Mon, 6 Nov 2017 19:51:24 +0200
Subject: Add Group Milestone sorting

---
 app/controllers/groups/milestones_controller.rb    |  3 +-
 app/views/groups/milestones/index.html.haml        |  1 +
 .../_group_milestones_sort_dropdown.html.haml      | 22 +++++++++++
 .../unreleased/39720-group-milestone-sorting.yml   |  5 +++
 lib/milestone_array.rb                             | 40 +++++++++++++++++++
 spec/features/groups/milestones_sorting_spec.rb    | 46 ++++++++++++++++++++++
 spec/lib/milestone_array_spec.rb                   | 34 ++++++++++++++++
 7 files changed, 150 insertions(+), 1 deletion(-)
 create mode 100644 app/views/shared/_group_milestones_sort_dropdown.html.haml
 create mode 100644 changelogs/unreleased/39720-group-milestone-sorting.yml
 create mode 100644 lib/milestone_array.rb
 create mode 100644 spec/features/groups/milestones_sorting_spec.rb
 create mode 100644 spec/lib/milestone_array_spec.rb

diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index 7a7bcb1a3d2..f013d21275e 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -80,7 +80,8 @@ class Groups::MilestonesController < Groups::ApplicationController
     milestones = MilestonesFinder.new(search_params).execute
     legacy_milestones = GroupMilestone.build_collection(group, group_projects, params)
 
-    milestones + legacy_milestones
+    @sort = params[:sort] || 'due_date_asc'
+    MilestoneArray.sort(milestones + legacy_milestones, @sort)
   end
 
   def milestone
diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml
index cb4fc69d5b8..6c199c52583 100644
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
@@ -4,6 +4,7 @@
   = render 'shared/milestones_filter', counts: @milestone_states
 
   .nav-controls
+    = render 'shared/group_milestones_sort_dropdown'
     - if can?(current_user, :admin_milestones, @group)
       = link_to "New milestone", new_group_milestone_path(@group), class: "btn btn-new"
 
diff --git a/app/views/shared/_group_milestones_sort_dropdown.html.haml b/app/views/shared/_group_milestones_sort_dropdown.html.haml
new file mode 100644
index 00000000000..9b2f2fdcc93
--- /dev/null
+++ b/app/views/shared/_group_milestones_sort_dropdown.html.haml
@@ -0,0 +1,22 @@
+.dropdown.inline.prepend-left-10
+  %button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown' } }
+    %span.light
+    - if @sort.present?
+      = milestone_sort_options_hash[@sort]
+    - else
+      = sort_title_due_date_soon
+    = icon('chevron-down')
+  %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-sort
+    %li
+      = link_to page_filter_path(sort: sort_value_due_date_soon, label: true) do
+        = sort_title_due_date_soon
+      = link_to page_filter_path(sort: sort_value_due_date_later, label: true) do
+        = sort_title_due_date_later
+      = link_to page_filter_path(sort: sort_value_start_date_soon, label: true) do
+        = sort_title_start_date_soon
+      = link_to page_filter_path(sort: sort_value_start_date_later, label: true) do
+        = sort_title_start_date_later
+      = link_to page_filter_path(sort: sort_value_name, label: true) do
+        = sort_title_name_asc
+      = link_to page_filter_path(sort: sort_value_name_desc, label: true) do
+        = sort_title_name_desc
diff --git a/changelogs/unreleased/39720-group-milestone-sorting.yml b/changelogs/unreleased/39720-group-milestone-sorting.yml
new file mode 100644
index 00000000000..15ef87fa567
--- /dev/null
+++ b/changelogs/unreleased/39720-group-milestone-sorting.yml
@@ -0,0 +1,5 @@
+---
+title: Add dropdown sort to group milestones
+merge_request: 15230
+author: George Andrinopoulos
+type: added
diff --git a/lib/milestone_array.rb b/lib/milestone_array.rb
new file mode 100644
index 00000000000..9b3f2acc123
--- /dev/null
+++ b/lib/milestone_array.rb
@@ -0,0 +1,40 @@
+module MilestoneArray
+  class << self
+    def sort(array, sort_method)
+      case sort_method
+      when 'due_date_asc'
+        sort_asc_nulls_last(array, 'due_date')
+      when 'due_date_desc'
+        sort_desc_nulls_last(array, 'due_date')
+      when 'start_date_asc'
+        sort_asc_nulls_last(array, 'start_date')
+      when 'start_date_desc'
+        sort_desc_nulls_last(array, 'start_date')
+      when 'name_asc'
+        sort_asc(array, 'title')
+      when 'name_desc'
+        sort_desc(array, 'title')
+      else
+        array
+      end
+    end
+
+    private
+
+    def sort_asc_nulls_last(array, attribute)
+      array.select(&attribute.to_sym).sort_by(&attribute.to_sym) + array.reject(&attribute.to_sym)
+    end
+
+    def sort_desc_nulls_last(array, attribute)
+      array.select(&attribute.to_sym).sort_by(&attribute.to_sym).reverse + array.reject(&attribute.to_sym)
+    end
+
+    def sort_asc(array, attribute)
+      array.sort_by(&attribute.to_sym)
+    end
+
+    def sort_desc(array, attribute)
+      array.sort_by(&attribute.to_sym).reverse
+    end
+  end
+end
diff --git a/spec/features/groups/milestones_sorting_spec.rb b/spec/features/groups/milestones_sorting_spec.rb
new file mode 100644
index 00000000000..3bd59587535
--- /dev/null
+++ b/spec/features/groups/milestones_sorting_spec.rb
@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+feature 'Milestones sorting', :js do
+  let(:group) { create(:group) }
+  let!(:project) { create(:project_empty_repo, group: group) }
+  let!(:other_project) { create(:project_empty_repo, group: group) }
+  let!(:project_milestone1) { create(:milestone, project: project, title: 'v1.0', due_date: 10.days.from_now) }
+  let!(:other_project_milestone1) { create(:milestone, project: other_project, title: 'v1.0', due_date: 10.days.from_now) }
+  let!(:project_milestone2) { create(:milestone, project: project, title: 'v2.0', due_date: 5.days.from_now) }
+  let!(:other_project_milestone2) { create(:milestone, project: other_project, title: 'v2.0', due_date: 5.days.from_now) }
+  let(:user) { create(:group_member, :master, user: create(:user), group: group ).user }
+
+  before do
+    sign_in(user)
+  end
+
+  scenario 'visit group milestones and sort by due_date_asc' do
+    visit group_milestones_path(group)
+
+    expect(page).to have_button('Due soon')
+
+    # assert default sorting
+    within '.milestones' do
+      expect(page.all('ul.content-list > li').first.text).to include('v2.0')
+      expect(page.all('ul.content-list > li').last.text).to include('v1.0')
+    end
+
+    click_button 'Due soon'
+
+    sort_options = find('ul.dropdown-menu-sort li').all('a').collect(&:text)
+
+    expect(sort_options[0]).to eq('Due soon')
+    expect(sort_options[1]).to eq('Due later')
+    expect(sort_options[2]).to eq('Start soon')
+    expect(sort_options[3]).to eq('Start later')
+
+    click_link 'Due later'
+
+    expect(page).to have_button('Due later')
+
+    within '.milestones' do
+      expect(page.all('ul.content-list > li').first.text).to include('v1.0')
+      expect(page.all('ul.content-list > li').last.text).to include('v2.0')
+    end
+  end
+end
diff --git a/spec/lib/milestone_array_spec.rb b/spec/lib/milestone_array_spec.rb
new file mode 100644
index 00000000000..df91677b925
--- /dev/null
+++ b/spec/lib/milestone_array_spec.rb
@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe MilestoneArray do
+  let(:object1) { instance_double("BirdMilestone", due_date: Time.now, start_date: Time.now - 15.days, title: 'v2.0') }
+  let(:object2) { instance_double("CatMilestone", due_date: Time.now - 1.day, start_date: nil, title: 'v1.0') }
+  let(:object3) { instance_double("DogMilestone", due_date: nil, start_date: Time.now - 30.days, title: 'v3.0') }
+  let(:array) { [object1, object3, object2] }
+
+  describe '#sort' do
+    it 'reorders array with due date in ascending order with nulls last' do
+      expect(described_class.sort(array, 'due_date_asc')).to eq([object2, object1, object3])
+    end
+
+    it 'reorders array with due date in desc order with nulls last' do
+      expect(described_class.sort(array, 'due_date_desc')).to eq([object1, object2, object3])
+    end
+
+    it 'reorders array with start date in ascending order with nulls last' do
+      expect(described_class.sort(array, 'start_date_asc')).to eq([object3, object1, object2])
+    end
+
+    it 'reorders array with start date in descending order with nulls last' do
+      expect(described_class.sort(array, 'start_date_desc')).to eq([object1, object3, object2])
+    end
+
+    it 'reorders array with title in ascending order' do
+      expect(described_class.sort(array, 'name_asc')).to eq([object2, object1, object3])
+    end
+
+    it 'reorders array with title in descending order' do
+      expect(described_class.sort(array, 'name_desc')).to eq([object3, object1, object2])
+    end
+  end
+end
-- 
cgit v1.2.1


From a4d71cba7ef80e6f3c10f148dd1edfbef7f82893 Mon Sep 17 00:00:00 2001
From: George Andrinopoulos <geoandri@gmail.com>
Date: Tue, 7 Nov 2017 20:57:30 +0200
Subject: Add group milestone to feature spec and minor changes

---
 app/views/groups/milestones/index.html.haml        |  2 +-
 .../_group_milestones_sort_dropdown.html.haml      | 22 ----------------------
 lib/milestone_array.rb                             | 14 +++++++-------
 spec/features/groups/milestones_sorting_spec.rb    |  5 +++++
 4 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 app/views/shared/_group_milestones_sort_dropdown.html.haml

diff --git a/app/views/groups/milestones/index.html.haml b/app/views/groups/milestones/index.html.haml
index 6c199c52583..f5f621507b8 100644
--- a/app/views/groups/milestones/index.html.haml
+++ b/app/views/groups/milestones/index.html.haml
@@ -4,7 +4,7 @@
   = render 'shared/milestones_filter', counts: @milestone_states
 
   .nav-controls
-    = render 'shared/group_milestones_sort_dropdown'
+    = render 'shared/milestones_sort_dropdown'
     - if can?(current_user, :admin_milestones, @group)
       = link_to "New milestone", new_group_milestone_path(@group), class: "btn btn-new"
 
diff --git a/app/views/shared/_group_milestones_sort_dropdown.html.haml b/app/views/shared/_group_milestones_sort_dropdown.html.haml
deleted file mode 100644
index 9b2f2fdcc93..00000000000
--- a/app/views/shared/_group_milestones_sort_dropdown.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-.dropdown.inline.prepend-left-10
-  %button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown' } }
-    %span.light
-    - if @sort.present?
-      = milestone_sort_options_hash[@sort]
-    - else
-      = sort_title_due_date_soon
-    = icon('chevron-down')
-  %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-sort
-    %li
-      = link_to page_filter_path(sort: sort_value_due_date_soon, label: true) do
-        = sort_title_due_date_soon
-      = link_to page_filter_path(sort: sort_value_due_date_later, label: true) do
-        = sort_title_due_date_later
-      = link_to page_filter_path(sort: sort_value_start_date_soon, label: true) do
-        = sort_title_start_date_soon
-      = link_to page_filter_path(sort: sort_value_start_date_later, label: true) do
-        = sort_title_start_date_later
-      = link_to page_filter_path(sort: sort_value_name, label: true) do
-        = sort_title_name_asc
-      = link_to page_filter_path(sort: sort_value_name_desc, label: true) do
-        = sort_title_name_desc
diff --git a/lib/milestone_array.rb b/lib/milestone_array.rb
index 9b3f2acc123..4ed8485b36a 100644
--- a/lib/milestone_array.rb
+++ b/lib/milestone_array.rb
@@ -13,7 +13,7 @@ module MilestoneArray
       when 'name_asc'
         sort_asc(array, 'title')
       when 'name_desc'
-        sort_desc(array, 'title')
+        sort_asc(array, 'title').reverse
       else
         array
       end
@@ -22,19 +22,19 @@ module MilestoneArray
     private
 
     def sort_asc_nulls_last(array, attribute)
-      array.select(&attribute.to_sym).sort_by(&attribute.to_sym) + array.reject(&attribute.to_sym)
+      attribute = attribute.to_sym
+
+      array.select(&attribute).sort_by(&attribute) + array.reject(&attribute)
     end
 
     def sort_desc_nulls_last(array, attribute)
-      array.select(&attribute.to_sym).sort_by(&attribute.to_sym).reverse + array.reject(&attribute.to_sym)
+      attribute = attribute.to_sym
+
+      array.select(&attribute).sort_by(&attribute).reverse + array.reject(&attribute)
     end
 
     def sort_asc(array, attribute)
       array.sort_by(&attribute.to_sym)
     end
-
-    def sort_desc(array, attribute)
-      array.sort_by(&attribute.to_sym).reverse
-    end
   end
 end
diff --git a/spec/features/groups/milestones_sorting_spec.rb b/spec/features/groups/milestones_sorting_spec.rb
index 3bd59587535..a0fe40cf1d3 100644
--- a/spec/features/groups/milestones_sorting_spec.rb
+++ b/spec/features/groups/milestones_sorting_spec.rb
@@ -8,6 +8,7 @@ feature 'Milestones sorting', :js do
   let!(:other_project_milestone1) { create(:milestone, project: other_project, title: 'v1.0', due_date: 10.days.from_now) }
   let!(:project_milestone2) { create(:milestone, project: project, title: 'v2.0', due_date: 5.days.from_now) }
   let!(:other_project_milestone2) { create(:milestone, project: other_project, title: 'v2.0', due_date: 5.days.from_now) }
+  let!(:group_milestone) { create(:milestone, group: group, title: 'v3.0', due_date: 7.days.from_now) }
   let(:user) { create(:group_member, :master, user: create(:user), group: group ).user }
 
   before do
@@ -22,6 +23,7 @@ feature 'Milestones sorting', :js do
     # assert default sorting
     within '.milestones' do
       expect(page.all('ul.content-list > li').first.text).to include('v2.0')
+      expect(page.all('ul.content-list > li')[1].text).to include('v3.0')
       expect(page.all('ul.content-list > li').last.text).to include('v1.0')
     end
 
@@ -33,6 +35,8 @@ feature 'Milestones sorting', :js do
     expect(sort_options[1]).to eq('Due later')
     expect(sort_options[2]).to eq('Start soon')
     expect(sort_options[3]).to eq('Start later')
+    expect(sort_options[4]).to eq('Name, ascending')
+    expect(sort_options[5]).to eq('Name, descending')
 
     click_link 'Due later'
 
@@ -40,6 +44,7 @@ feature 'Milestones sorting', :js do
 
     within '.milestones' do
       expect(page.all('ul.content-list > li').first.text).to include('v1.0')
+      expect(page.all('ul.content-list > li')[1].text).to include('v3.0')
       expect(page.all('ul.content-list > li').last.text).to include('v2.0')
     end
   end
-- 
cgit v1.2.1


From ecb151658d23418b98267c0dd4d0850f881ea9a8 Mon Sep 17 00:00:00 2001
From: Mark Pundsack <mpundsack@gitlab.com>
Date: Thu, 9 Nov 2017 11:43:39 -0600
Subject: Simplify Feature Proposal template

---
 .gitlab/issue_templates/Feature Proposal.md | 43 +----------------------------
 1 file changed, 1 insertion(+), 42 deletions(-)

diff --git a/.gitlab/issue_templates/Feature Proposal.md b/.gitlab/issue_templates/Feature Proposal.md
index 1278061a410..5b55eb1374b 100644
--- a/.gitlab/issue_templates/Feature Proposal.md	
+++ b/.gitlab/issue_templates/Feature Proposal.md	
@@ -1,22 +1,3 @@
-Please read this!
-
-Before opening a new issue, make sure to search for keywords in the issues
-filtered by the "feature proposal" label:
-
-For the Community Edition issue tracker:
-
-- https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name%5B%5D=feature+proposal
-
-For the Enterprise Edition issue tracker:
-
-- https://gitlab.com/gitlab-org/gitlab-ee/issues?label_name%5B%5D=feature+proposal
-
-and verify the issue you're about to submit isn't a duplicate.
-
-Please remove this notice if you're confident your issue isn't a duplicate.
-
-------
-
 ### Description
 
 (Include problem, use cases, benefits, and/or goals)
@@ -25,26 +6,4 @@ Please remove this notice if you're confident your issue isn't a duplicate.
 
 ### Links / references
 
-### Documentation blurb
-
-#### Overview
-
-What is it?
-Why should someone use this feature?
-What is the underlying (business) problem?
-How do you use this feature?
-
-#### Use cases
-
-Who is this for? Provide one or more use cases.
-
-### Feature checklist
-
-Make sure these are completed before closing the issue,
-with a link to the relevant commit.
-
-- [ ] [Feature assurance](https://about.gitlab.com/handbook/product/#feature-assurance)
-- [ ] Documentation
-- [ ] Added to [features.yml](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/features.yml)
-
-/label ~"feature proposal"
\ No newline at end of file
+/label ~"feature proposal"
-- 
cgit v1.2.1


From 4374a38f0e8fbd856458a60f47083fb4d084d695 Mon Sep 17 00:00:00 2001
From: "micael.bergeron" <micaelbergeron@gmail.com>
Date: Wed, 15 Nov 2017 09:12:04 -0500
Subject: fix the commit reference pattern from matching other entities

---
 app/models/commit.rb                               |  2 +-
 ...-no-longer-returns-label-additions-removals.yml |  5 +++++
 spec/models/commit_spec.rb                         | 23 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/39461-notes-api-for-issues-no-longer-returns-label-additions-removals.yml

diff --git a/app/models/commit.rb b/app/models/commit.rb
index 6dba154a6ea..e28bf28fab3 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -26,7 +26,7 @@ class Commit
   DIFF_HARD_LIMIT_LINES = 50000
 
   MIN_SHA_LENGTH = 7
-  COMMIT_SHA_PATTERN = /\h{#{MIN_SHA_LENGTH},40}/.freeze
+  COMMIT_SHA_PATTERN = /\b(?<![~#!@:])\h{#{MIN_SHA_LENGTH},40}/.freeze
 
   def banzai_render_context(field)
     context = { pipeline: :single_line, project: self.project }
diff --git a/changelogs/unreleased/39461-notes-api-for-issues-no-longer-returns-label-additions-removals.yml b/changelogs/unreleased/39461-notes-api-for-issues-no-longer-returns-label-additions-removals.yml
new file mode 100644
index 00000000000..36c2f789eeb
--- /dev/null
+++ b/changelogs/unreleased/39461-notes-api-for-issues-no-longer-returns-label-additions-removals.yml
@@ -0,0 +1,5 @@
+---
+title: Label addition/removal are not going to be redacted wrongfully in the API.
+merge_request: 15080
+author:
+type: fixed
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index e3cfa149e3a..3994eaba5d9 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -468,4 +468,27 @@ eos
       expect(described_class.valid_hash?('a' * 41)).to be false
     end
   end
+
+  describe '.reference_pattern' do
+    where(:ref, :matches?) do
+      sha = Digest::SHA1.hexdigest 'thisisacommitid'
+
+      [
+        [sha.first(Commit::MIN_SHA_LENGTH - 1), false],
+        [sha.first(Commit::MIN_SHA_LENGTH), true],
+        [sha, true],
+        ['~' << sha, false], # labels
+        ['!' << sha, false], # merge_request
+        [':' << sha, false], # emoji
+        ['#' << sha, false], # issue
+        ['@' << sha, false], # user
+      ]
+    end
+
+    with_them do
+      it "should match only on commit references" do
+        expect(Commit.reference_pattern.match(ref).present?).to eq(matches?)
+      end
+    end
+  end
 end
-- 
cgit v1.2.1


From 160324d08b3756f6c5fbf79b23f09d66e5a19d9e Mon Sep 17 00:00:00 2001
From: "micael.bergeron" <micaelbergeron@gmail.com>
Date: Wed, 15 Nov 2017 10:56:17 -0500
Subject: try to fix the failing spec on external refs

---
 app/models/commit.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/commit.rb b/app/models/commit.rb
index e28bf28fab3..b5411b2bf75 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -26,7 +26,7 @@ class Commit
   DIFF_HARD_LIMIT_LINES = 50000
 
   MIN_SHA_LENGTH = 7
-  COMMIT_SHA_PATTERN = /\b(?<![~#!@:])\h{#{MIN_SHA_LENGTH},40}/.freeze
+  COMMIT_SHA_PATTERN = /(?<!\s[~#!@:])\h{#{MIN_SHA_LENGTH},40}/.freeze
 
   def banzai_render_context(field)
     context = { pipeline: :single_line, project: self.project }
-- 
cgit v1.2.1


From 71b2cc1dd8497959306601eece8ebbf008562d07 Mon Sep 17 00:00:00 2001
From: "micael.bergeron" <micaelbergeron@gmail.com>
Date: Thu, 16 Nov 2017 09:23:32 -0500
Subject: reverting to the simpler approach

---
 app/models/commit.rb                |  2 +-
 app/models/note.rb                  | 14 +++++++++++++-
 app/models/system_note_metadata.rb  | 10 ++++++++++
 app/services/system_note_service.rb |  4 ++++
 spec/models/commit_spec.rb          | 23 -----------------------
 5 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app/models/commit.rb b/app/models/commit.rb
index b5411b2bf75..6dba154a6ea 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -26,7 +26,7 @@ class Commit
   DIFF_HARD_LIMIT_LINES = 50000
 
   MIN_SHA_LENGTH = 7
-  COMMIT_SHA_PATTERN = /(?<!\s[~#!@:])\h{#{MIN_SHA_LENGTH},40}/.freeze
+  COMMIT_SHA_PATTERN = /\h{#{MIN_SHA_LENGTH},40}/.freeze
 
   def banzai_render_context(field)
     context = { pipeline: :single_line, project: self.project }
diff --git a/app/models/note.rb b/app/models/note.rb
index f9676361072..4bbb54ba9bf 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -169,7 +169,13 @@ class Note < ActiveRecord::Base
   end
 
   def cross_reference?
-    system? && matches_cross_reference_regex?
+    return unless system?
+
+    if force_cross_reference_regex_check?
+      matches_cross_reference_regex?
+    else
+      SystemNoteService.cross_reference?(note)
+    end
   end
 
   def diff_note?
@@ -382,4 +388,10 @@ class Note < ActiveRecord::Base
   def set_discussion_id
     self.discussion_id ||= discussion_class.discussion_id(self)
   end
+
+  def force_cross_reference_regex_check?
+    return unless system?
+
+    SystemNoteMetadata::TYPES_WITH_CROSS_REFERENCES.include?(system_note_metadata&.action)
+  end
 end
diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb
index 1f9f8d7286b..4065c1594c3 100644
--- a/app/models/system_note_metadata.rb
+++ b/app/models/system_note_metadata.rb
@@ -1,4 +1,14 @@
 class SystemNoteMetadata < ActiveRecord::Base
+  # These notes's action text might contain a reference that is external.
+  # We should always force a deep validation upon references that are found
+  # in this note type.
+  # Other notes can always be safely shown as all its references are
+  # in the same project (i.e. with the same permissions)
+  TYPES_WITH_CROSS_REFERENCES = %w[
+    cross_reference
+    milestone
+  ]
+
   ICON_TYPES = %w[
     commit description merge confidential visible label assignee cross_reference
     title time_tracking branch milestone discussion task moved
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index e946218824c..fe71a405565 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -583,6 +583,10 @@ module SystemNoteService
     create_note(NoteSummary.new(issuable, issuable.project, author, body, action: action))
   end
 
+  def cross_reference?(note_text)
+    note_text =~ /\A#{cross_reference_note_prefix}/i
+  end
+
   private
 
   def notes_for_mentioner(mentioner, noteable, notes)
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 3994eaba5d9..e3cfa149e3a 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -468,27 +468,4 @@ eos
       expect(described_class.valid_hash?('a' * 41)).to be false
     end
   end
-
-  describe '.reference_pattern' do
-    where(:ref, :matches?) do
-      sha = Digest::SHA1.hexdigest 'thisisacommitid'
-
-      [
-        [sha.first(Commit::MIN_SHA_LENGTH - 1), false],
-        [sha.first(Commit::MIN_SHA_LENGTH), true],
-        [sha, true],
-        ['~' << sha, false], # labels
-        ['!' << sha, false], # merge_request
-        [':' << sha, false], # emoji
-        ['#' << sha, false], # issue
-        ['@' << sha, false], # user
-      ]
-    end
-
-    with_them do
-      it "should match only on commit references" do
-        expect(Commit.reference_pattern.match(ref).present?).to eq(matches?)
-      end
-    end
-  end
 end
-- 
cgit v1.2.1


From 869fc05d81eaced5d68ef28e334ae9ece80f74f7 Mon Sep 17 00:00:00 2001
From: "micael.bergeron" <micaelbergeron@gmail.com>
Date: Thu, 16 Nov 2017 11:03:15 -0500
Subject: fix the linting error

---
 app/models/system_note_metadata.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb
index 4065c1594c3..ca0673080af 100644
--- a/app/models/system_note_metadata.rb
+++ b/app/models/system_note_metadata.rb
@@ -7,7 +7,7 @@ class SystemNoteMetadata < ActiveRecord::Base
   TYPES_WITH_CROSS_REFERENCES = %w[
     cross_reference
     milestone
-  ]
+  ].freeze
 
   ICON_TYPES = %w[
     commit description merge confidential visible label assignee cross_reference
-- 
cgit v1.2.1


From 0b3e3692eb95a68897b4896d168e6763ac0a97b9 Mon Sep 17 00:00:00 2001
From: Jacopo <beschi.jacopo@gmail.com>
Date: Mon, 20 Nov 2017 08:49:13 +0100
Subject: Disables autocomplete in filtered search

Sets `autocomplete=off` to issuable filtered serarch.
---
 app/helpers/search_helper.rb                                         | 3 ++-
 .../unreleased/38877-disable-autocomplete-in-filtered-search.yml     | 5 +++++
 spec/helpers/search_helper_spec.rb                                   | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/38877-disable-autocomplete-in-filtered-search.yml

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index cf28a917fd1..2f57660516d 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -140,7 +140,8 @@ module SearchHelper
         placeholder: 'Search or filter results...',
         data: {
           'username-params' => @users.to_json(only: [:id, :username])
-        }
+        },
+        autocomplete: 'off'
       }
 
     if @project.present?
diff --git a/changelogs/unreleased/38877-disable-autocomplete-in-filtered-search.yml b/changelogs/unreleased/38877-disable-autocomplete-in-filtered-search.yml
new file mode 100644
index 00000000000..07439a860ec
--- /dev/null
+++ b/changelogs/unreleased/38877-disable-autocomplete-in-filtered-search.yml
@@ -0,0 +1,5 @@
+---
+title: Disables autocomplete in filtered searc
+merge_request: 15477
+author: Jacopo Beschi @jacopo-beschi
+type: added
diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb
index ab647401e14..6c9a7febf14 100644
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
@@ -102,6 +102,10 @@ describe SearchHelper do
       it 'includes project base-endpoint' do
         expect(search_filter_input_options('')[:data]['base-endpoint']).to eq(project_path(@project))
       end
+
+      it 'includes autocomplete=off flag' do
+        expect(search_filter_input_options('')[:autocomplete]).to eq('off')
+      end
     end
 
     context 'group' do
-- 
cgit v1.2.1


From 564b32e3cecc86337909f6253567c42fe3be985d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 20 Nov 2017 12:24:49 +0100
Subject: Fix offense to the LineBreakAfterGuardClauses cop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 config/initializers/gollum.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/initializers/gollum.rb b/config/initializers/gollum.rb
index 2ca32791bb1..2fd47a3f4d3 100644
--- a/config/initializers/gollum.rb
+++ b/config/initializers/gollum.rb
@@ -21,8 +21,10 @@ module Gollum
         commit = @access.commit(sha)
         tree_map_for(sha).inject([]) do |list, entry|
           next list unless @page_class.valid_page_name?(entry.name)
+
           list << entry.page(self, commit)
           break list if limit && list.size >= limit
+
           list
         end
       else
-- 
cgit v1.2.1


From c1b2017411601e233643dd069f187fd7e6e829bc Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 20 Nov 2017 17:04:23 +0200
Subject: Add wiki css to help page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/pages/help.scss | 8 --------
 app/views/help/index.html.haml         | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss
index dae8ccdef6c..982f3653f8e 100644
--- a/app/assets/stylesheets/pages/help.scss
+++ b/app/assets/stylesheets/pages/help.scss
@@ -1,12 +1,4 @@
 .documentation-index {
-  h1 {
-    margin: 0;
-  }
-
-  h2 {
-    font-size: 20px;
-  }
-
   li {
     line-height: 24px;
     color: $document-index-color;
diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index d0c2e0b1d69..021de4f0caf 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -29,7 +29,7 @@
 
 .row.prepend-top-default
   .col-md-8
-    .documentation-index
+    .documentation-index.wiki
       = markdown(@help_index)
   .col-md-4
     .panel.panel-default
-- 
cgit v1.2.1


From 993ccd781053c8b39e2977f10a09a6fb111e439d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 20 Nov 2017 13:24:33 +0100
Subject: Remove a useless `allow_failure: no` and use `true` instead of `yes`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .gitlab-ci.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07969475503..d4b375696c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -256,7 +256,7 @@ flaky-examples-check:
     USE_BUNDLE_INSTALL: "false"
     NEW_FLAKY_SPECS_REPORT: rspec_flaky/report-new.json
   stage: post-test
-  allow_failure: yes
+  allow_failure: true
   retry: 0
   only:
     - branches
@@ -416,7 +416,6 @@ ee_compat_check:
     - /^[\d-]+-stable(-ee)?/
     - branches@gitlab-org/gitlab-ee
     - branches@gitlab/gitlab-ee
-  allow_failure: no
   retry: 0
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
-- 
cgit v1.2.1


From 9ed91479a7bbca1e420cd91a6322493d7ffda749 Mon Sep 17 00:00:00 2001
From: "micael.bergeron" <micaelbergeron@gmail.com>
Date: Mon, 20 Nov 2017 13:00:35 -0500
Subject: add the missing spec

---
 app/models/system_note_metadata.rb |  4 ++--
 spec/models/note_spec.rb           | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb
index ca0673080af..29035480371 100644
--- a/app/models/system_note_metadata.rb
+++ b/app/models/system_note_metadata.rb
@@ -5,8 +5,8 @@ class SystemNoteMetadata < ActiveRecord::Base
   # Other notes can always be safely shown as all its references are
   # in the same project (i.e. with the same permissions)
   TYPES_WITH_CROSS_REFERENCES = %w[
-    cross_reference
-    milestone
+    commit cross_reference
+    close duplicate
   ].freeze
 
   ICON_TYPES = %w[
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 1ecb50586c7..6e7e8c4c570 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -231,6 +231,37 @@ describe Note do
     end
   end
 
+  describe '#cross_reference?' do
+    it 'falsey for user-generated notes' do
+      note = create(:note, system: false)
+
+      expect(note.cross_reference?).to be_falsy
+    end
+
+    context 'when the note might contain cross references' do
+      SystemNoteMetadata::TYPES_WITH_CROSS_REFERENCES.each do |type|
+        let(:note) { create(:note, :system) }
+        let!(:metadata) { create(:system_note_metadata, note: note, action: type) }
+
+        it 'delegates to the cross-reference regex' do
+          expect(note).to receive(:matches_cross_reference_regex?).and_return(false)
+
+          note.cross_reference?
+        end
+      end
+    end
+
+    context 'when the note cannot contain cross references' do
+      let(:commit_note) { build(:note, note: 'mentioned in 1312312313 something else.', system: true) }
+      let(:label_note) { build(:note, note: 'added ~2323232323', system: true) }
+
+      it 'scan for a `mentioned in` prefix' do
+        expect(commit_note.cross_reference?).to be_truthy
+        expect(label_note.cross_reference?).to be_falsy
+      end
+    end
+  end
+
   describe 'clear_blank_line_code!' do
     it 'clears a blank line code before validation' do
       note = build(:note, line_code: ' ')
-- 
cgit v1.2.1


From faa57d785bb3807be9f0974390bd999bac4dcc6b Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Mon, 20 Nov 2017 11:20:51 -0800
Subject: Switch to using gettext:compile instead of gettext:pack in the
 install Docs

This skips the step that updates the .pot files with changes in the
codebase, which can take extra time, and isn't required during install.
---
 doc/install/installation.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 4efe911b778..88000f4c7a9 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -513,8 +513,7 @@ Check if GitLab and its environment are configured correctly:
 
 ### Compile GetText PO files
 
-    sudo -u git -H bundle exec rake gettext:pack RAILS_ENV=production
-    sudo -u git -H bundle exec rake gettext:po_to_json RAILS_ENV=production
+    sudo -u git -H bundle exec rake gettext:compile RAILS_ENV=production
 
 ### Compile Assets
 
-- 
cgit v1.2.1


From 2d980cb71c952483da3cffe2ea368a6904c9a0a5 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Mon, 20 Nov 2017 13:48:33 -0600
Subject: Fix commits list 500 with multi-file editor new_repo cookie

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39821

/<namespace>/<project>/commmits/master
---
 app/views/shared/_ref_switcher.html.haml                           | 2 ++
 .../unreleased/39821-fix-commits-list-with-multi-file-editor.yml   | 5 +++++
 spec/features/commits_spec.rb                                      | 7 +++++++
 3 files changed, 14 insertions(+)
 create mode 100644 changelogs/unreleased/39821-fix-commits-list-with-multi-file-editor.yml

diff --git a/app/views/shared/_ref_switcher.html.haml b/app/views/shared/_ref_switcher.html.haml
index 6356e9f92cb..f4a4bfaec54 100644
--- a/app/views/shared/_ref_switcher.html.haml
+++ b/app/views/shared/_ref_switcher.html.haml
@@ -1,3 +1,5 @@
+- show_create = local_assigns.fetch(:show_create, false)
+
 - show_new_branch_form = show_new_repo? && show_create && can?(current_user, :push_code, @project)
 - dropdown_toggle_text = @ref || @project.default_branch
 = form_tag switch_project_refs_path(@project), method: :get, class: "project-refs-form" do
diff --git a/changelogs/unreleased/39821-fix-commits-list-with-multi-file-editor.yml b/changelogs/unreleased/39821-fix-commits-list-with-multi-file-editor.yml
new file mode 100644
index 00000000000..8b27c43d15b
--- /dev/null
+++ b/changelogs/unreleased/39821-fix-commits-list-with-multi-file-editor.yml
@@ -0,0 +1,5 @@
+---
+title: Fix commits page throwing 500 when the multi-file editor was enabled
+merge_request: 15502
+author:
+type: fixed
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 479fb713297..1e83137f8a9 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -202,5 +202,12 @@ describe 'Commits' do
         expect(page).to have_content("committed #{commit.committed_date.strftime("%b %d, %Y")}")
       end
     end
+
+    it 'shows the ref switcher with the multi-file editor enabled', :js do
+      set_cookie('new_repo', 'true')
+      visit project_commits_path(project, branch_name)
+
+      expect(find('.js-project-refs-dropdown')).to have_content branch_name
+    end
   end
 end
-- 
cgit v1.2.1


From 030de8b32889eae832d512f30079403e0da7f699 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Mon, 20 Nov 2017 20:28:29 +0000
Subject: Export code as ES6 modules

---
 app/assets/javascripts/blob_edit/blob_bundle.js    |   3 +-
 app/assets/javascripts/dispatcher.js               |   7 +-
 app/assets/javascripts/init_legacy_filters.js      |   5 +-
 .../javascripts/issuable_bulk_update_sidebar.js    |   5 +-
 app/assets/javascripts/main.js                     |   6 -
 app/assets/javascripts/milestone.js                |  85 +++++------
 app/assets/javascripts/new_branch_form.js          | 168 ++++++++++-----------
 app/assets/javascripts/new_commit_form.js          |  54 +++----
 app/assets/javascripts/subscription_select.js      |  49 +++---
 spec/javascripts/new_branch_spec.js                |   3 +-
 10 files changed, 176 insertions(+), 209 deletions(-)

diff --git a/app/assets/javascripts/blob_edit/blob_bundle.js b/app/assets/javascripts/blob_edit/blob_bundle.js
index b5500ac116f..6b06344f5ba 100644
--- a/app/assets/javascripts/blob_edit/blob_bundle.js
+++ b/app/assets/javascripts/blob_edit/blob_bundle.js
@@ -1,7 +1,6 @@
 /* eslint-disable func-names, space-before-function-paren, prefer-arrow-callback, no-var, quotes, vars-on-top, no-unused-vars, no-new, max-len */
 /* global EditBlob */
-/* global NewCommitForm */
-
+import NewCommitForm from '../new_commit_form';
 import EditBlob from './edit_blob';
 import BlobFileDropzone from '../blob/blob_file_dropzone';
 
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index 344b31cf8b7..b4307761c6b 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -2,11 +2,11 @@
 import { s__ } from './locale';
 import projectSelect from './project_select';
 import IssuableIndex from './issuable_index';
-/* global Milestone */
+import Milestone from './milestone';
 import IssuableForm from './issuable_form';
 import LabelsSelect from './labels_select';
 /* global MilestoneSelect */
-/* global NewBranchForm */
+import NewBranchForm from './new_branch_form';
 /* global NotificationsForm */
 /* global NotificationsDropdown */
 import groupAvatar from './group_avatar';
@@ -18,8 +18,7 @@ import groupsSelect from './groups_select';
 /* global Search */
 /* global Admin */
 import NamespaceSelect from './namespace_select';
-/* global NewCommitForm */
-/* global NewBranchForm */
+import NewCommitForm from './new_commit_form';
 import Project from './project';
 import projectAvatar from './project_avatar';
 /* global MergeRequest */
diff --git a/app/assets/javascripts/init_legacy_filters.js b/app/assets/javascripts/init_legacy_filters.js
index 1b265721581..2cbb70220d0 100644
--- a/app/assets/javascripts/init_legacy_filters.js
+++ b/app/assets/javascripts/init_legacy_filters.js
@@ -1,8 +1,7 @@
 /* eslint-disable no-new */
 import LabelsSelect from './labels_select';
 /* global MilestoneSelect */
-/* global SubscriptionSelect */
-
+import subscriptionSelect from './subscription_select';
 import UsersSelect from './users_select';
 import issueStatusSelect from './issue_status_select';
 
@@ -11,5 +10,5 @@ export default () => {
   new LabelsSelect();
   new MilestoneSelect();
   issueStatusSelect();
-  new SubscriptionSelect();
+  subscriptionSelect();
 };
diff --git a/app/assets/javascripts/issuable_bulk_update_sidebar.js b/app/assets/javascripts/issuable_bulk_update_sidebar.js
index af6358953cf..ba2b6737988 100644
--- a/app/assets/javascripts/issuable_bulk_update_sidebar.js
+++ b/app/assets/javascripts/issuable_bulk_update_sidebar.js
@@ -1,11 +1,10 @@
 /* eslint-disable class-methods-use-this, no-new */
 /* global MilestoneSelect */
-/* global SubscriptionSelect */
 
 import IssuableBulkUpdateActions from './issuable_bulk_update_actions';
 import './milestone_select';
 import issueStatusSelect from './issue_status_select';
-import './subscription_select';
+import subscriptionSelect from './subscription_select';
 import LabelsSelect from './labels_select';
 
 const HIDDEN_CLASS = 'hidden';
@@ -48,7 +47,7 @@ export default class IssuableBulkUpdateSidebar {
     new LabelsSelect();
     new MilestoneSelect();
     issueStatusSelect();
-    new SubscriptionSelect();
+    subscriptionSelect();
   }
 
   setupBulkUpdateActions() {
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index 601ab90bb30..b7ef1ecd923 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -58,11 +58,7 @@ import './line_highlighter';
 import initLogoAnimation from './logo';
 import './merge_request';
 import './merge_request_tabs';
-import './milestone';
 import './milestone_select';
-import './namespace_select';
-import './new_branch_form';
-import './new_commit_form';
 import './notes';
 import './notifications_dropdown';
 import './notifications_form';
@@ -78,8 +74,6 @@ import './render_gfm';
 import './right_sidebar';
 import './search';
 import './search_autocomplete';
-import './smart_interval';
-import './subscription_select';
 import initBreadcrumbs from './breadcrumb';
 
 import './dispatcher';
diff --git a/app/assets/javascripts/milestone.js b/app/assets/javascripts/milestone.js
index 8f3f1986763..f76a998bf8c 100644
--- a/app/assets/javascripts/milestone.js
+++ b/app/assets/javascripts/milestone.js
@@ -1,54 +1,49 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-use-before-define, camelcase, quotes, object-shorthand, no-shadow, no-unused-vars, comma-dangle, no-var, prefer-template, no-underscore-dangle, consistent-return, one-var, one-var-declaration-per-line, default-case, prefer-arrow-callback, max-len */
 /* global Sortable */
 
 import Flash from './flash';
 
-(function() {
-  this.Milestone = (function() {
-    function Milestone() {
-      this.bindTabsSwitching();
+export default class Milestone {
+  constructor() {
+    this.bindTabsSwitching();
 
-      // Load merge request tab if it is active
-      // merge request tab is active based on different conditions in the backend
-      this.loadTab($('.js-milestone-tabs .active a'));
+    // Load merge request tab if it is active
+    // merge request tab is active based on different conditions in the backend
+    this.loadTab($('.js-milestone-tabs .active a'));
 
-      this.loadInitialTab();
-    }
+    this.loadInitialTab();
+  }
+
+  bindTabsSwitching() {
+    return $('a[data-toggle="tab"]').on('show.bs.tab', (e) => {
+      const $target = $(e.target);
 
-    Milestone.prototype.bindTabsSwitching = function() {
-      return $('a[data-toggle="tab"]').on('show.bs.tab', (e) => {
-        const $target = $(e.target);
+      location.hash = $target.attr('href');
+      this.loadTab($target);
+    });
+  }
+  // eslint-disable-next-line class-methods-use-this
+  loadInitialTab() {
+    const $target = $(`.js-milestone-tabs a[href="${location.hash}"]`);
 
-        location.hash = $target.attr('href');
-        this.loadTab($target);
+    if ($target.length) {
+      $target.tab('show');
+    }
+  }
+  // eslint-disable-next-line class-methods-use-this
+  loadTab($target) {
+    const endpoint = $target.data('endpoint');
+    const tabElId = $target.attr('href');
+
+    if (endpoint && !$target.hasClass('is-loaded')) {
+      $.ajax({
+        url: endpoint,
+        dataType: 'JSON',
+      })
+      .fail(() => new Flash('Error loading milestone tab'))
+      .done((data) => {
+        $(tabElId).html(data.html);
+        $target.addClass('is-loaded');
       });
-    };
-
-    Milestone.prototype.loadInitialTab = function() {
-      const $target = $(`.js-milestone-tabs a[href="${location.hash}"]`);
-
-      if ($target.length) {
-        $target.tab('show');
-      }
-    };
-
-    Milestone.prototype.loadTab = function($target) {
-      const endpoint = $target.data('endpoint');
-      const tabElId = $target.attr('href');
-
-      if (endpoint && !$target.hasClass('is-loaded')) {
-        $.ajax({
-          url: endpoint,
-          dataType: 'JSON',
-        })
-        .fail(() => new Flash('Error loading milestone tab'))
-        .done((data) => {
-          $(tabElId).html(data.html);
-          $target.addClass('is-loaded');
-        });
-      }
-    };
-
-    return Milestone;
-  })();
-}).call(window);
+    }
+  }
+}
diff --git a/app/assets/javascripts/new_branch_form.js b/app/assets/javascripts/new_branch_form.js
index 39fb302b644..77733b67c4d 100644
--- a/app/assets/javascripts/new_branch_form.js
+++ b/app/assets/javascripts/new_branch_form.js
@@ -1,97 +1,93 @@
 /* eslint-disable func-names, space-before-function-paren, no-var, one-var, prefer-rest-params, max-len, vars-on-top, wrap-iife, consistent-return, comma-dangle, one-var-declaration-per-line, quotes, no-return-assign, prefer-arrow-callback, prefer-template, no-shadow, no-else-return, max-len, object-shorthand */
-import RefSelectDropdown from '~/ref_select_dropdown';
+import RefSelectDropdown from './ref_select_dropdown';
 
-(function() {
-  this.NewBranchForm = (function() {
-    function NewBranchForm(form, availableRefs) {
-      this.validate = this.validate.bind(this);
-      this.branchNameError = form.find('.js-branch-name-error');
-      this.name = form.find('.js-branch-name');
-      this.ref = form.find('#ref');
-      new RefSelectDropdown($('.js-branch-select'), availableRefs); // eslint-disable-line no-new
-      this.setupRestrictions();
-      this.addBinding();
-      this.init();
+export default class NewBranchForm {
+  constructor(form, availableRefs) {
+    this.validate = this.validate.bind(this);
+    this.branchNameError = form.find('.js-branch-name-error');
+    this.name = form.find('.js-branch-name');
+    this.ref = form.find('#ref');
+    new RefSelectDropdown($('.js-branch-select'), availableRefs); // eslint-disable-line no-new
+    this.setupRestrictions();
+    this.addBinding();
+    this.init();
+  }
+
+  addBinding() {
+    return this.name.on('blur', this.validate);
+  }
+
+  init() {
+    if (this.name.length && this.name.val().length > 0) {
+      return this.name.trigger('blur');
     }
+  }
 
-    NewBranchForm.prototype.addBinding = function() {
-      return this.name.on('blur', this.validate);
+  setupRestrictions() {
+    var endsWith, invalid, single, startsWith;
+    startsWith = {
+      pattern: /^(\/|\.)/g,
+      prefix: "can't start with",
+      conjunction: "or"
     };
-
-    NewBranchForm.prototype.init = function() {
-      if (this.name.length && this.name.val().length > 0) {
-        return this.name.trigger('blur');
-      }
+    endsWith = {
+      pattern: /(\/|\.|\.lock)$/g,
+      prefix: "can't end in",
+      conjunction: "or"
     };
-
-    NewBranchForm.prototype.setupRestrictions = function() {
-      var endsWith, invalid, single, startsWith;
-      startsWith = {
-        pattern: /^(\/|\.)/g,
-        prefix: "can't start with",
-        conjunction: "or"
-      };
-      endsWith = {
-        pattern: /(\/|\.|\.lock)$/g,
-        prefix: "can't end in",
-        conjunction: "or"
-      };
-      invalid = {
-        pattern: /(\s|~|\^|:|\?|\*|\[|\\|\.\.|@\{|\/{2,}){1}/g,
-        prefix: "can't contain",
-        conjunction: ", "
-      };
-      single = {
-        pattern: /^@+$/g,
-        prefix: "can't be",
-        conjunction: "or"
-      };
-      return this.restrictions = [startsWith, invalid, endsWith, single];
+    invalid = {
+      pattern: /(\s|~|\^|:|\?|\*|\[|\\|\.\.|@\{|\/{2,}){1}/g,
+      prefix: "can't contain",
+      conjunction: ", "
+    };
+    single = {
+      pattern: /^@+$/g,
+      prefix: "can't be",
+      conjunction: "or"
     };
+    return this.restrictions = [startsWith, invalid, endsWith, single];
+  }
 
-    NewBranchForm.prototype.validate = function() {
-      var errorMessage, errors, formatter, unique, validator;
-      const indexOf = [].indexOf;
+  validate() {
+    var errorMessage, errors, formatter, unique, validator;
+    const indexOf = [].indexOf;
 
-      this.branchNameError.empty();
-      unique = function(values, value) {
-        if (indexOf.call(values, value) === -1) {
-          values.push(value);
-        }
-        return values;
-      };
-      formatter = function(values, restriction) {
-        var formatted;
-        formatted = values.map(function(value) {
-          switch (false) {
-            case !/\s/.test(value):
-              return 'spaces';
-            case !/\/{2,}/g.test(value):
-              return 'consecutive slashes';
-            default:
-              return "'" + value + "'";
-          }
-        });
-        return restriction.prefix + " " + (formatted.join(restriction.conjunction));
-      };
-      validator = (function(_this) {
-        return function(errors, restriction) {
-          var matched;
-          matched = _this.name.val().match(restriction.pattern);
-          if (matched) {
-            return errors.concat(formatter(matched.reduce(unique, []), restriction));
-          } else {
-            return errors;
-          }
-        };
-      })(this);
-      errors = this.restrictions.reduce(validator, []);
-      if (errors.length > 0) {
-        errorMessage = $("<span/>").text(errors.join(', '));
-        return this.branchNameError.append(errorMessage);
+    this.branchNameError.empty();
+    unique = function(values, value) {
+      if (indexOf.call(values, value) === -1) {
+        values.push(value);
       }
+      return values;
     };
-
-    return NewBranchForm;
-  })();
-}).call(window);
+    formatter = function(values, restriction) {
+      var formatted;
+      formatted = values.map(function(value) {
+        switch (false) {
+          case !/\s/.test(value):
+            return 'spaces';
+          case !/\/{2,}/g.test(value):
+            return 'consecutive slashes';
+          default:
+            return "'" + value + "'";
+        }
+      });
+      return restriction.prefix + " " + (formatted.join(restriction.conjunction));
+    };
+    validator = (function(_this) {
+      return function(errors, restriction) {
+        var matched;
+        matched = _this.name.val().match(restriction.pattern);
+        if (matched) {
+          return errors.concat(formatter(matched.reduce(unique, []), restriction));
+        } else {
+          return errors;
+        }
+      };
+    })(this);
+    errors = this.restrictions.reduce(validator, []);
+    if (errors.length > 0) {
+      errorMessage = $("<span/>").text(errors.join(', '));
+      return this.branchNameError.append(errorMessage);
+    }
+  }
+}
diff --git a/app/assets/javascripts/new_commit_form.js b/app/assets/javascripts/new_commit_form.js
index 04073ef7270..6e152497d20 100644
--- a/app/assets/javascripts/new_commit_form.js
+++ b/app/assets/javascripts/new_commit_form.js
@@ -1,32 +1,28 @@
 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-return-assign, max-len */
-(function() {
-  this.NewCommitForm = (function() {
-    function NewCommitForm(form) {
-      this.form = form;
-      this.renderDestination = this.renderDestination.bind(this);
-      this.branchName = form.find('.js-branch-name');
-      this.originalBranch = form.find('.js-original-branch');
-      this.createMergeRequest = form.find('.js-create-merge-request');
-      this.createMergeRequestContainer = form.find('.js-create-merge-request-container');
-      this.branchName.keyup(this.renderDestination);
-      this.renderDestination();
-    }
+export default class NewCommitForm {
+  constructor(form) {
+    this.form = form;
+    this.renderDestination = this.renderDestination.bind(this);
+    this.branchName = form.find('.js-branch-name');
+    this.originalBranch = form.find('.js-original-branch');
+    this.createMergeRequest = form.find('.js-create-merge-request');
+    this.createMergeRequestContainer = form.find('.js-create-merge-request-container');
+    this.branchName.keyup(this.renderDestination);
+    this.renderDestination();
+  }
 
-    NewCommitForm.prototype.renderDestination = function() {
-      var different;
-      different = this.branchName.val() !== this.originalBranch.val();
-      if (different) {
-        this.createMergeRequestContainer.show();
-        if (!this.wasDifferent) {
-          this.createMergeRequest.prop('checked', true);
-        }
-      } else {
-        this.createMergeRequestContainer.hide();
-        this.createMergeRequest.prop('checked', false);
+  renderDestination() {
+    var different;
+    different = this.branchName.val() !== this.originalBranch.val();
+    if (different) {
+      this.createMergeRequestContainer.show();
+      if (!this.wasDifferent) {
+        this.createMergeRequest.prop('checked', true);
       }
-      return this.wasDifferent = different;
-    };
-
-    return NewCommitForm;
-  })();
-}).call(window);
+    } else {
+      this.createMergeRequestContainer.hide();
+      this.createMergeRequest.prop('checked', false);
+    }
+    return this.wasDifferent = different;
+  }
+}
diff --git a/app/assets/javascripts/subscription_select.js b/app/assets/javascripts/subscription_select.js
index 37e39ce5477..1ab4c2229ca 100644
--- a/app/assets/javascripts/subscription_select.js
+++ b/app/assets/javascripts/subscription_select.js
@@ -1,33 +1,24 @@
-/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, quotes, object-shorthand, no-unused-vars, no-shadow, one-var, one-var-declaration-per-line, comma-dangle, max-len */
+export default function subscriptionSelect() {
+  $('.js-subscription-event').each((i, element) => {
+    const fieldName = $(element).data('field-name');
 
-class SubscriptionSelect {
-  constructor() {
-    $('.js-subscription-event').each(function(i, el) {
-      var fieldName;
-      fieldName = $(el).data("field-name");
-      return $(el).glDropdown({
-        selectable: true,
-        fieldName: fieldName,
-        toggleLabel: (function(_this) {
-          return function(selected, el, instance) {
-            var $item, label;
-            label = 'Subscription';
-            $item = instance.dropdown.find('.is-active');
-            if ($item.length) {
-              label = $item.text();
-            }
-            return label;
-          };
-        })(this),
-        clicked: function(options) {
-          return options.e.preventDefault();
-        },
-        id: function(obj, el) {
-          return $(el).data("id");
+    return $(element).glDropdown({
+      selectable: true,
+      fieldName,
+      toggleLabel(selected, el, instance) {
+        let label = 'Subscription';
+        const $item = instance.dropdown.find('.is-active');
+        if ($item.length) {
+          label = $item.text();
         }
-      });
+        return label;
+      },
+      clicked(options) {
+        return options.e.preventDefault();
+      },
+      id(obj, el) {
+        return $(el).data('id');
+      },
     });
-  }
+  });
 }
-
-window.SubscriptionSelect = SubscriptionSelect;
diff --git a/spec/javascripts/new_branch_spec.js b/spec/javascripts/new_branch_spec.js
index c57f44dae17..50a5e4ff056 100644
--- a/spec/javascripts/new_branch_spec.js
+++ b/spec/javascripts/new_branch_spec.js
@@ -1,7 +1,6 @@
 /* eslint-disable space-before-function-paren, one-var, no-var, one-var-declaration-per-line, no-return-assign, quotes, max-len */
-/* global NewBranchForm */
 
-import '~/new_branch_form';
+import NewBranchForm from '~/new_branch_form';
 
 (function() {
   describe('Branch', function() {
-- 
cgit v1.2.1


From 3c52e2f06ef3234ab5ace532e21e194abab96b59 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 20 Nov 2017 15:27:52 -0800
Subject: Optimize read-only middleware so that it does not consume as much CPU

In !15082, we changed the behavior of the middleware to call
`Rails.application.routes.recognize_path` whenever a new route arrived.
However, this can be a CPU-intensive task because Rails needs to allocate
memory and compile 850+ different regular expressions, which are complicated
in GitLab.

As a short-term fix, we can do a lightweight string match before
we do the heavier comparison.

Closes #40185, gitlab-com/infrastructure#3240
---
 lib/gitlab/middleware/read_only.rb           | 6 ++++++
 spec/lib/gitlab/middleware/read_only_spec.rb | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/lib/gitlab/middleware/read_only.rb b/lib/gitlab/middleware/read_only.rb
index 5e4932e4e57..dc77f737da8 100644
--- a/lib/gitlab/middleware/read_only.rb
+++ b/lib/gitlab/middleware/read_only.rb
@@ -74,10 +74,16 @@ module Gitlab
       end
 
       def grack_route
+        # Calling route_hash may be expensive. Only do it if we think there's a possible match
+        return false unless request.path.end_with?('.git/git-upload-pack')
+
         route_hash[:controller] == 'projects/git_http' && route_hash[:action] == 'git_upload_pack'
       end
 
       def lfs_route
+        # Calling route_hash may be expensive. Only do it if we think there's a possible match
+        return false unless request.path.end_with?('/info/lfs/objects/batch')
+
         route_hash[:controller] == 'projects/lfs_api' && route_hash[:action] == 'batch'
       end
     end
diff --git a/spec/lib/gitlab/middleware/read_only_spec.rb b/spec/lib/gitlab/middleware/read_only_spec.rb
index b14735943a5..044b93f0120 100644
--- a/spec/lib/gitlab/middleware/read_only_spec.rb
+++ b/spec/lib/gitlab/middleware/read_only_spec.rb
@@ -84,6 +84,7 @@ describe Gitlab::Middleware::ReadOnly do
     end
 
     it 'expects POST of new file that looks like an LFS batch url to be disallowed' do
+      expect(Rails.application.routes).to receive(:recognize_path).and_call_original
       response = request.post('/root/gitlab-ce/new/master/app/info/lfs/objects/batch')
 
       expect(response).to be_a_redirect
@@ -92,6 +93,8 @@ describe Gitlab::Middleware::ReadOnly do
 
     context 'whitelisted requests' do
       it 'expects a POST internal request to be allowed' do
+        expect(Rails.application.routes).not_to receive(:recognize_path)
+
         response = request.post("/api/#{API::API.version}/internal")
 
         expect(response).not_to be_a_redirect
@@ -99,6 +102,7 @@ describe Gitlab::Middleware::ReadOnly do
       end
 
       it 'expects a POST LFS request to batch URL to be allowed' do
+        expect(Rails.application.routes).to receive(:recognize_path).and_call_original
         response = request.post('/root/rouge.git/info/lfs/objects/batch')
 
         expect(response).not_to be_a_redirect
@@ -106,6 +110,7 @@ describe Gitlab::Middleware::ReadOnly do
       end
 
       it 'expects a POST request to git-upload-pack URL to be allowed' do
+        expect(Rails.application.routes).to receive(:recognize_path).and_call_original
         response = request.post('/root/rouge.git/git-upload-pack')
 
         expect(response).not_to be_a_redirect
-- 
cgit v1.2.1


From f80654c4e13ff42ca03bacb59b924b9960f59148 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 20 Nov 2017 23:28:49 -0800
Subject: Memoize GitlabShellAdapter for performance and ease of testing

Port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3463#note_47990536
---
 lib/gitlab/shell_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/shell_adapter.rb b/lib/gitlab/shell_adapter.rb
index fbe2a7a0d72..053dd4ab9e0 100644
--- a/lib/gitlab/shell_adapter.rb
+++ b/lib/gitlab/shell_adapter.rb
@@ -5,7 +5,7 @@
 module Gitlab
   module ShellAdapter
     def gitlab_shell
-      Gitlab::Shell.new
+      @gitlab_shell ||= Gitlab::Shell.new
     end
   end
 end
-- 
cgit v1.2.1


From eb5333970c0f2247e86dc5b834a231796236e7c2 Mon Sep 17 00:00:00 2001
From: Clement Ho <clemmakesapps@gmail.com>
Date: Tue, 21 Nov 2017 09:39:57 +0000
Subject: Backport ability to enable/disable file attachments in issuable form

---
 .../javascripts/issue_show/components/app.vue      |  6 ++++
 .../issue_show/components/fields/description.vue   |  8 ++++-
 .../javascripts/issue_show/components/form.vue     |  8 ++++-
 .../vue_shared/components/markdown/field.vue       |  6 ++++
 .../vue_shared/components/markdown/toolbar.vue     | 10 +++++-
 .../vue_shared/components/markdown/toolbar_spec.js | 37 ++++++++++++++++++++++
 6 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 spec/javascripts/vue_shared/components/markdown/toolbar_spec.js

diff --git a/app/assets/javascripts/issue_show/components/app.vue b/app/assets/javascripts/issue_show/components/app.vue
index e8ac8d3b5bb..4e39d483b31 100644
--- a/app/assets/javascripts/issue_show/components/app.vue
+++ b/app/assets/javascripts/issue_show/components/app.vue
@@ -102,6 +102,11 @@ export default {
       required: false,
       default: 'issue',
     },
+    canAttachFile: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
   },
   data() {
     const store = new Store({
@@ -234,6 +239,7 @@ export default {
       :project-path="projectPath"
       :project-namespace="projectNamespace"
       :show-delete-button="showDeleteButton"
+      :can-attach-file="canAttachFile"
     />
     <div v-else>
       <title-component
diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue
index 0aa1b2c2e31..4d2ef409bad 100644
--- a/app/assets/javascripts/issue_show/components/fields/description.vue
+++ b/app/assets/javascripts/issue_show/components/fields/description.vue
@@ -17,6 +17,11 @@
         type: String,
         required: true,
       },
+      canAttachFile: {
+        type: Boolean,
+        required: false,
+        default: true,
+      },
     },
     components: {
       markdownField,
@@ -36,7 +41,8 @@
     </label>
     <markdown-field
       :markdown-preview-path="markdownPreviewPath"
-      :markdown-docs-path="markdownDocsPath">
+      :markdown-docs-path="markdownDocsPath"
+      :can-attach-file="canAttachFile">
       <textarea
         id="issue-description"
         class="note-textarea js-gfm-input js-autosize markdown-area"
diff --git a/app/assets/javascripts/issue_show/components/form.vue b/app/assets/javascripts/issue_show/components/form.vue
index 8bb5c86d567..d61776d480d 100644
--- a/app/assets/javascripts/issue_show/components/form.vue
+++ b/app/assets/javascripts/issue_show/components/form.vue
@@ -41,6 +41,11 @@
         required: false,
         default: true,
       },
+      canAttachFile: {
+        type: Boolean,
+        required: false,
+        default: true,
+      },
     },
     components: {
       lockedWarning,
@@ -83,7 +88,8 @@
     <description-field
       :form-state="formState"
       :markdown-preview-path="markdownPreviewPath"
-      :markdown-docs-path="markdownDocsPath" />
+      :markdown-docs-path="markdownDocsPath"
+      :can-attach-file="canAttachFile" />
     <edit-actions
       :form-state="formState"
       :can-destroy="canDestroy"
diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue
index a873e00d0f3..ee50ce27c3d 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/field.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue
@@ -25,6 +25,11 @@
         type: String,
         required: false,
       },
+      canAttachFile: {
+        type: Boolean,
+        required: false,
+        default: true,
+      },
     },
     data() {
       return {
@@ -129,6 +134,7 @@
         <markdown-toolbar
           :markdown-docs-path="markdownDocsPath"
           :quick-actions-docs-path="quickActionsDocsPath"
+          :can-attach-file="canAttachFile"
           />
       </div>
     </div>
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
index 65fe7bbd94e..ea2509d2839 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
@@ -9,6 +9,11 @@
         type: String,
         required: false,
       },
+      canAttachFile: {
+        type: Boolean,
+        required: false,
+        default: true,
+      },
     },
   };
 </script>
@@ -41,7 +46,10 @@
         are supported
       </template>
     </div>
-    <span class="uploading-container">
+    <span
+      v-if="canAttachFile"
+      class="uploading-container"
+    >
       <span class="uploading-progress-container hide">
         <i
           class="fa fa-file-image-o toolbar-button-icon"
diff --git a/spec/javascripts/vue_shared/components/markdown/toolbar_spec.js b/spec/javascripts/vue_shared/components/markdown/toolbar_spec.js
new file mode 100644
index 00000000000..818ef0af3c2
--- /dev/null
+++ b/spec/javascripts/vue_shared/components/markdown/toolbar_spec.js
@@ -0,0 +1,37 @@
+import Vue from 'vue';
+import toolbar from '~/vue_shared/components/markdown/toolbar.vue';
+import mountComponent from '../../../helpers/vue_mount_component_helper';
+
+describe('toolbar', () => {
+  let vm;
+  const Toolbar = Vue.extend(toolbar);
+  const props = {
+    markdownDocsPath: '',
+  };
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('user can attach file', () => {
+    beforeEach(() => {
+      vm = mountComponent(Toolbar, props);
+    });
+
+    it('should render uploading-container', () => {
+      expect(vm.$el.querySelector('.uploading-container')).not.toBeNull();
+    });
+  });
+
+  describe('user cannot attach file', () => {
+    beforeEach(() => {
+      vm = mountComponent(Toolbar, Object.assign({}, props, {
+        canAttachFile: false,
+      }));
+    });
+
+    it('should not render uploading-container', () => {
+      expect(vm.$el.querySelector('.uploading-container')).toBeNull();
+    });
+  });
+});
-- 
cgit v1.2.1


From 3a70800f96efbc683ab23b5ffb4f733cc6ad129f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 21 Nov 2017 12:00:07 +0100
Subject: Use the correct i18n helper for namespaced string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/views/projects/tags/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index fd3b8c01b83..da364b58e36 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -1,6 +1,6 @@
 - @no_container = true
 - @sort ||= sort_value_recently_updated
-- page_title _('TagsPage|Tags')
+- page_title s_('TagsPage|Tags')
 - add_to_breadcrumbs("Repository", project_tree_path(@project))
 
 .flex-list{ class: container_class }
-- 
cgit v1.2.1


From 6f1e9f7ef773ead892a1d43ec15a38dfb486e229 Mon Sep 17 00:00:00 2001
From: "Jacob Vosmaer (GitLab)" <jacob@gitlab.com>
Date: Tue, 21 Nov 2017 12:28:02 +0000
Subject: Fix slow gitaly dev test bundle

---
 lib/tasks/gitlab/gitaly.rake          | 4 +---
 spec/tasks/gitlab/gitaly_rake_spec.rb | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index 8377fe3269d..87835dbe719 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -17,9 +17,7 @@ namespace :gitlab do
       _, status = Gitlab::Popen.popen(%w[which gmake])
       command = status.zero? ? ['gmake'] : ['make']
 
-      if Rails.env.test?
-        command += %W[BUNDLE_PATH=#{Bundler.bundle_path}]
-      end
+      command << 'BUNDLE_FLAGS=--no-deployment' if Rails.env.test?
 
       Dir.chdir(args.dir) do
         create_gitaly_configuration
diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb
index 5dd8fe8eaa5..255f0a37ec8 100644
--- a/spec/tasks/gitlab/gitaly_rake_spec.rb
+++ b/spec/tasks/gitlab/gitaly_rake_spec.rb
@@ -57,7 +57,7 @@ describe 'gitlab:gitaly namespace rake task' do
 
         it 'calls gmake in the gitaly directory' do
           expect(Gitlab::Popen).to receive(:popen).with(%w[which gmake]).and_return(['/usr/bin/gmake', 0])
-          expect(main_object).to receive(:run_command!).with(command_preamble + %w[gmake BUNDLE_PATH=/fake/bundle_path]).and_return(true)
+          expect(main_object).to receive(:run_command!).with(command_preamble + %w[gmake BUNDLE_FLAGS=--no-deployment]).and_return(true)
 
           run_rake_task('gitlab:gitaly:install', clone_path)
         end
@@ -70,7 +70,7 @@ describe 'gitlab:gitaly namespace rake task' do
         end
 
         it 'calls make in the gitaly directory' do
-          expect(main_object).to receive(:run_command!).with(command_preamble + %w[make BUNDLE_PATH=/fake/bundle_path]).and_return(true)
+          expect(main_object).to receive(:run_command!).with(command_preamble + %w[make BUNDLE_FLAGS=--no-deployment]).and_return(true)
 
           run_rake_task('gitlab:gitaly:install', clone_path)
         end
-- 
cgit v1.2.1


From c70ffe11183c7ef348e102656b881bc8561ef398 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 21 Nov 2017 14:29:42 +0200
Subject: Remove unnecessary css for .documentation-index

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/assets/stylesheets/pages/help.scss | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/assets/stylesheets/pages/help.scss b/app/assets/stylesheets/pages/help.scss
index 982f3653f8e..9cc9e11bcd1 100644
--- a/app/assets/stylesheets/pages/help.scss
+++ b/app/assets/stylesheets/pages/help.scss
@@ -1,15 +1,3 @@
-.documentation-index {
-  li {
-    line-height: 24px;
-    color: $document-index-color;
-
-    a {
-      margin-right: 3px;
-    }
-  }
-}
-
-
 .shortcut-mappings {
   font-size: 12px;
   color: $help-shortcut-mapping-color;
-- 
cgit v1.2.1


From cba68d338bfac97baab153d38fa63b85a27f6d19 Mon Sep 17 00:00:00 2001
From: digitalMoksha <bwalker@gitlab.com>
Date: Tue, 21 Nov 2017 13:29:57 +0100
Subject: use `Gitlab::Routing.url_helpers` instead of
 `Rails.application.routes.url_helpers`

since `Rails.application.routes.url_helpers` creates a new anonymous module every time it's called
---
 lib/gitlab/middleware/read_only.rb           | 2 +-
 spec/lib/gitlab/middleware/read_only_spec.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/gitlab/middleware/read_only.rb b/lib/gitlab/middleware/read_only.rb
index dc77f737da8..c26656704d7 100644
--- a/lib/gitlab/middleware/read_only.rb
+++ b/lib/gitlab/middleware/read_only.rb
@@ -58,7 +58,7 @@ module Gitlab
       end
 
       def last_visited_url
-        @env['HTTP_REFERER'] || rack_session['user_return_to'] || Rails.application.routes.url_helpers.root_url
+        @env['HTTP_REFERER'] || rack_session['user_return_to'] || Gitlab::Routing.url_helpers.root_url
       end
 
       def route_hash
diff --git a/spec/lib/gitlab/middleware/read_only_spec.rb b/spec/lib/gitlab/middleware/read_only_spec.rb
index 044b93f0120..07ba11b93a3 100644
--- a/spec/lib/gitlab/middleware/read_only_spec.rb
+++ b/spec/lib/gitlab/middleware/read_only_spec.rb
@@ -91,6 +91,12 @@ describe Gitlab::Middleware::ReadOnly do
       expect(subject).to disallow_request
     end
 
+    it 'returns last_vistited_url for disallowed request' do
+      response = request.post('/test_request')
+
+      expect(response.location).to eq 'http://localhost/'
+    end
+
     context 'whitelisted requests' do
       it 'expects a POST internal request to be allowed' do
         expect(Rails.application.routes).not_to receive(:recognize_path)
-- 
cgit v1.2.1


From 91075c8237307e09c2be8a88ffb3711fd62417d1 Mon Sep 17 00:00:00 2001
From: digitalMoksha <bwalker@gitlab.com>
Date: Tue, 21 Nov 2017 13:30:54 +0100
Subject: check for `read_only?` first before seeing if request is disallowed

---
 lib/gitlab/middleware/read_only.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/middleware/read_only.rb b/lib/gitlab/middleware/read_only.rb
index c26656704d7..f8b9c5bff4c 100644
--- a/lib/gitlab/middleware/read_only.rb
+++ b/lib/gitlab/middleware/read_only.rb
@@ -14,7 +14,7 @@ module Gitlab
         @env = env
         @route_hash = nil
 
-        if disallowed_request? && Gitlab::Database.read_only?
+        if Gitlab::Database.read_only? && disallowed_request?
           Rails.logger.debug('GitLab ReadOnly: preventing possible non read-only operation')
           error_message = 'You cannot do writing operations on a read-only GitLab instance'
 
-- 
cgit v1.2.1


From f9565e303916ca194ef63b5fd3de541bf1c2a170 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Fri, 3 Nov 2017 14:16:43 +0100
Subject: Batchload blobs for diff generation

After installing a new gem, batch-loader, a construct can be used to
queue data to be fetched in bulk. The gem was also introduced in both
gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs
are not merged yet.

For the generation of diffs, both the old blob and the new blob need to
be loaded. This for every file in the diff, too. Now we collect all
these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed,
which I expect to be valid, but this needs to be confirmed by a full CI
run.

Possibly closes:
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37445
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37599
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
---
 Gemfile                                            |  2 ++
 Gemfile.lock                                       |  2 ++
 app/controllers/projects/commit_controller.rb      |  9 ++-------
 .../projects/merge_requests/diffs_controller.rb    |  5 +----
 app/models/blob.rb                                 | 17 ++++++++++++++++-
 app/models/commit.rb                               |  4 ++--
 app/models/repository.rb                           |  5 +++++
 changelogs/unreleased/zj-commit-show-n-1.yml       |  5 +++++
 config/initializers/batch_loader.rb                |  1 +
 lib/gitlab/diff/file.rb                            | 18 ++++++++----------
 lib/gitlab/diff/file_collection/base.rb            |  5 +----
 lib/gitlab/git/blob.rb                             |  2 ++
 lib/gitlab/git/repository.rb                       |  5 +++++
 .../controllers/projects/commit_controller_spec.rb |  6 +++---
 spec/lib/gitlab/diff/file_spec.rb                  |  8 ++------
 spec/models/blob_spec.rb                           | 17 +++++++++++++++++
 spec/models/diff_viewer/base_spec.rb               | 22 ++++++++--------------
 spec/models/diff_viewer/server_side_spec.rb        |  9 ++++-----
 18 files changed, 86 insertions(+), 56 deletions(-)
 create mode 100644 changelogs/unreleased/zj-commit-show-n-1.yml
 create mode 100644 config/initializers/batch_loader.rb

diff --git a/Gemfile b/Gemfile
index 5630f91c054..6034323956c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -263,6 +263,8 @@ gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.2.0'
 gem 'gettext', '~> 3.2.2', require: false, group: :development
 
+gem 'batch-loader'
+
 # Perf bar
 gem 'peek', '~> 1.0.1'
 gem 'peek-gc', '~> 0.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8f6ffa58e5d..4787be92365 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,6 +73,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     babosa (1.0.2)
     base32 (0.3.2)
+    batch-loader (1.1.1)
     bcrypt (3.1.11)
     bcrypt_pbkdf (1.0.0)
     benchmark-ips (2.3.0)
@@ -982,6 +983,7 @@ DEPENDENCIES
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
+  batch-loader
   bcrypt_pbkdf (~> 1.0)
   benchmark-ips (~> 2.3.0)
   better_errors (~> 2.1.0)
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 494d412b532..6ff96a3f295 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -22,12 +22,7 @@ class Projects::CommitController < Projects::ApplicationController
     apply_diff_view_cookie!
 
     respond_to do |format|
-      format.html do
-        # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37599
-        Gitlab::GitalyClient.allow_n_plus_1_calls do
-          render
-        end
-      end
+      format.html  { render }
       format.diff  { render text: @commit.to_diff }
       format.patch { render text: @commit.to_patch }
     end
@@ -112,7 +107,7 @@ class Projects::CommitController < Projects::ApplicationController
   end
 
   def commit
-    @noteable = @commit ||= @project.commit(params[:id])
+    @noteable = @commit ||= @project.commit_by(oid: params[:id])
   end
 
   def define_commit_vars
diff --git a/app/controllers/projects/merge_requests/diffs_controller.rb b/app/controllers/projects/merge_requests/diffs_controller.rb
index 7d16e77ef66..d60a24d3f1d 100644
--- a/app/controllers/projects/merge_requests/diffs_controller.rb
+++ b/app/controllers/projects/merge_requests/diffs_controller.rb
@@ -10,10 +10,7 @@ class Projects::MergeRequests::DiffsController < Projects::MergeRequests::Applic
   def show
     @environment = @merge_request.environments_for(current_user).last
 
-    # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
-    Gitlab::GitalyClient.allow_n_plus_1_calls do
-      render json: { html: view_to_html_string("projects/merge_requests/diffs/_diffs") }
-    end
+    render json: { html: view_to_html_string("projects/merge_requests/diffs/_diffs") }
   end
 
   def diff_for_path
diff --git a/app/models/blob.rb b/app/models/blob.rb
index ad0bc2e2ead..29e762724e3 100644
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -76,12 +76,24 @@ class Blob < SimpleDelegator
     new(blob, project)
   end
 
+  def self.lazy(project, commit_id, path)
+    BatchLoader.for(commit_id: commit_id, path: path).batch do |items, loader|
+      project.repository.blobs_at(items.map(&:values)).each do |blob|
+        loader.call({ commit_id: blob.commit_id, path: blob.path }, blob) if blob
+      end
+    end
+  end
+
   def initialize(blob, project = nil)
     @project = project
 
     super(blob)
   end
 
+  def inspect
+    "#<#{self.class.name} oid:#{id[0..8]} commit:#{commit_id[0..8]} path:#{path}>"
+  end
+
   # Returns the data of the blob.
   #
   # If the blob is a text based blob the content is converted to UTF-8 and any
@@ -95,7 +107,10 @@ class Blob < SimpleDelegator
   end
 
   def load_all_data!
-    super(project.repository) if project
+    # Endpoint needed: gitlab-org/gitaly#756
+    Gitlab::GitalyClient.allow_n_plus_1_calls do
+      super(project.repository) if project
+    end
   end
 
   def no_highlighting?
diff --git a/app/models/commit.rb b/app/models/commit.rb
index a31ebe9cc87..8401d99a08f 100644
--- a/app/models/commit.rb
+++ b/app/models/commit.rb
@@ -84,7 +84,7 @@ class Commit
   end
 
   def id
-    @raw.id
+    raw.id
   end
 
   def ==(other)
@@ -361,7 +361,7 @@ class Commit
     @deltas ||= raw.deltas
   end
 
-  def diffs(diff_options = nil)
+  def diffs(diff_options = {})
     Gitlab::Diff::FileCollection::Commit.new(self, diff_options: diff_options)
   end
 
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 8a6a8377de9..26d1bc12232 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -478,6 +478,11 @@ class Repository
     nil
   end
 
+  # items is an Array like: [[oid, path], [oid1, path1]]
+  def blobs_at(items)
+    raw_repository.batch_blobs(items).map { |blob| Blob.decorate(blob, project) }
+  end
+
   def root_ref
     if raw_repository
       raw_repository.root_ref
diff --git a/changelogs/unreleased/zj-commit-show-n-1.yml b/changelogs/unreleased/zj-commit-show-n-1.yml
new file mode 100644
index 00000000000..e536434f74a
--- /dev/null
+++ b/changelogs/unreleased/zj-commit-show-n-1.yml
@@ -0,0 +1,5 @@
+---
+title: Fetch blobs in bulk when generating diffs
+merge_request:
+author:
+type: performance
diff --git a/config/initializers/batch_loader.rb b/config/initializers/batch_loader.rb
new file mode 100644
index 00000000000..2e2256b0eb9
--- /dev/null
+++ b/config/initializers/batch_loader.rb
@@ -0,0 +1 @@
+Rails.application.config.middleware.use(BatchLoader::Middleware)
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb
index ea5891a028a..d0cfe2386ca 100644
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
@@ -25,6 +25,10 @@ module Gitlab
         @repository = repository
         @diff_refs = diff_refs
         @fallback_diff_refs = fallback_diff_refs
+
+        # Ensure items are collected in the the batch
+        new_blob
+        old_blob
       end
 
       def position(position_marker, position_type: :text)
@@ -95,21 +99,15 @@ module Gitlab
       end
 
       def new_blob
-        return @new_blob if defined?(@new_blob)
-
-        sha = new_content_sha
-        return @new_blob = nil unless sha
+        return unless new_content_sha
 
-        @new_blob = repository.blob_at(sha, file_path)
+        Blob.lazy(repository.project, new_content_sha, file_path)
       end
 
       def old_blob
-        return @old_blob if defined?(@old_blob)
-
-        sha = old_content_sha
-        return @old_blob = nil unless sha
+        return unless old_content_sha
 
-        @old_blob = repository.blob_at(sha, old_path)
+        Blob.lazy(repository.project, old_content_sha, old_path)
       end
 
       def content_sha
diff --git a/lib/gitlab/diff/file_collection/base.rb b/lib/gitlab/diff/file_collection/base.rb
index 88ae65cb468..a6007ebf531 100644
--- a/lib/gitlab/diff/file_collection/base.rb
+++ b/lib/gitlab/diff/file_collection/base.rb
@@ -22,10 +22,7 @@ module Gitlab
         end
 
         def diff_files
-          # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37445
-          Gitlab::GitalyClient.allow_n_plus_1_calls do
-            @diff_files ||= @diffs.decorate! { |diff| decorate_diff!(diff) }
-          end
+          @diff_files ||= @diffs.decorate! { |diff| decorate_diff!(diff) }
         end
 
         def diff_file_with_old_path(old_path)
diff --git a/lib/gitlab/git/blob.rb b/lib/gitlab/git/blob.rb
index bd5039fb87e..ddd52136bc4 100644
--- a/lib/gitlab/git/blob.rb
+++ b/lib/gitlab/git/blob.rb
@@ -179,6 +179,8 @@ module Gitlab
               )
             end
           end
+        rescue Rugged::ReferenceError
+          nil
         end
 
         def rugged_raw(repository, sha, limit:)
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 0c522deb6fa..3cb9b254e6e 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1161,6 +1161,11 @@ module Gitlab
         Gitlab::Git::Blob.find(self, sha, path) unless Gitlab::Git.blank_ref?(sha)
       end
 
+      # Items should be of format [[commit_id, path], [commit_id1, path1]]
+      def batch_blobs(items, blob_size_limit: nil)
+        Gitlab::Git::Blob.batch(self, items, blob_size_limit: blob_size_limit)
+      end
+
       def commit_index(user, branch_name, index, options)
         committer = user_to_committer(user)
 
diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
index 5dc27e2bbba..fd90c0d8bad 100644
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 describe Projects::CommitController do
-  let(:project)  { create(:project, :repository) }
-  let(:user)     { create(:user) }
+  set(:project)  { create(:project, :repository) }
+  set(:user)     { create(:user) }
   let(:commit)   { project.commit("master") }
   let(:master_pickable_sha) { '7d3b0f7cff5f37573aea97cebfd5692ea1689924' }
   let(:master_pickable_commit)  { project.commit(master_pickable_sha) }
 
   before do
     sign_in(user)
-    project.team << [user, :master]
+    project.add_master(user)
   end
 
   describe 'GET show' do
diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb
index c91895cedc3..ff9acfd08b9 100644
--- a/spec/lib/gitlab/diff/file_spec.rb
+++ b/spec/lib/gitlab/diff/file_spec.rb
@@ -116,12 +116,8 @@ describe Gitlab::Diff::File do
     end
 
     context 'when renamed' do
-      let(:commit) { project.commit('6907208d755b60ebeacb2e9dfea74c92c3449a1f') }
-      let(:diff_file) { commit.diffs.diff_file_with_new_path('files/js/commit.coffee') }
-
-      before do
-        allow(diff_file.new_blob).to receive(:id).and_return(diff_file.old_blob.id)
-      end
+      let(:commit) { project.commit('94bb47ca1297b7b3731ff2a36923640991e9236f') }
+      let(:diff_file) { commit.diffs.diff_file_with_new_path('CHANGELOG.md') }
 
       it 'returns false' do
         expect(diff_file.content_changed?).to be_falsey
diff --git a/spec/models/blob_spec.rb b/spec/models/blob_spec.rb
index 47342f98283..81e35e6c931 100644
--- a/spec/models/blob_spec.rb
+++ b/spec/models/blob_spec.rb
@@ -16,6 +16,23 @@ describe Blob do
     end
   end
 
+  describe '.lazy' do
+    let(:project) { create(:project, :repository) }
+    let(:commit) { project.commit_by(oid: 'e63f41fe459e62e1228fcef60d7189127aeba95a') }
+
+    it 'fetches all blobs when the first is accessed' do
+      changelog = described_class.lazy(project, commit.id, 'CHANGELOG')
+      contributing = described_class.lazy(project, commit.id, 'CONTRIBUTING.md')
+
+      expect(Gitlab::Git::Blob).to receive(:batch).once.and_call_original
+      expect(Gitlab::Git::Blob).not_to receive(:find)
+
+      # Access property so the values are loaded
+      changelog.id
+      contributing.id
+    end
+  end
+
   describe '#data' do
     context 'using a binary blob' do
       it 'returns the data as-is' do
diff --git a/spec/models/diff_viewer/base_spec.rb b/spec/models/diff_viewer/base_spec.rb
index b26de3f3b97..c90b32c5d77 100644
--- a/spec/models/diff_viewer/base_spec.rb
+++ b/spec/models/diff_viewer/base_spec.rb
@@ -32,10 +32,8 @@ describe DiffViewer::Base do
       end
 
       context 'when the binaryness does not match' do
-        before do
-          allow(diff_file.old_blob).to receive(:binary?).and_return(false)
-          allow(diff_file.new_blob).to receive(:binary?).and_return(false)
-        end
+        let(:commit) { project.commit_by(oid: 'ae73cb07c9eeaf35924a10f713b364d32b2dd34f') }
+        let(:diff_file) { commit.diffs.diff_file_with_new_path('Gemfile.zip') }
 
         it 'returns false' do
           expect(viewer_class.can_render?(diff_file)).to be_falsey
@@ -60,8 +58,7 @@ describe DiffViewer::Base do
 
       context 'when the binaryness does not match' do
         before do
-          allow(diff_file.old_blob).to receive(:binary?).and_return(true)
-          allow(diff_file.new_blob).to receive(:binary?).and_return(true)
+          allow_any_instance_of(Blob).to receive(:binary?).and_return(true)
         end
 
         it 'returns false' do
@@ -77,12 +74,12 @@ describe DiffViewer::Base do
     end
 
     context 'when the file was renamed and only the old blob is supported' do
-      let(:commit) { project.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
+      let(:commit) { project.commit_by(oid: '2f63565e7aac07bcdadb654e253078b727143ec4') }
       let(:diff_file) { commit.diffs.diff_file_with_new_path('files/images/6049019_460s.jpg') }
 
       before do
         allow(diff_file).to receive(:renamed_file?).and_return(true)
-        allow(diff_file.new_blob).to receive(:extension).and_return('jpeg')
+        viewer_class.extensions = %w(notjpg)
       end
 
       it 'returns false' do
@@ -94,8 +91,7 @@ describe DiffViewer::Base do
   describe '#collapsed?' do
     context 'when the combined blob size is larger than the collapse limit' do
       before do
-        allow(diff_file.old_blob).to receive(:raw_size).and_return(512.kilobytes)
-        allow(diff_file.new_blob).to receive(:raw_size).and_return(513.kilobytes)
+        allow(diff_file).to receive(:raw_size).and_return(1025.kilobytes)
       end
 
       it 'returns true' do
@@ -113,8 +109,7 @@ describe DiffViewer::Base do
   describe '#too_large?' do
     context 'when the combined blob size is larger than the size limit' do
       before do
-        allow(diff_file.old_blob).to receive(:raw_size).and_return(2.megabytes)
-        allow(diff_file.new_blob).to receive(:raw_size).and_return(4.megabytes)
+        allow(diff_file).to receive(:raw_size).and_return(6.megabytes)
       end
 
       it 'returns true' do
@@ -132,8 +127,7 @@ describe DiffViewer::Base do
   describe '#render_error' do
     context 'when the combined blob size is larger than the size limit' do
       before do
-        allow(diff_file.old_blob).to receive(:raw_size).and_return(2.megabytes)
-        allow(diff_file.new_blob).to receive(:raw_size).and_return(4.megabytes)
+        allow(diff_file).to receive(:raw_size).and_return(6.megabytes)
       end
 
       it 'returns :too_large' do
diff --git a/spec/models/diff_viewer/server_side_spec.rb b/spec/models/diff_viewer/server_side_spec.rb
index 92e613f92de..98a8f6d4cc9 100644
--- a/spec/models/diff_viewer/server_side_spec.rb
+++ b/spec/models/diff_viewer/server_side_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe DiffViewer::ServerSide do
-  let(:project) { create(:project, :repository) }
-  let(:commit) { project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') }
-  let(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
+  set(:project) { create(:project, :repository) }
+  let(:commit) { project.commit_by(oid: '570e7b2abdd848b95f2f578043fc23bd6f6fd24d') }
+  let!(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
 
   let(:viewer_class) do
     Class.new(DiffViewer::Base) do
@@ -15,8 +15,7 @@ describe DiffViewer::ServerSide do
 
   describe '#prepare!' do
     it 'loads all diff file data' do
-      expect(diff_file.old_blob).to receive(:load_all_data!)
-      expect(diff_file.new_blob).to receive(:load_all_data!)
+      expect(Blob).to receive(:lazy).at_least(:twice)
 
       subject.prepare!
     end
-- 
cgit v1.2.1


From 3f6e45ed28408429295fba30df8f53a6672f3bbe Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 20 Nov 2017 12:44:10 -0200
Subject: Fix promoting milestone updating all issuables without milestone

---
 app/services/milestones/promote_service.rb       | 23 +++++++++------
 changelogs/unreleased/issue_40337.yml            |  5 ++++
 spec/services/milestones/promote_service_spec.rb | 36 ++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 9 deletions(-)
 create mode 100644 changelogs/unreleased/issue_40337.yml

diff --git a/app/services/milestones/promote_service.rb b/app/services/milestones/promote_service.rb
index bd9cfd4e0ea..2187f26d1ed 100644
--- a/app/services/milestones/promote_service.rb
+++ b/app/services/milestones/promote_service.rb
@@ -6,14 +6,14 @@ module Milestones
       check_project_milestone!(milestone)
 
       Milestone.transaction do
-        # Destroy all milestones with same title across projects
-        destroy_old_milestones(milestone)
-
         group_milestone = clone_project_milestone(milestone)
 
         move_children_to_group_milestone(group_milestone)
 
-        # Just to be safe
+        # Destroy all milestones with same title across projects
+        destroy_old_milestones(milestone)
+
+        # Rollback if milestone is not valid
         unless group_milestone.valid?
           raise_error(group_milestone.errors.full_messages.to_sentence)
         end
@@ -35,7 +35,7 @@ module Milestones
     end
 
     def move_children_to_group_milestone(group_milestone)
-      milestone_ids_for_merge(group_milestone).in_groups_of(100) do |milestone_ids|
+      milestone_ids_for_merge(group_milestone).in_groups_of(100, false) do |milestone_ids|
         update_children(group_milestone, milestone_ids)
       end
     end
@@ -49,7 +49,12 @@ module Milestones
 
       create_service = CreateService.new(group, current_user, params)
 
-      create_service.execute
+      milestone = create_service.execute
+
+      # milestone won't be valid here because of duplicated title
+      milestone.save(validate: false)
+
+      milestone
     end
 
     def update_children(group_milestone, milestone_ids)
@@ -65,12 +70,12 @@ module Milestones
       @group ||= parent.group || raise_error('Project does not belong to a group.')
     end
 
-    def destroy_old_milestones(group_milestone)
-      Milestone.where(id: milestone_ids_for_merge(group_milestone)).destroy_all
+    def destroy_old_milestones(milestone)
+      Milestone.where(id: milestone_ids_for_merge(milestone)).destroy_all
     end
 
     def group_project_ids
-      @group_project_ids ||= group.projects.map(&:id)
+      @group_project_ids ||= group.projects.pluck(:id)
     end
 
     def raise_error(message)
diff --git a/changelogs/unreleased/issue_40337.yml b/changelogs/unreleased/issue_40337.yml
new file mode 100644
index 00000000000..0cd6c5f46a9
--- /dev/null
+++ b/changelogs/unreleased/issue_40337.yml
@@ -0,0 +1,5 @@
+---
+title: Fix promoting milestone updating all issuables without milestone
+merge_request:
+author:
+type: fixed
diff --git a/spec/services/milestones/promote_service_spec.rb b/spec/services/milestones/promote_service_spec.rb
index 9f2df6d6d19..a0a2843b676 100644
--- a/spec/services/milestones/promote_service_spec.rb
+++ b/spec/services/milestones/promote_service_spec.rb
@@ -25,6 +25,18 @@ describe Milestones::PromoteService do
 
         expect { service.execute(milestone) }.to raise_error(described_class::PromoteMilestoneError)
       end
+
+      it 'does not promote milestone and update issuables if promoted milestone is not valid' do
+        issue = create(:issue, milestone: milestone, project: project)
+        merge_request = create(:merge_request, milestone: milestone, source_project: project)
+        allow_any_instance_of(Milestone).to receive(:valid?).and_return(false)
+
+        expect { service.execute(milestone) }.to raise_error(described_class::PromoteMilestoneError)
+
+        expect(milestone.reload).to be_persisted
+        expect(issue.reload.milestone).to eq(milestone)
+        expect(merge_request.reload.milestone).to eq(milestone)
+      end
     end
 
     context 'without duplicated milestone titles across projects' do
@@ -34,6 +46,16 @@ describe Milestones::PromoteService do
         expect(promoted_milestone).to be_group_milestone
       end
 
+      it 'does not update issuables without milestone with the new promoted milestone' do
+        issue_without_milestone = create(:issue, project: project, milestone: nil)
+        merge_request_without_milestone = create(:merge_request, milestone: nil, source_project: project)
+
+        service.execute(milestone)
+
+        expect(issue_without_milestone.reload.milestone).to be_nil
+        expect(merge_request_without_milestone.reload.milestone).to be_nil
+      end
+
       it 'sets issuables with new promoted milestone' do
         issue = create(:issue, milestone: milestone, project: project)
         merge_request = create(:merge_request, milestone: milestone, source_project: project)
@@ -59,6 +81,20 @@ describe Milestones::PromoteService do
         expect(Milestone.exists?(milestone_2.id)).to be_falsy
       end
 
+      it 'does not update issuables without milestone with the new promoted milestone' do
+        issue_without_milestone_1 = create(:issue, project: project, milestone: nil)
+        issue_without_milestone_2 = create(:issue, project: project_2, milestone: nil)
+        merge_request_without_milestone_1 = create(:merge_request, milestone: nil, source_project: project)
+        merge_request_without_milestone_2 = create(:merge_request, milestone: nil, source_project: project_2)
+
+        service.execute(milestone)
+
+        expect(issue_without_milestone_1.reload.milestone).to be_nil
+        expect(issue_without_milestone_2.reload.milestone).to be_nil
+        expect(merge_request_without_milestone_1.reload.milestone).to be_nil
+        expect(merge_request_without_milestone_2.reload.milestone).to be_nil
+      end
+
       it 'sets all issuables with new promoted milestone' do
         issue = create(:issue, milestone: milestone, project: project)
         issue_2 = create(:issue, milestone: milestone_2, project: project_2)
-- 
cgit v1.2.1


From c900c21eef9235306d7d0da42b07aa2de346e263 Mon Sep 17 00:00:00 2001
From: "micael.bergeron" <micaelbergeron@gmail.com>
Date: Tue, 21 Nov 2017 08:31:23 -0500
Subject: add `#with_metadata` scope to remove a N+1 from the notes' API

---
 app/models/note.rb | 1 +
 lib/api/notes.rb   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/note.rb b/app/models/note.rb
index 4bbb54ba9bf..50c9caf8529 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -110,6 +110,7 @@ class Note < ActiveRecord::Base
     includes(:author, :noteable, :updated_by,
              project: [:project_members, { group: [:group_members] }])
   end
+  scope :with_metadata, -> { includes(:system_note_metadata) }
 
   after_initialize :ensure_discussion_id
   before_validation :nullify_blank_type, :nullify_blank_line_code
diff --git a/lib/api/notes.rb b/lib/api/notes.rb
index 0b9ab4eeb05..ceaaeca4046 100644
--- a/lib/api/notes.rb
+++ b/lib/api/notes.rb
@@ -33,7 +33,7 @@ module API
               # paginate() only works with a relation. This could lead to a
               # mismatch between the pagination headers info and the actual notes
               # array returned, but this is really a edge-case.
-              paginate(noteable.notes)
+              paginate(noteable.notes.with_metadata)
               .reject { |n| n.cross_reference_not_visible_for?(current_user) }
             present notes, with: Entities::Note
           else
@@ -50,7 +50,7 @@ module API
         end
         get ":id/#{noteables_str}/:noteable_id/notes/:note_id" do
           noteable = find_project_noteable(noteables_str, params[:noteable_id])
-          note = noteable.notes.find(params[:note_id])
+          note = noteable.notes.with_metadata.find(params[:note_id])
           can_read_note = can?(current_user, noteable_read_ability_name(noteable), noteable) && !note.cross_reference_not_visible_for?(current_user)
 
           if can_read_note
-- 
cgit v1.2.1


From aeb2f49fd4c65b9f5e3b2d7858a250a747a0f702 Mon Sep 17 00:00:00 2001
From: digitalMoksha <bwalker@gitlab.com>
Date: Tue, 21 Nov 2017 15:35:30 +0100
Subject: Revert "check for `read_only?` first before seeing if request is
 disallowed"

This reverts commit 91075c8237307e09c2be8a88ffb3711fd62417d1.
---
 lib/gitlab/middleware/read_only.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/middleware/read_only.rb b/lib/gitlab/middleware/read_only.rb
index f8b9c5bff4c..c26656704d7 100644
--- a/lib/gitlab/middleware/read_only.rb
+++ b/lib/gitlab/middleware/read_only.rb
@@ -14,7 +14,7 @@ module Gitlab
         @env = env
         @route_hash = nil
 
-        if Gitlab::Database.read_only? && disallowed_request?
+        if disallowed_request? && Gitlab::Database.read_only?
           Rails.logger.debug('GitLab ReadOnly: preventing possible non read-only operation')
           error_message = 'You cannot do writing operations on a read-only GitLab instance'
 
-- 
cgit v1.2.1


From 129036b2cf787f30264a99745cb87125b4b925e4 Mon Sep 17 00:00:00 2001
From: Victor Wu <victor@gitlab.com>
Date: Tue, 21 Nov 2017 15:21:50 +0000
Subject: Custom issue tracker

---
 doc/integration/external-issue-tracker.md            |  1 +
 .../project/integrations/custom_issue_tracker.md     | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 doc/user/project/integrations/custom_issue_tracker.md

diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index 372e1909330..075feaeead9 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -22,6 +22,7 @@ Visit the links below for details:
 - [Redmine](../user/project/integrations/redmine.md)
 - [Jira](../user/project/integrations/jira.md)
 - [Bugzilla](../user/project/integrations/bugzilla.md)
+- [Custom Issue Tracker](../user/project/integrations/custom_issue_tracker.md)
 
 ### Service Template
 
diff --git a/doc/user/project/integrations/custom_issue_tracker.md b/doc/user/project/integrations/custom_issue_tracker.md
new file mode 100644
index 00000000000..757522c2ae3
--- /dev/null
+++ b/doc/user/project/integrations/custom_issue_tracker.md
@@ -0,0 +1,20 @@
+# Custom Issue Tracker Service
+
+To enable the Custom Issue Tracker integration in a project, navigate to the
+[Integrations page](project_services.md#accessing-the-project-services), click
+the **Customer Issue Tracker** service, and fill in the required details on the page as described
+in the table below.
+
+| Field | Description |
+| ----- | ----------- |
+| `title`   | A title for the issue tracker (to differentiate between instances, for example) |
+| `description`   | A name for the issue tracker (to differentiate between instances, for example) |
+| `project_url`   | Currently unused. Will be changed in a future release. |
+| `issues_url`    | The URL to the issue in the issue tracker project that is linked to this GitLab project. Note that the `issues_url` requires `:id` in the URL. This ID is used by GitLab as a placeholder to replace the issue number. For example, `https://customissuetracker.com/project-name/:id`. |
+| `new_issue_url` | Currently unused. Will be changed in a future release. |
+
+
+## Referencing issues
+
+Issues are referenced with `#<ID>`, where `<ID>` is a number (example `#143`). 
+So with the example above, `#143` would refer to `https://customissuetracker.com/project-name/143`.
\ No newline at end of file
-- 
cgit v1.2.1


From 0b9e1e16626eff4cd8ae43ce47ec0f965beaf843 Mon Sep 17 00:00:00 2001
From: Daniel Juarez <daniel.juarez.gonzalez@cern.ch>
Date: Tue, 21 Nov 2017 15:47:58 +0000
Subject: Skip confirmation user api

---
 app/models/user.rb                                   | 4 ++++
 changelogs/unreleased/skip_confirmation_user_API.yml | 7 +++++++
 doc/api/users.md                                     | 1 +
 lib/api/users.rb                                     | 3 ++-
 spec/requests/api/users_spec.rb                      | 8 ++++++++
 5 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/skip_confirmation_user_API.yml

diff --git a/app/models/user.rb b/app/models/user.rb
index 0329d094d09..f98165754ca 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -445,6 +445,10 @@ class User < ActiveRecord::Base
     skip_confirmation! if bool
   end
 
+  def skip_reconfirmation=(bool)
+    skip_reconfirmation! if bool
+  end
+
   def generate_reset_token
     @reset_token, enc = Devise.token_generator.generate(self.class, :reset_password_token)
 
diff --git a/changelogs/unreleased/skip_confirmation_user_API.yml b/changelogs/unreleased/skip_confirmation_user_API.yml
new file mode 100644
index 00000000000..144ccd69e68
--- /dev/null
+++ b/changelogs/unreleased/skip_confirmation_user_API.yml
@@ -0,0 +1,7 @@
+---
+title: Add email confirmation parameters for user creation and update via API
+merge_request: 
+author: Daniel Juarez
+type: added
+
+
diff --git a/doc/api/users.md b/doc/api/users.md
index aa711090af1..478d747a50d 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -297,6 +297,7 @@ Parameters:
 - `location` (optional)         - User's location
 - `admin` (optional)            - User is admin - true or false (default)
 - `can_create_group` (optional) - User can create groups - true or false
+- `skip_reconfirmation` (optional) - Skip reconfirmation - true or false (default)
 - `external` (optional)         - Flags the user as external - true or false(default)
 - `avatar` (optional)           - Image file for user's avatar
 
diff --git a/lib/api/users.rb b/lib/api/users.rb
index d80b364bd09..0cd89b1bcf8 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -31,7 +31,6 @@ module API
           optional :location, type: String, desc: 'The location of the user'
           optional :admin, type: Boolean, desc: 'Flag indicating the user is an administrator'
           optional :can_create_group, type: Boolean, desc: 'Flag indicating the user can create groups'
-          optional :skip_confirmation, type: Boolean, default: false, desc: 'Flag indicating the account is confirmed'
           optional :external, type: Boolean, desc: 'Flag indicating the user is an external user'
           optional :avatar, type: File, desc: 'Avatar image for user'
           all_or_none_of :extern_uid, :provider
@@ -101,6 +100,7 @@ module API
         requires :email, type: String, desc: 'The email of the user'
         optional :password, type: String, desc: 'The password of the new user'
         optional :reset_password, type: Boolean, desc: 'Flag indicating the user will be sent a password reset token'
+        optional :skip_confirmation, type: Boolean, desc: 'Flag indicating the account is confirmed'
         at_least_one_of :password, :reset_password
         requires :name, type: String, desc: 'The name of the user'
         requires :username, type: String, desc: 'The username of the user'
@@ -134,6 +134,7 @@ module API
         requires :id, type: Integer, desc: 'The ID of the user'
         optional :email, type: String, desc: 'The email of the user'
         optional :password, type: String, desc: 'The password of the new user'
+        optional :skip_reconfirmation, type: Boolean, desc: 'Flag indicating the account skips the confirmation by email'
         optional :name, type: String, desc: 'The name of the user'
         optional :username, type: String, desc: 'The username of the user'
         use :optional_attributes
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb
index 2aeae6f9ec7..2428e63e149 100644
--- a/spec/requests/api/users_spec.rb
+++ b/spec/requests/api/users_spec.rb
@@ -510,6 +510,14 @@ describe API::Users do
       expect(user.reload.notification_email).to eq('new@email.com')
     end
 
+    it 'skips reconfirmation when requested' do
+      put api("/users/#{user.id}", admin), { skip_reconfirmation: true }
+
+      user.reload
+
+      expect(user.confirmed_at).to be_present
+    end
+
     it 'updates user with his own username' do
       put api("/users/#{user.id}", admin), username: user.username
 
-- 
cgit v1.2.1


From 0ae8dc9d60de162ffb6fcb3193f613ee7e7d2ac8 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 21 Nov 2017 15:48:20 +0000
Subject: Fix blank states using old css

---
 .../environments/components/environment.vue        | 36 ++++++++++++----------
 .../javascripts/pipelines/components/pipelines.vue |  6 ++--
 app/assets/stylesheets/framework/blank.scss        |  9 ++++++
 app/views/projects/environments/show.html.haml     | 17 +++++-----
 changelogs/unreleased/40377-blank-states.yml       |  5 +++
 5 files changed, 46 insertions(+), 27 deletions(-)
 create mode 100644 changelogs/unreleased/40377-blank-states.yml

diff --git a/app/assets/javascripts/environments/components/environment.vue b/app/assets/javascripts/environments/components/environment.vue
index c039ae85cfb..ffb7757bed8 100644
--- a/app/assets/javascripts/environments/components/environment.vue
+++ b/app/assets/javascripts/environments/components/environment.vue
@@ -227,25 +227,27 @@ export default {
         />
 
       <div
-        class="blank-state blank-state-no-icon"
+        class="blank-state-row"
         v-if="!isLoading && state.environments.length === 0">
-        <h2 class="blank-state-title js-blank-state-title">
-          You don't have any environments right now.
-        </h2>
-        <p class="blank-state-text">
-          Environments are places where code gets deployed, such as staging or production.
-          <br />
-          <a :href="helpPagePath">
-            Read more about environments
+        <div class="blank-state-center">
+          <h2 class="blank-state-title js-blank-state-title">
+            You don't have any environments right now.
+          </h2>
+          <p class="blank-state-text">
+            Environments are places where code gets deployed, such as staging or production.
+            <br />
+            <a :href="helpPagePath">
+              Read more about environments
+            </a>
+          </p>
+
+          <a
+            v-if="canCreateEnvironmentParsed"
+            :href="newEnvironmentPath"
+            class="btn btn-create js-new-environment-button">
+            New environment
           </a>
-        </p>
-
-        <a
-          v-if="canCreateEnvironmentParsed"
-          :href="newEnvironmentPath"
-          class="btn btn-create js-new-environment-button">
-          New environment
-        </a>
+        </div>
       </div>
 
       <div
diff --git a/app/assets/javascripts/pipelines/components/pipelines.vue b/app/assets/javascripts/pipelines/components/pipelines.vue
index cf241c8ffed..233be8a49c8 100644
--- a/app/assets/javascripts/pipelines/components/pipelines.vue
+++ b/app/assets/javascripts/pipelines/components/pipelines.vue
@@ -267,9 +267,11 @@
         />
 
       <div
-        class="blank-state blank-state-no-icon"
+        class="blank-state-row"
         v-if="shouldRenderNoPipelinesMessage">
-        <h2 class="blank-state-title js-blank-state-title">No pipelines to show.</h2>
+        <div class="blank-state-center">
+          <h2 class="blank-state-title js-blank-state-title">No pipelines to show.</h2>
+        </div>
       </div>
 
       <div
diff --git a/app/assets/stylesheets/framework/blank.scss b/app/assets/stylesheets/framework/blank.scss
index 10f9e9b70b0..9982a5779af 100644
--- a/app/assets/stylesheets/framework/blank.scss
+++ b/app/assets/stylesheets/framework/blank.scss
@@ -56,6 +56,12 @@
   }
 }
 
+.blank-state-center {
+  padding-top: 20px;
+  padding-bottom: 20px;
+  text-align: center;
+}
+
 .blank-state {
   padding: 20px;
   border: 1px solid $border-color;
@@ -66,7 +72,10 @@
     align-items: center;
     padding: 50px 30px;
   }
+}
 
+.blank-state,
+.blank-state-center {
   .blank-state-icon {
     svg {
       display: block;
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml
index d7859c9fbeb..add394a6356 100644
--- a/app/views/projects/environments/show.html.haml
+++ b/app/views/projects/environments/show.html.haml
@@ -19,14 +19,15 @@
 
   .environments-container
     - if @deployments.blank?
-      .blank-state.blank-state-no-icon
-        %h2.blank-state-title
-          You don't have any deployments right now.
-        %p.blank-state-text
-          Define environments in the deploy stage(s) in
-          %code .gitlab-ci.yml
-          to track deployments here.
-        = link_to "Read more", help_page_path("ci/environments"), class: "btn btn-success"
+      .blank-state-row
+        .blank-state-center
+          %h2.blank-state-title
+            You don't have any deployments right now.
+          %p.blank-state-text
+            Define environments in the deploy stage(s) in
+            %code .gitlab-ci.yml
+            to track deployments here.
+          = link_to "Read more", help_page_path("ci/environments"), class: "btn btn-success"
     - else
       .table-holder
         .ci-table.environments{ role: 'grid' }
diff --git a/changelogs/unreleased/40377-blank-states.yml b/changelogs/unreleased/40377-blank-states.yml
new file mode 100644
index 00000000000..7635602c68c
--- /dev/null
+++ b/changelogs/unreleased/40377-blank-states.yml
@@ -0,0 +1,5 @@
+---
+title: Fix blank states using old css
+merge_request:
+author:
+type: fixed
-- 
cgit v1.2.1


From 54f1e406f40a31c6d790bdeabc55556a268990e1 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 21 Nov 2017 17:32:12 +0100
Subject: Use arrays in Pipeline#latest_builds_with_artifacts

This changes Ci::Pipeline#latest_builds_with_artifacts so it returns an
Array instead of a relation. Whenever we use this data we do so in two
steps:

1. Count the number of rows
2. If this number is greater than 0, iterate over the rows

By returning an Array instead we only execute 1 query of which the total
time/work is less than running either just a COUNT(*) or both queries
(in the worst case).

On GitLab.com this change should save us a few milliseconds per request
to ProjectsController#show.
---
 app/models/ci/pipeline.rb                                     | 5 ++++-
 changelogs/unreleased/reduce-queries-for-artifacts-button.yml | 5 +++++
 spec/models/ci/pipeline_spec.rb                               | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/reduce-queries-for-artifacts-button.yml

diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 3ded675bec0..ebbefc51a4f 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -507,7 +507,10 @@ module Ci
     end
 
     def latest_builds_with_artifacts
-      @latest_builds_with_artifacts ||= builds.latest.with_artifacts
+      # We purposely cast the builds to an Array here. Because we always use the
+      # rows if there are more than 0 this prevents us from having to run two
+      # queries: one to get the count and one to get the rows.
+      @latest_builds_with_artifacts ||= builds.latest.with_artifacts.to_a
     end
 
     private
diff --git a/changelogs/unreleased/reduce-queries-for-artifacts-button.yml b/changelogs/unreleased/reduce-queries-for-artifacts-button.yml
new file mode 100644
index 00000000000..f2d469b5a80
--- /dev/null
+++ b/changelogs/unreleased/reduce-queries-for-artifacts-button.yml
@@ -0,0 +1,5 @@
+---
+title: Use arrays in Pipeline#latest_builds_with_artifacts
+merge_request:
+author:
+type: performance
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index b89b0e555d9..3a19a0753e2 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -1502,6 +1502,10 @@ describe Ci::Pipeline, :mailer do
       create(:ci_build, :success, :artifacts, pipeline: pipeline)
     end
 
+    it 'returns an Array' do
+      expect(pipeline.latest_builds_with_artifacts).to be_an_instance_of(Array)
+    end
+
     it 'returns the latest builds' do
       expect(pipeline.latest_builds_with_artifacts).to eq([build])
     end
-- 
cgit v1.2.1


From aafe5c123ef2f64ddf44a5655a6fc63ec4e571da Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 21 Nov 2017 15:57:02 +0100
Subject: Update composite pipelines index to include "id"

This updates the composite index on ci_pipelines (project_id, ref,
status) to also include the "id" column at the end. Adding this column
to the index drastically improves the performance of queries used for
getting the latest pipeline for a particular branch. For example, on
project dashboards we'll run a query like the following:

    SELECT ci_pipelines.*
    FROM ci_pipelines
    WHERE ci_pipelines.project_id = 13083
    AND ci_pipelines.ref = 'master'
    AND ci_pipelines.status = 'success'
    ORDER BY ci_pipelines.id DESC
    LIMIT 1;

    Limit  (cost=0.43..58.88 rows=1 width=224) (actual time=26.956..26.956 rows=1 loops=1)
      Buffers: shared hit=6544 dirtied=16
      ->  Index Scan Backward using ci_pipelines_pkey on ci_pipelines  (cost=0.43..830922.89 rows=14216 width=224) (actual time=26.954..26.954 rows=1 loops=1)
            Filter: ((project_id = 13083) AND ((ref)::text = 'master'::text) AND ((status)::text = 'success'::text))
            Rows Removed by Filter: 6476
            Buffers: shared hit=6544 dirtied=16
    Planning time: 1.484 ms
    Execution time: 27.000 ms

Because of the lack of "id" in the index we end up scanning over the
primary key index, then applying a filter to filter out any remaining
rows. The more pipelines a GitLab instance has the slower this will get.

By adding "id" to the mentioned composite index we can change the above
plan into the following:

    Limit  (cost=0.56..2.01 rows=1 width=224) (actual time=0.034..0.034 rows=1 loops=1)
      Buffers: shared hit=5
      ->  Index Scan Backward using yorick_test on ci_pipelines  (cost=0.56..16326.37 rows=11243 width=224) (actual time=0.033..0.033 rows=1 loops=1)
            Index Cond: ((project_id = 13083) AND ((ref)::text = 'master'::text) AND ((status)::text = 'success'::text))
            Buffers: shared hit=5
    Planning time: 0.695 ms
    Execution time: 0.061 ms

This in turn leads to a best-case improvement of roughly 25
milliseconds, give or take a millisecond or two.
---
 changelogs/unreleased/fix-ci-pipelines-index.yml   |  5 ++++
 ..._pipelines_index_on_project_id_ref_status_id.rb | 35 ++++++++++++++++++++++
 db/schema.rb                                       |  4 +--
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/fix-ci-pipelines-index.yml
 create mode 100644 db/migrate/20171121144800_ci_pipelines_index_on_project_id_ref_status_id.rb

diff --git a/changelogs/unreleased/fix-ci-pipelines-index.yml b/changelogs/unreleased/fix-ci-pipelines-index.yml
new file mode 100644
index 00000000000..772093fbef0
--- /dev/null
+++ b/changelogs/unreleased/fix-ci-pipelines-index.yml
@@ -0,0 +1,5 @@
+---
+title: Update composite pipelines index to include "id"
+merge_request:
+author:
+type: performance
diff --git a/db/migrate/20171121144800_ci_pipelines_index_on_project_id_ref_status_id.rb b/db/migrate/20171121144800_ci_pipelines_index_on_project_id_ref_status_id.rb
new file mode 100644
index 00000000000..5a8ae6e4b57
--- /dev/null
+++ b/db/migrate/20171121144800_ci_pipelines_index_on_project_id_ref_status_id.rb
@@ -0,0 +1,35 @@
+# See http://doc.gitlab.com/ce/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class CiPipelinesIndexOnProjectIdRefStatusId < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  # Set this constant to true if this migration requires downtime.
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  TABLE = :ci_pipelines
+  OLD_COLUMNS = %i[project_id ref status].freeze
+  NEW_COLUMNS = %i[project_id ref status id].freeze
+
+  def up
+    unless index_exists?(TABLE, NEW_COLUMNS)
+      add_concurrent_index(TABLE, NEW_COLUMNS)
+    end
+
+    if index_exists?(TABLE, OLD_COLUMNS)
+      remove_concurrent_index(TABLE, OLD_COLUMNS)
+    end
+  end
+
+  def down
+    unless index_exists?(TABLE, OLD_COLUMNS)
+      add_concurrent_index(TABLE, OLD_COLUMNS)
+    end
+
+    if index_exists?(TABLE, NEW_COLUMNS)
+      remove_concurrent_index(TABLE, NEW_COLUMNS)
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 7afab18df08..a82270390f1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20171114162227) do
+ActiveRecord::Schema.define(version: 20171121144800) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -382,7 +382,7 @@ ActiveRecord::Schema.define(version: 20171114162227) do
 
   add_index "ci_pipelines", ["auto_canceled_by_id"], name: "index_ci_pipelines_on_auto_canceled_by_id", using: :btree
   add_index "ci_pipelines", ["pipeline_schedule_id"], name: "index_ci_pipelines_on_pipeline_schedule_id", using: :btree
-  add_index "ci_pipelines", ["project_id", "ref", "status"], name: "index_ci_pipelines_on_project_id_and_ref_and_status", using: :btree
+  add_index "ci_pipelines", ["project_id", "ref", "status", "id"], name: "index_ci_pipelines_on_project_id_and_ref_and_status_and_id", using: :btree
   add_index "ci_pipelines", ["project_id", "sha"], name: "index_ci_pipelines_on_project_id_and_sha", using: :btree
   add_index "ci_pipelines", ["project_id"], name: "index_ci_pipelines_on_project_id", using: :btree
   add_index "ci_pipelines", ["status"], name: "index_ci_pipelines_on_status", using: :btree
-- 
cgit v1.2.1


From afd5911557051c4dae652b386c7a91f746ff18a5 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Tue, 21 Nov 2017 17:13:21 +0000
Subject: Set the default gitlab-shell timeout to 3 hours

---
 app/views/shared/_import_form.html.haml                      | 3 ++-
 changelogs/unreleased/39977-gitlab-shell-default-timeout.yml | 5 +++++
 config/gitlab.yml.example                                    | 4 ++--
 config/initializers/1_settings.rb                            | 2 +-
 lib/gitlab/shell.rb                                          | 3 +--
 5 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100644 changelogs/unreleased/39977-gitlab-shell-default-timeout.yml

diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml
index 233d8c95eda..736afa085e8 100644
--- a/app/views/shared/_import_form.html.haml
+++ b/app/views/shared/_import_form.html.haml
@@ -11,6 +11,7 @@
       %li
         If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.
       %li
-        The import will time out after 15 minutes. For repositories that take longer, use a clone/push combination.
+        The import will time out after #{time_interval_in_words(Gitlab.config.gitlab_shell.git_timeout)}.
+        For repositories that take longer, use a clone/push combination.
       %li
         To migrate an SVN repository, check out #{link_to "this document", help_page_path('user/project/import/svn')}.
diff --git a/changelogs/unreleased/39977-gitlab-shell-default-timeout.yml b/changelogs/unreleased/39977-gitlab-shell-default-timeout.yml
new file mode 100644
index 00000000000..b7a974fd8d9
--- /dev/null
+++ b/changelogs/unreleased/39977-gitlab-shell-default-timeout.yml
@@ -0,0 +1,5 @@
+---
+title: Set the default gitlab-shell timeout to 3 hours
+merge_request: 15292
+author:
+type: fixed
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 7547ba4a8fa..7f6e68ceed6 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -559,8 +559,8 @@ production: &base
     upload_pack: true
     receive_pack: true
 
-    # Git import/fetch timeout
-    # git_timeout: 800
+    # Git import/fetch timeout, in seconds. Defaults to 3 hours.
+    # git_timeout: 10800
 
     # If you use non-standard ssh port you need to specify it
     # ssh_port: 22
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index d1156b0c8a8..f7c83f7b0f7 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -429,7 +429,7 @@ Settings.gitlab_shell['ssh_port']     ||= 22
 Settings.gitlab_shell['ssh_user']     ||= Settings.gitlab.user
 Settings.gitlab_shell['owner_group']  ||= Settings.gitlab.user
 Settings.gitlab_shell['ssh_path_prefix'] ||= Settings.__send__(:build_gitlab_shell_ssh_path_prefix)
-Settings.gitlab_shell['git_timeout'] ||= 800
+Settings.gitlab_shell['git_timeout'] ||= 10800
 
 #
 # Workhorse
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb
index dc0184e4ad9..996d213fdb4 100644
--- a/lib/gitlab/shell.rb
+++ b/lib/gitlab/shell.rb
@@ -101,8 +101,7 @@ module Gitlab
     #
     # Gitaly migration: https://gitlab.com/gitlab-org/gitaly/issues/387
     def import_repository(storage, name, url)
-      # Timeout should be less than 900 ideally, to prevent the memory killer
-      # to silently kill the process without knowing we are timing out here.
+      # The timeout ensures the subprocess won't hang forever
       cmd = [gitlab_shell_projects_path, 'import-project',
              storage, "#{name}.git", url, "#{Gitlab.config.gitlab_shell.git_timeout}"]
       gitlab_shell_fast_execute_raise_error(cmd)
-- 
cgit v1.2.1


From d087b4dac466fc7da6dbdc8668aea943af4546e8 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <brodock@gmail.com>
Date: Tue, 21 Nov 2017 18:34:00 +0100
Subject: FileUploader should check for hashed_storage?(:attachments) to use
 disk_path

---
 app/uploaders/file_uploader.rb       | 10 +++++---
 spec/uploaders/file_uploader_spec.rb | 50 +++++++++++++++++++++++++++---------
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb
index d4ba3a028be..f4a5cf75018 100644
--- a/app/uploaders/file_uploader.rb
+++ b/app/uploaders/file_uploader.rb
@@ -26,11 +26,15 @@ class FileUploader < GitlabUploader
   # This is used to build Upload paths dynamically based on the model's current
   # namespace and path, allowing us to ignore renames or transfers.
   #
-  # model - Object that responds to `path_with_namespace`
+  # model - Object that responds to `full_path` and `disk_path`
   #
   # Returns a String without a trailing slash
-  def self.dynamic_path_segment(model)
-    File.join(CarrierWave.root, base_dir, model.disk_path)
+  def self.dynamic_path_segment(project)
+    if project.hashed_storage?(:attachments)
+      File.join(CarrierWave.root, base_dir, project.disk_path)
+    else
+      File.join(CarrierWave.root, base_dir, project.full_path)
+    end
   end
 
   attr_accessor :model
diff --git a/spec/uploaders/file_uploader_spec.rb b/spec/uploaders/file_uploader_spec.rb
index f52b2bab05b..fd195d6f9b8 100644
--- a/spec/uploaders/file_uploader_spec.rb
+++ b/spec/uploaders/file_uploader_spec.rb
@@ -28,25 +28,51 @@ describe FileUploader do
   end
 
   context 'hashed storage' do
-    let(:project) { build_stubbed(:project, :hashed) }
+    context 'when rolled out attachments' do
+      let(:project) { build_stubbed(:project, :hashed) }
 
-    describe '.absolute_path' do
-      it 'returns the correct absolute path by building it dynamically' do
-        upload = double(model: project, path: 'secret/foo.jpg')
+      describe '.absolute_path' do
+        it 'returns the correct absolute path by building it dynamically' do
+          upload = double(model: project, path: 'secret/foo.jpg')
 
-        dynamic_segment = project.disk_path
+          dynamic_segment = project.disk_path
 
-        expect(described_class.absolute_path(upload))
-          .to end_with("#{dynamic_segment}/secret/foo.jpg")
+          expect(described_class.absolute_path(upload))
+            .to end_with("#{dynamic_segment}/secret/foo.jpg")
+        end
+      end
+
+      describe "#store_dir" do
+        it "stores in the namespace path" do
+          uploader = described_class.new(project)
+
+          expect(uploader.store_dir).to include(project.disk_path)
+          expect(uploader.store_dir).not_to include("system")
+        end
       end
     end
 
-    describe "#store_dir" do
-      it "stores in the namespace path" do
-        uploader = described_class.new(project)
+    context 'when only repositories are rolled out' do
+      let(:project) { build_stubbed(:project, storage_version: Project::HASHED_STORAGE_FEATURES[:repository]) }
 
-        expect(uploader.store_dir).to include(project.disk_path)
-        expect(uploader.store_dir).not_to include("system")
+      describe '.absolute_path' do
+        it 'returns the correct absolute path by building it dynamically' do
+          upload = double(model: project, path: 'secret/foo.jpg')
+
+          dynamic_segment = project.full_path
+
+          expect(described_class.absolute_path(upload))
+            .to end_with("#{dynamic_segment}/secret/foo.jpg")
+        end
+      end
+
+      describe "#store_dir" do
+        it "stores in the namespace path" do
+          uploader = described_class.new(project)
+
+          expect(uploader.store_dir).to include(project.full_path)
+          expect(uploader.store_dir).not_to include("system")
+        end
       end
     end
   end
-- 
cgit v1.2.1


From c33ca9d807a70be51afea2692b7191d7790edd6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Tue, 21 Nov 2017 17:45:36 +0000
Subject: Use `make install` for Gitaly setups in non-test environments

---
 lib/tasks/gitlab/gitaly.rake          | 11 ++++++++---
 spec/tasks/gitlab/gitaly_rake_spec.rb | 16 +++++++++-------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index 87835dbe719..f2002d7a426 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -14,8 +14,10 @@ namespace :gitlab do
 
       checkout_or_clone_version(version: version, repo: args.repo, target_dir: args.dir)
 
+      command = %w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE]
+
       _, status = Gitlab::Popen.popen(%w[which gmake])
-      command = status.zero? ? ['gmake'] : ['make']
+      command << (status.zero? ? 'gmake' : 'make')
 
       command << 'BUNDLE_FLAGS=--no-deployment' if Rails.env.test?
 
@@ -23,7 +25,7 @@ namespace :gitlab do
         create_gitaly_configuration
         # In CI we run scripts/gitaly-test-build instead of this command
         unless ENV['CI'].present?
-          Bundler.with_original_env { run_command!(%w[/usr/bin/env -u RUBYOPT -u BUNDLE_GEMFILE] + command) }
+          Bundler.with_original_env { run_command!(command) }
         end
       end
     end
@@ -80,9 +82,12 @@ namespace :gitlab do
     end
 
     def create_gitaly_configuration
-      File.open("config.toml", "w") do |f|
+      File.open("config.toml", File::WRONLY | File::CREAT | File::EXCL) do |f|
         f.puts gitaly_configuration_toml
       end
+    rescue Errno::EEXIST
+      puts "Skipping config.toml generation:"
+      puts "A configuration file already exists."
     rescue ArgumentError => e
       puts "Skipping config.toml generation:"
       puts e.message
diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb
index 255f0a37ec8..a51374e2645 100644
--- a/spec/tasks/gitlab/gitaly_rake_spec.rb
+++ b/spec/tasks/gitlab/gitaly_rake_spec.rb
@@ -47,7 +47,7 @@ describe 'gitlab:gitaly namespace rake task' do
         stub_env('CI', false)
         FileUtils.mkdir_p(clone_path)
         expect(Dir).to receive(:chdir).with(clone_path).and_call_original
-        allow(Bundler).to receive(:bundle_path).and_return('/fake/bundle_path')
+        allow(Rails.env).to receive(:test?).and_return(false)
       end
 
       context 'gmake is available' do
@@ -57,7 +57,7 @@ describe 'gitlab:gitaly namespace rake task' do
 
         it 'calls gmake in the gitaly directory' do
           expect(Gitlab::Popen).to receive(:popen).with(%w[which gmake]).and_return(['/usr/bin/gmake', 0])
-          expect(main_object).to receive(:run_command!).with(command_preamble + %w[gmake BUNDLE_FLAGS=--no-deployment]).and_return(true)
+          expect(main_object).to receive(:run_command!).with(command_preamble + %w[gmake]).and_return(true)
 
           run_rake_task('gitlab:gitaly:install', clone_path)
         end
@@ -70,18 +70,20 @@ describe 'gitlab:gitaly namespace rake task' do
         end
 
         it 'calls make in the gitaly directory' do
-          expect(main_object).to receive(:run_command!).with(command_preamble + %w[make BUNDLE_FLAGS=--no-deployment]).and_return(true)
+          expect(main_object).to receive(:run_command!).with(command_preamble + %w[make]).and_return(true)
 
           run_rake_task('gitlab:gitaly:install', clone_path)
         end
 
-        context 'when Rails.env is not "test"' do
+        context 'when Rails.env is test' do
+          let(:command) { %w[make BUNDLE_FLAGS=--no-deployment] }
+
           before do
-            allow(Rails.env).to receive(:test?).and_return(false)
+            allow(Rails.env).to receive(:test?).and_return(true)
           end
 
-          it 'calls make in the gitaly directory without BUNDLE_PATH' do
-            expect(main_object).to receive(:run_command!).with(command_preamble + ['make']).and_return(true)
+          it 'calls make in the gitaly directory with --no-deployment flag for bundle' do
+            expect(main_object).to receive(:run_command!).with(command_preamble + command).and_return(true)
 
             run_rake_task('gitlab:gitaly:install', clone_path)
           end
-- 
cgit v1.2.1


From 356f33d20b97058016ceba2df755ebfc33f88641 Mon Sep 17 00:00:00 2001
From: Victor Wu <victor@gitlab.com>
Date: Tue, 21 Nov 2017 18:54:01 +0000
Subject: Update CONTRIBUTING.md: Link definition of done to criteria

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c4e5fd842df..4930b541ba2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -543,6 +543,7 @@ When having your code reviewed and when reviewing merge requests please take the
    etc.), they should conform to our [Licensing guidelines][license-finder-doc].
    See the instructions in that document for help if your MR fails the
    "license-finder" test with a "Dependencies that need approval" error.
+1. The merge request meets the [definition of done](#definition-of-done).
 
 ## Definition of done
 
-- 
cgit v1.2.1


From 00cd5d93ce2245204356cf550871cfb96ea7dc8e Mon Sep 17 00:00:00 2001
From: "Jacob Vosmaer (GitLab)" <jacob@gitlab.com>
Date: Tue, 21 Nov 2017 19:00:05 +0000
Subject: Use Redis cache for branch existence checks

---
 app/models/repository.rb       |  6 +-----
 spec/models/repository_spec.rb | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 26d1bc12232..2bf21cbdcc4 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -217,11 +217,7 @@ class Repository
   def branch_exists?(branch_name)
     return false unless raw_repository
 
-    @branch_exists_memo ||= Hash.new do |hash, key|
-      hash[key] = raw_repository.branch_exists?(key)
-    end
-
-    @branch_exists_memo[branch_name]
+    branch_names.include?(branch_name)
   end
 
   def ref_exists?(ref)
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 8a6aa767ce6..e9e6abb0d5f 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -1166,6 +1166,31 @@ describe Repository do
     end
   end
 
+  describe '#branch_exists?' do
+    it 'uses branch_names' do
+      allow(repository).to receive(:branch_names).and_return(['foobar'])
+
+      expect(repository.branch_exists?('foobar')).to eq(true)
+      expect(repository.branch_exists?('master')).to eq(false)
+    end
+  end
+
+  describe '#branch_names', :use_clean_rails_memory_store_caching do
+    let(:fake_branch_names) { ['foobar'] }
+
+    it 'gets cached across Repository instances' do
+      allow(repository.raw_repository).to receive(:branch_names).once.and_return(fake_branch_names)
+
+      expect(repository.branch_names).to eq(fake_branch_names)
+
+      fresh_repository = Project.find(project.id).repository
+      expect(fresh_repository.object_id).not_to eq(repository.object_id)
+
+      expect(fresh_repository.raw_repository).not_to receive(:branch_names)
+      expect(fresh_repository.branch_names).to eq(fake_branch_names)
+    end
+  end
+
   describe '#update_autocrlf_option' do
     describe 'when autocrlf is not already set to :input' do
       before do
-- 
cgit v1.2.1


From 5e861a052551d307e928fa0797a64d30da380eeb Mon Sep 17 00:00:00 2001
From: Brett Walker <brett@digitalmoksha.com>
Date: Tue, 21 Nov 2017 20:26:53 +0000
Subject: ignore hashed repos (for now) when using `rake gitlab:cleanup:repos`

---
 lib/tasks/gitlab/cleanup.rake          |  5 ++++-
 spec/tasks/gitlab/cleanup_rake_spec.rb | 41 ++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 spec/tasks/gitlab/cleanup_rake_spec.rb

diff --git a/lib/tasks/gitlab/cleanup.rake b/lib/tasks/gitlab/cleanup.rake
index 91c74bfb6b4..301affc9522 100644
--- a/lib/tasks/gitlab/cleanup.rake
+++ b/lib/tasks/gitlab/cleanup.rake
@@ -59,7 +59,10 @@ namespace :gitlab do
               .sub(%r{^/*}, '')
               .chomp('.git')
               .chomp('.wiki')
-            next if Project.find_by_full_path(repo_with_namespace)
+
+            # TODO ignoring hashed repositories for now.  But revisit to fully support
+            # possible orphaned hashed repos
+            next if repo_with_namespace.start_with?('@hashed/') || Project.find_by_full_path(repo_with_namespace)
 
             new_path = path + move_suffix
             puts path.inspect + ' -> ' + new_path.inspect
diff --git a/spec/tasks/gitlab/cleanup_rake_spec.rb b/spec/tasks/gitlab/cleanup_rake_spec.rb
new file mode 100644
index 00000000000..641eccfd334
--- /dev/null
+++ b/spec/tasks/gitlab/cleanup_rake_spec.rb
@@ -0,0 +1,41 @@
+require 'rake_helper'
+
+describe 'gitlab:cleanup rake tasks' do
+  before do
+    Rake.application.rake_require 'tasks/gitlab/cleanup'
+  end
+
+  context 'cleanup repositories' do
+    let(:gitaly_address) { Gitlab.config.repositories.storages.default.gitaly_address }
+    let(:storages) do
+      {
+        'default' => { 'path' => Settings.absolute('tmp/tests/default_storage'), 'gitaly_address' => gitaly_address  }
+      }
+    end
+
+    before do
+      FileUtils.mkdir(Settings.absolute('tmp/tests/default_storage'))
+      allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)
+    end
+
+    after do
+      FileUtils.rm_rf(Settings.absolute('tmp/tests/default_storage'))
+    end
+
+    it 'moves it to an orphaned path' do
+      FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/broken/project.git'))
+      run_rake_task('gitlab:cleanup:repos')
+      repo_list = Dir['tmp/tests/default_storage/broken/*']
+
+      expect(repo_list.first).to include('+orphaned+')
+    end
+
+    it 'ignores @hashed repos' do
+      FileUtils.mkdir_p(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))
+
+      run_rake_task('gitlab:cleanup:repos')
+
+      expect(Dir.exist?(Settings.absolute('tmp/tests/default_storage/@hashed/12/34/5678.git'))).to be_truthy
+    end
+  end
+end
-- 
cgit v1.2.1


From 59502122bdf928e58a0592da0610f2a94bb5eeb4 Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Tue, 21 Nov 2017 10:11:45 -0600
Subject: Fix reply quote keyboard shortcut on MRs

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40295
---
 app/assets/javascripts/dispatcher.js               |  3 +-
 spec/features/issuables/shortcuts_issuable_spec.rb | 46 ++++++++++++++++++++++
 spec/spec_helper.rb                                |  1 +
 spec/support/selection_helper.rb                   |  6 +++
 4 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 spec/features/issuables/shortcuts_issuable_spec.rb
 create mode 100644 spec/support/selection_helper.rb

diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index d716218d9a4..4e9e091d4df 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -317,7 +317,6 @@ import Diff from './diff';
           break;
         case 'projects:merge_requests:show':
           new Diff();
-          shortcut_handler = new ShortcutsIssuable(true);
           new ZenMode();
 
           initIssuableSidebar();
@@ -327,6 +326,8 @@ import Diff from './diff';
           window.mergeRequest = new MergeRequest({
             action: mrShowNode.dataset.mrAction,
           });
+
+          shortcut_handler = new ShortcutsIssuable(true);
           break;
         case 'dashboard:activity':
           new gl.Activities();
diff --git a/spec/features/issuables/shortcuts_issuable_spec.rb b/spec/features/issuables/shortcuts_issuable_spec.rb
new file mode 100644
index 00000000000..e25fd1a6249
--- /dev/null
+++ b/spec/features/issuables/shortcuts_issuable_spec.rb
@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+feature 'Blob shortcuts', :js do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :public, :repository) }
+  let(:issue) { create(:issue, project: project, author: user) }
+  let(:merge_request) { create(:merge_request, source_project: project) }
+  let(:note_text) { 'I got this!' }
+
+  before do
+    project.add_developer(user)
+    sign_in(user)
+  end
+
+  describe 'pressing "r"' do
+    describe 'On an Issue' do
+      before do
+        create(:note, noteable: issue, project: project, note: note_text)
+        visit project_issue_path(project, issue)
+        wait_for_requests
+      end
+
+      it 'quotes the selected text' do
+        select_element('.note-text')
+        find('body').native.send_key('r')
+
+        expect(find('.js-main-target-form .js-vue-comment-form').value).to include(note_text)
+      end
+    end
+
+    describe 'On a Merge Request' do
+      before do
+        create(:note, noteable: merge_request, project: project, note: note_text)
+        visit project_merge_request_path(project, merge_request)
+        wait_for_requests
+      end
+
+      it 'quotes the selected text' do
+        select_element('.note-text')
+        find('body').native.send_key('r')
+
+        expect(find('.js-main-target-form #note_note').value).to include(note_text)
+      end
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 7c8331f6c60..6310ea1b52b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -50,6 +50,7 @@ RSpec.configure do |config|
   config.include SearchHelpers, type: :feature
   config.include CookieHelper, :js
   config.include InputHelper, :js
+  config.include SelectionHelper, :js
   config.include InspectRequests, :js
   config.include WaitForRequests, :js
   config.include LiveDebugger, :js
diff --git a/spec/support/selection_helper.rb b/spec/support/selection_helper.rb
new file mode 100644
index 00000000000..b4725b137b2
--- /dev/null
+++ b/spec/support/selection_helper.rb
@@ -0,0 +1,6 @@
+module SelectionHelper
+  def select_element(selector)
+    find(selector)
+    execute_script("let range = document.createRange(); let sel = window.getSelection(); range.selectNodeContents(document.querySelector('#{selector}')); sel.addRange(range);")
+  end
+end
-- 
cgit v1.2.1


From a82b9df5912c9829c492ef0b40fdd0b887d7d2ce Mon Sep 17 00:00:00 2001
From: Simon Knox <simon@gitlab.com>
Date: Tue, 21 Nov 2017 20:39:26 +0000
Subject: default fill color for SVGs

---
 .../stylesheets/framework/contextual-sidebar.scss  | 19 ---------------
 app/assets/stylesheets/framework/filters.scss      |  5 ----
 app/assets/stylesheets/framework/gitlab-theme.scss |  8 -------
 app/assets/stylesheets/framework/header.scss       | 20 ----------------
 app/assets/stylesheets/framework/icons.scss        | 28 ----------------------
 app/assets/stylesheets/framework/images.scss       |  2 ++
 app/assets/stylesheets/framework/mixins.scss       |  8 -------
 app/assets/stylesheets/framework/zen.scss          |  8 -------
 app/assets/stylesheets/pages/notes.scss            |  8 -------
 app/assets/stylesheets/pages/status.scss           |  4 ----
 10 files changed, 2 insertions(+), 108 deletions(-)

diff --git a/app/assets/stylesheets/framework/contextual-sidebar.scss b/app/assets/stylesheets/framework/contextual-sidebar.scss
index 320f458630a..b73932eb7e1 100644
--- a/app/assets/stylesheets/framework/contextual-sidebar.scss
+++ b/app/assets/stylesheets/framework/contextual-sidebar.scss
@@ -40,12 +40,6 @@
   a:hover {
     background-color: $link-hover-background;
     color: $gl-text-color;
-
-    .settings-avatar {
-      svg {
-        fill: $gl-text-color;
-      }
-    }
   }
 
   .avatar-container {
@@ -138,10 +132,6 @@
       color: $gl-text-color-secondary;
     }
 
-    svg {
-      fill: $gl-text-color-secondary;
-    }
-
     .nav-item-name {
       flex: 1;
     }
@@ -224,10 +214,6 @@
 
       &:hover {
         color: $gl-text-color;
-
-        svg {
-          fill: $gl-text-color;
-        }
       }
     }
 
@@ -338,7 +324,6 @@
   align-items: center;
 
   svg {
-    fill: $gl-text-color-secondary;
     margin-right: 8px;
   }
 
@@ -349,10 +334,6 @@
   &:hover {
     background-color: $border-color;
     color: $gl-text-color;
-
-    svg {
-      fill: $gl-text-color;
-    }
   }
 }
 
diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss
index 74b6b31b07e..cf8165eab5b 100644
--- a/app/assets/stylesheets/framework/filters.scss
+++ b/app/assets/stylesheets/framework/filters.scss
@@ -305,16 +305,11 @@
     color: $gl-text-color;
     border-color: $dropdown-input-focus-border;
     outline: none;
-
-    svg {
-      fill: $gl-text-color;
-    }
   }
 
   svg {
     height: 14px;
     width: 14px;
-    fill: $gl-text-color-secondary;
     vertical-align: middle;
   }
 
diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss
index dc591c06c88..db36e27fa74 100644
--- a/app/assets/stylesheets/framework/gitlab-theme.scss
+++ b/app/assets/stylesheets/framework/gitlab-theme.scss
@@ -30,10 +30,6 @@
         &.dropdown.open > a {
           color: $color-900;
           background-color: $color-alternate;
-
-          svg {
-            fill: currentColor;
-          }
         }
 
         &.line-separator {
@@ -51,10 +47,6 @@
         color: $color-200;
 
         > a {
-          svg {
-            fill: $color-200;
-          }
-
           &.header-user-dropdown-toggle {
             .header-user-avatar {
               border-color: $color-200;
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 2218b5705fc..f985a3aea5c 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -235,10 +235,6 @@
           opacity: 1;
           color: $white-light;
 
-          svg {
-            fill: currentColor;
-          }
-
           &.header-user-dropdown-toggle .header-user-avatar {
             border-color: $white-light;
           }
@@ -269,14 +265,6 @@
           font-size: 20px;
         }
       }
-
-      &.active > a,
-      &.dropdown.open > a {
-
-        svg {
-          fill: currentColor;
-        }
-      }
     }
   }
 }
@@ -289,10 +277,6 @@
       text-decoration: none;
       outline: 0;
       color: $white-light;
-
-      svg {
-        fill: currentColor;
-      }
     }
 
     > a {
@@ -307,10 +291,6 @@
       border-radius: $border-radius-default;
       height: 32px;
       font-weight: $gl-font-weight-bold;
-
-      svg {
-        fill: currentColor;
-      }
     }
 
     &.line-separator {
diff --git a/app/assets/stylesheets/framework/icons.scss b/app/assets/stylesheets/framework/icons.scss
index ef864e8f6a9..1ab5e6a93f9 100644
--- a/app/assets/stylesheets/framework/icons.scss
+++ b/app/assets/stylesheets/framework/icons.scss
@@ -1,63 +1,35 @@
 .ci-status-icon-success,
 .ci-status-icon-passed {
   color: $green-500;
-
-  svg {
-    fill: $green-500;
-  }
 }
 
 .ci-status-icon-failed {
   color: $gl-danger;
-
-  svg {
-    fill: $gl-danger;
-  }
 }
 
 .ci-status-icon-pending,
 .ci-status-icon-failed_with_warnings,
 .ci-status-icon-success_with_warnings {
   color: $orange-500;
-
-  svg {
-    fill: $orange-500;
-  }
 }
 
 .ci-status-icon-running {
   color: $blue-400;
-
-  svg {
-    fill: $blue-400;
-  }
 }
 
 .ci-status-icon-canceled,
 .ci-status-icon-disabled,
 .ci-status-icon-not-found {
   color: $gl-text-color;
-
-  svg {
-    fill: $gl-text-color;
-  }
 }
 
 .ci-status-icon-created,
 .ci-status-icon-skipped {
   color: $gray-darkest;
-
-  svg {
-    fill: $gray-darkest;
-  }
 }
 
 .ci-status-icon-manual {
   color: $gl-text-color;
-
-  svg {
-    fill: $gl-text-color;
-  }
 }
 
 .icon-link {
diff --git a/app/assets/stylesheets/framework/images.scss b/app/assets/stylesheets/framework/images.scss
index 6819fd88b7f..78a8e57ddbb 100644
--- a/app/assets/stylesheets/framework/images.scss
+++ b/app/assets/stylesheets/framework/images.scss
@@ -27,6 +27,8 @@
 }
 
 svg {
+  fill: currentColor;
+
   &.s8 { @include svg-size(8px); }
   &.s12 { @include svg-size(12px); }
   &.s16 { @include svg-size(16px); }
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 33012133b66..e12b5aab381 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -130,14 +130,6 @@
     background-color: $color-light;
     color: $color-dark;
     border-color: $color-dark;
-
-    svg {
-      fill: $color-dark;
-    }
-  }
-
-  svg {
-    fill: $color-main;
   }
 }
 
diff --git a/app/assets/stylesheets/framework/zen.scss b/app/assets/stylesheets/framework/zen.scss
index 5a4d3ba0ee9..dbd3144b9b4 100644
--- a/app/assets/stylesheets/framework/zen.scss
+++ b/app/assets/stylesheets/framework/zen.scss
@@ -57,15 +57,7 @@
   padding: 5px;
   font-size: 36px;
 
-  svg {
-    fill: $gl-text-color;
-  }
-
   &:hover {
     color: $black;
-
-    svg {
-      fill: $black;
-    }
   }
 }
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 9537eeeee97..2461b818219 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -547,10 +547,6 @@ ul.notes {
     width: 16px;
     top: 0;
     vertical-align: text-top;
-
-    path {
-      fill: currentColor;
-    }
   }
 
   .award-control-icon-positive,
@@ -570,10 +566,6 @@ ul.notes {
     .link-highlight {
       color: $gl-link-color;
       fill: $gl-link-color;
-
-      svg {
-        fill: $gl-link-color;
-      }
     }
 
     .award-control-icon-neutral {
diff --git a/app/assets/stylesheets/pages/status.scss b/app/assets/stylesheets/pages/status.scss
index 25c80e1f950..ade5ddd147b 100644
--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
@@ -55,10 +55,6 @@
     &:not(span):hover {
       background-color: rgba($gl-text-color-secondary, .07);
     }
-
-    svg {
-      fill: $gl-text-color-secondary;
-    }
   }
 }
 
-- 
cgit v1.2.1


From e6ee3d17b3ed0bbd0502028becacba2d6b049c89 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Tue, 21 Nov 2017 15:46:09 -0800
Subject: Update CHANGELOG.md for 10.2.0

[ci skip]
---
 CHANGELOG.md                                       | 187 +++++++++++++++++++++
 changelogs/unreleased/.yml                         |   5 -
 changelogs/unreleased/1312-time-spent-at.yml       |   5 -
 .../unreleased/14970-suggest-rename-remote.yml     |   5 -
 ...4-error-issue-assigned-with-issues-disabled.yml |   6 -
 changelogs/unreleased/23000-pages-api.yml          |   5 -
 .../unreleased/23206-load-participants-async.yml   |   5 -
 .../26763-grant-registry-auth-scope-to-admins.yml  |   5 -
 .../27375-dashboard-activity-performance.yml       |   5 -
 changelogs/unreleased/27654-retry-button.yml       |   5 -
 .../28202_decrease_abc_threshold_step5.yml         |   5 -
 .../30140-restore-readme-only-preference.yml       |   5 -
 ...crease_perceived_complexity_threshold_step3.yml |   5 -
 ...31454-missing-project-id-pipeline-hook-data.yml |   5 -
 changelogs/unreleased/32318-filter-icon.yml        |   5 -
 .../unreleased/3274-geo-route-whitelisting.yml     |   5 -
 .../34284-add-changes-to-issuable-webhook-data.yml |   5 -
 .../34768-fix-issuable-header-wrapping.yml         |   5 -
 changelogs/unreleased/34841-todos.yml              |   5 -
 .../unreleased/34897-delete-branch-after-merge.yml |   5 -
 .../35199-case-insensitive-branches-search.yml     |   5 -
 ...ve-http-status-into-have-gitlab-http-status.yml |   5 -
 .../35652-prometheus-service-page-shows-error.yml  |   5 -
 .../35914-merge-request-update-worker-is-slow.yml  |   5 -
 .../unreleased/3615-improve-welcome-screen.yml     |   5 -
 changelogs/unreleased/36160-zindex.yml             |   5 -
 ...36629-35958-add-cluster-application-section.yml |   6 -
 .../unreleased/3674-hashed-storage-attachments.yml |   5 -
 ...032-get-project-branch-invalid-name-message.yml |   5 -
 ...hes-is-calling-gitaly-n-1-times-per-request.yml |   5 -
 ...73-expose-project-visibility-as-ci-variable.yml |   5 -
 ...replace-wikipage-createservice-with-factory.yml |   5 -
 ...ge_request_diff_id-column-to-merge_requests.yml |   5 -
 .../unreleased/37660-match-sidebar-colors.yml      |   5 -
 .../unreleased/37824-many-branches-lock-server.yml |   6 -
 ...78-extra-border-radius-while-editing-a-file.yml |   6 -
 .../unreleased/38178-fl-mr-notes-components.yml    |   6 -
 ...ild-failed-todo-if-it-has-been-auto-retried.yml |   5 -
 .../38247-hide-create-mr-button-in-issue-show.yml  |   5 -
 changelogs/unreleased/38394-smarter-interval.yml   |   5 -
 changelogs/unreleased/38395-mr-widget-ci.yml       |   6 -
 .../38589-internationalize-tags-page.yml           |   5 -
 .../38677-render-new-discussions-on-diff-tab.yml   |   5 -
 changelogs/unreleased/38720-sort-admin-runners.yml |   5 -
 ...leanup-data-page-attribute-after-karma-test.yml |   5 -
 changelogs/unreleased/38986-due-date.yml           |   5 -
 ...in-the-user_profile-and-graphs_show-bundles.yml |   6 -
 ...39035-move-gitlab-export-to-top-import-list.yml |   5 -
 .../unreleased/39109-reenable-scroll-job.yml       |   5 -
 .../39297-remove-help-text-group-lists.yml         |   5 -
 ...-todos-spelled-correctly-on-todos-list-page.yml |   5 -
 .../39419-remove-overzealous-tooltips.yml          |   5 -
 .../39509-fix-wiki-create-sidebar-overlap.yml      |   5 -
 ...ppears-enabled-even-though-it-won-t-show-up.yml |   5 -
 .../unreleased/39573-hashed-storage-backup.yml     |   5 -
 .../unreleased/39580-bump-carrierwave-to-1-2-1.yml |   5 -
 changelogs/unreleased/39582-nestingdepth-6.yml     |   5 -
 .../unreleased/39583-reopen-issue-count-cache.yml  |   5 -
 ...only-the-first-recipient-when-using-aws-ses.yml |   5 -
 ...e-when-pipeline-succeeds-from-the-api-fails.yml |   5 -
 ...hange-default-size-for-gke-cluster-creation.yml |   5 -
 changelogs/unreleased/39668-tooltip-safari.yml     |   5 -
 .../unreleased/39757-border-zero-of-scss-lint.yml  |   5 -
 ...39776-remove-responsive-table-bottom-border.yml |   5 -
 ...st-notification-has-no-context-to-the-issue.yml |   5 -
 .../39878-commit-pipeline-reads-wrong-key.yml      |   5 -
 .../unreleased/40068-runner-sorting-regression.yml |   5 -
 .../unreleased/40198-fix-gpg-badge-links.yml       |   6 -
 .../add-changes-count-to-merge-requests-api.yml    |   5 -
 .../add-ingress-to-cluster-applications.yml        |   5 -
 ...-lazy-option-to-user-avatar-image-component.yml |   5 -
 .../unreleased/add-packagist-project-service.yml   |   5 -
 .../unreleased/add-shared-vue-loading-button.yml   |   5 -
 ...use-branch-exists-over-branch-names-include.yml |   5 -
 changelogs/unreleased/api-configure-jira.yml       |   5 -
 changelogs/unreleased/api-doc-group-statistics.yml |   5 -
 .../backport-workhorse-show-all-refs.yml           |   5 -
 .../unreleased/bugfix_banzai_closed_milestones.yml |   5 -
 .../unreleased/bvl-fix-count-with-selects.yml      |   6 -
 changelogs/unreleased/bvl-fix-group-atom-feed.yml  |   5 -
 changelogs/unreleased/bvl-free-paths.yml           |   5 -
 changelogs/unreleased/bvl-group-trees.yml          |   5 -
 .../bvl-refresh-member-listing-on-removal.yml      |   5 -
 changelogs/unreleased/cache-user-keys-count.yml    |   5 -
 changelogs/unreleased/ci-pipeline-status-query.yml |   5 -
 changelogs/unreleased/dm-add-sudo-scope.yml        |   6 -
 .../unreleased/dm-avatarable-with-asset-host.yml   |   6 -
 .../unreleased/dm-convert-private-tokens.yml       |   5 -
 .../dm-notes-actions-noteable-for-update.yml       |   5 -
 changelogs/unreleased/dm-notes-for-commit-id.yml   |   6 -
 .../dm-reallow-project-path-ending-in-period.yml   |   5 -
 .../dm-remove-private-token-from-interface.yml     |   5 -
 changelogs/unreleased/dm-remove-private-token.yml  |   5 -
 .../enable-scss-lint-mergeable-selector.yml        |   4 -
 .../unreleased/es-module-broadcast_message.yml     |   5 -
 changelogs/unreleased/expose-job-duration.yml      |   5 -
 .../unreleased/feature-change-signout-route.yml    |   5 -
 ...re-custom-attributes-on-projects-and-groups.yml |   5 -
 .../feature-hashed-storage-repo-import.yml         |   5 -
 ...feature-plantuml-restructured-text-captions.yml |   5 -
 .../feature-reliable-rspec-with-eval-script.yml    |   5 -
 .../unreleased/feature-ssh_host_fingerprint.yml    |   5 -
 changelogs/unreleased/feature_change_sort_refs.yml |   5 -
 .../unreleased/fix-500-on-old-merge-requests.yml   |   5 -
 .../fix-502-mrs-with-lots-of-versions.yml          |   6 -
 ...ix-gb-update-registry-path-reference-regexp.yml |   5 -
 .../unreleased/fix-issues-api-list-performance.yml |   5 -
 .../fix-md-form-tabs-double-click-toggle.yml       |   6 -
 .../fix-project-select-js-without-button.yml       |   5 -
 .../unreleased/fix-subgroup-autocomplete.yml       |   5 -
 changelogs/unreleased/fix-system-hook-docs.yml     |   5 -
 .../unreleased/fix-user-tab-activity-mobile.yml    |   5 -
 changelogs/unreleased/go-get-ssh.yml               |   5 -
 .../unreleased/hide-pipeline-zero-duration.yml     |   5 -
 changelogs/unreleased/issue-36484.yml              |   5 -
 changelogs/unreleased/issue_38777.yml              |   5 -
 .../jej-fs-prevent-push-when-missing-objects.yml   |   5 -
 .../jivl-mobile-friendly-table-runners.yml         |   5 -
 .../move_markdown_preview_to_concern.yml           |   5 -
 .../unreleased/multi-file-editor-submodules.yml    |   5 -
 .../multiple-query-prometheus-graphs.yml           |   6 -
 changelogs/unreleased/new-mr-repo-editor.yml       |   5 -
 changelogs/unreleased/not-found-in-commits.yml     |   5 -
 .../pawel-metrics-to-prometheus-33643.yml          |   5 -
 ..._when_prometheus_metrics_are_disabled-35639.yml |   5 -
 .../unreleased/ph-multi-file-upload-file.yml       |   5 -
 .../unreleased/refactor-group_links_controller.yml |   5 -
 .../remove-ensure-ref-fetched-from-controllers.yml |   5 -
 .../replace_explore_projects-feature.yml           |   5 -
 .../sh-disable-unicorn-sampling-sidekiq.yml        |   5 -
 ...sh-fix-broken-redirection-relative-url-root.yml |   5 -
 changelogs/unreleased/sh-memoize-logger.yml        |   5 -
 .../sh-port-hashed-storage-transfer-fix.yml        |   5 -
 changelogs/unreleased/sha-handling.yml             |   5 -
 .../tc-delete-merged-protected-tags-fix.yml        |   5 -
 changelogs/unreleased/tc-saml-fix-false-empty.yml  |   5 -
 changelogs/unreleased/tree_item_limit.yml          |   5 -
 changelogs/unreleased/update-fe-i18n-guide.yml     |   5 -
 changelogs/unreleased/use-git-branch-merged.yml    |   5 -
 changelogs/unreleased/use-title.yml                |   5 -
 .../winh-admin-projects-namespace-filter.yml       |   5 -
 .../unreleased/winh-i18n-contributors-page.yml     |   5 -
 .../unreleased/winh-namespace-rename-hooks.yml     |   5 -
 .../zj-add-performance-changelog-cat.yml           |   5 -
 changelogs/unreleased/zj-commit-cache.yml          |   5 -
 changelogs/unreleased/zj-peek-gitaly.yml           |   5 -
 changelogs/unreleased/zj-ruby-2-3-5.yml            |   5 -
 147 files changed, 187 insertions(+), 744 deletions(-)
 delete mode 100644 changelogs/unreleased/.yml
 delete mode 100644 changelogs/unreleased/1312-time-spent-at.yml
 delete mode 100644 changelogs/unreleased/14970-suggest-rename-remote.yml
 delete mode 100644 changelogs/unreleased/20666-404-error-issue-assigned-with-issues-disabled.yml
 delete mode 100644 changelogs/unreleased/23000-pages-api.yml
 delete mode 100644 changelogs/unreleased/23206-load-participants-async.yml
 delete mode 100644 changelogs/unreleased/26763-grant-registry-auth-scope-to-admins.yml
 delete mode 100644 changelogs/unreleased/27375-dashboard-activity-performance.yml
 delete mode 100644 changelogs/unreleased/27654-retry-button.yml
 delete mode 100644 changelogs/unreleased/28202_decrease_abc_threshold_step5.yml
 delete mode 100644 changelogs/unreleased/30140-restore-readme-only-preference.yml
 delete mode 100644 changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml
 delete mode 100644 changelogs/unreleased/31454-missing-project-id-pipeline-hook-data.yml
 delete mode 100644 changelogs/unreleased/32318-filter-icon.yml
 delete mode 100644 changelogs/unreleased/3274-geo-route-whitelisting.yml
 delete mode 100644 changelogs/unreleased/34284-add-changes-to-issuable-webhook-data.yml
 delete mode 100644 changelogs/unreleased/34768-fix-issuable-header-wrapping.yml
 delete mode 100644 changelogs/unreleased/34841-todos.yml
 delete mode 100644 changelogs/unreleased/34897-delete-branch-after-merge.yml
 delete mode 100644 changelogs/unreleased/35199-case-insensitive-branches-search.yml
 delete mode 100644 changelogs/unreleased/35644-refactor-have-http-status-into-have-gitlab-http-status.yml
 delete mode 100644 changelogs/unreleased/35652-prometheus-service-page-shows-error.yml
 delete mode 100644 changelogs/unreleased/35914-merge-request-update-worker-is-slow.yml
 delete mode 100644 changelogs/unreleased/3615-improve-welcome-screen.yml
 delete mode 100644 changelogs/unreleased/36160-zindex.yml
 delete mode 100644 changelogs/unreleased/36629-35958-add-cluster-application-section.yml
 delete mode 100644 changelogs/unreleased/3674-hashed-storage-attachments.yml
 delete mode 100644 changelogs/unreleased/37032-get-project-branch-invalid-name-message.yml
 delete mode 100644 changelogs/unreleased/37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request.yml
 delete mode 100644 changelogs/unreleased/37473-expose-project-visibility-as-ci-variable.yml
 delete mode 100644 changelogs/unreleased/37571-replace-wikipage-createservice-with-factory.yml
 delete mode 100644 changelogs/unreleased/37631-add-a-merge_request_diff_id-column-to-merge_requests.yml
 delete mode 100644 changelogs/unreleased/37660-match-sidebar-colors.yml
 delete mode 100644 changelogs/unreleased/37824-many-branches-lock-server.yml
 delete mode 100644 changelogs/unreleased/37978-extra-border-radius-while-editing-a-file.yml
 delete mode 100644 changelogs/unreleased/38178-fl-mr-notes-components.yml
 delete mode 100644 changelogs/unreleased/38236-remove-build-failed-todo-if-it-has-been-auto-retried.yml
 delete mode 100644 changelogs/unreleased/38247-hide-create-mr-button-in-issue-show.yml
 delete mode 100644 changelogs/unreleased/38394-smarter-interval.yml
 delete mode 100644 changelogs/unreleased/38395-mr-widget-ci.yml
 delete mode 100644 changelogs/unreleased/38589-internationalize-tags-page.yml
 delete mode 100644 changelogs/unreleased/38677-render-new-discussions-on-diff-tab.yml
 delete mode 100644 changelogs/unreleased/38720-sort-admin-runners.yml
 delete mode 100644 changelogs/unreleased/38871-cleanup-data-page-attribute-after-karma-test.yml
 delete mode 100644 changelogs/unreleased/38986-due-date.yml
 delete mode 100644 changelogs/unreleased/39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles.yml
 delete mode 100644 changelogs/unreleased/39035-move-gitlab-export-to-top-import-list.yml
 delete mode 100644 changelogs/unreleased/39109-reenable-scroll-job.yml
 delete mode 100644 changelogs/unreleased/39297-remove-help-text-group-lists.yml
 delete mode 100644 changelogs/unreleased/39417-todos-spelled-correctly-on-todos-list-page.yml
 delete mode 100644 changelogs/unreleased/39419-remove-overzealous-tooltips.yml
 delete mode 100644 changelogs/unreleased/39509-fix-wiki-create-sidebar-overlap.yml
 delete mode 100644 changelogs/unreleased/39570-performance-bar-appears-enabled-even-though-it-won-t-show-up.yml
 delete mode 100644 changelogs/unreleased/39573-hashed-storage-backup.yml
 delete mode 100644 changelogs/unreleased/39580-bump-carrierwave-to-1-2-1.yml
 delete mode 100644 changelogs/unreleased/39582-nestingdepth-6.yml
 delete mode 100644 changelogs/unreleased/39583-reopen-issue-count-cache.yml
 delete mode 100644 changelogs/unreleased/39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-ses.yml
 delete mode 100644 changelogs/unreleased/39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails.yml
 delete mode 100644 changelogs/unreleased/39649-change-default-size-for-gke-cluster-creation.yml
 delete mode 100644 changelogs/unreleased/39668-tooltip-safari.yml
 delete mode 100644 changelogs/unreleased/39757-border-zero-of-scss-lint.yml
 delete mode 100644 changelogs/unreleased/39776-remove-responsive-table-bottom-border.yml
 delete mode 100644 changelogs/unreleased/39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issue.yml
 delete mode 100644 changelogs/unreleased/39878-commit-pipeline-reads-wrong-key.yml
 delete mode 100644 changelogs/unreleased/40068-runner-sorting-regression.yml
 delete mode 100644 changelogs/unreleased/40198-fix-gpg-badge-links.yml
 delete mode 100644 changelogs/unreleased/add-changes-count-to-merge-requests-api.yml
 delete mode 100644 changelogs/unreleased/add-ingress-to-cluster-applications.yml
 delete mode 100644 changelogs/unreleased/add-lazy-option-to-user-avatar-image-component.yml
 delete mode 100644 changelogs/unreleased/add-packagist-project-service.yml
 delete mode 100644 changelogs/unreleased/add-shared-vue-loading-button.yml
 delete mode 100644 changelogs/unreleased/an-use-branch-exists-over-branch-names-include.yml
 delete mode 100644 changelogs/unreleased/api-configure-jira.yml
 delete mode 100644 changelogs/unreleased/api-doc-group-statistics.yml
 delete mode 100644 changelogs/unreleased/backport-workhorse-show-all-refs.yml
 delete mode 100644 changelogs/unreleased/bugfix_banzai_closed_milestones.yml
 delete mode 100644 changelogs/unreleased/bvl-fix-count-with-selects.yml
 delete mode 100644 changelogs/unreleased/bvl-fix-group-atom-feed.yml
 delete mode 100644 changelogs/unreleased/bvl-free-paths.yml
 delete mode 100644 changelogs/unreleased/bvl-group-trees.yml
 delete mode 100644 changelogs/unreleased/bvl-refresh-member-listing-on-removal.yml
 delete mode 100644 changelogs/unreleased/cache-user-keys-count.yml
 delete mode 100644 changelogs/unreleased/ci-pipeline-status-query.yml
 delete mode 100644 changelogs/unreleased/dm-add-sudo-scope.yml
 delete mode 100644 changelogs/unreleased/dm-avatarable-with-asset-host.yml
 delete mode 100644 changelogs/unreleased/dm-convert-private-tokens.yml
 delete mode 100644 changelogs/unreleased/dm-notes-actions-noteable-for-update.yml
 delete mode 100644 changelogs/unreleased/dm-notes-for-commit-id.yml
 delete mode 100644 changelogs/unreleased/dm-reallow-project-path-ending-in-period.yml
 delete mode 100644 changelogs/unreleased/dm-remove-private-token-from-interface.yml
 delete mode 100644 changelogs/unreleased/dm-remove-private-token.yml
 delete mode 100644 changelogs/unreleased/enable-scss-lint-mergeable-selector.yml
 delete mode 100644 changelogs/unreleased/es-module-broadcast_message.yml
 delete mode 100644 changelogs/unreleased/expose-job-duration.yml
 delete mode 100644 changelogs/unreleased/feature-change-signout-route.yml
 delete mode 100644 changelogs/unreleased/feature-custom-attributes-on-projects-and-groups.yml
 delete mode 100644 changelogs/unreleased/feature-hashed-storage-repo-import.yml
 delete mode 100644 changelogs/unreleased/feature-plantuml-restructured-text-captions.yml
 delete mode 100644 changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml
 delete mode 100644 changelogs/unreleased/feature-ssh_host_fingerprint.yml
 delete mode 100644 changelogs/unreleased/feature_change_sort_refs.yml
 delete mode 100644 changelogs/unreleased/fix-500-on-old-merge-requests.yml
 delete mode 100644 changelogs/unreleased/fix-502-mrs-with-lots-of-versions.yml
 delete mode 100644 changelogs/unreleased/fix-gb-update-registry-path-reference-regexp.yml
 delete mode 100644 changelogs/unreleased/fix-issues-api-list-performance.yml
 delete mode 100644 changelogs/unreleased/fix-md-form-tabs-double-click-toggle.yml
 delete mode 100644 changelogs/unreleased/fix-project-select-js-without-button.yml
 delete mode 100644 changelogs/unreleased/fix-subgroup-autocomplete.yml
 delete mode 100644 changelogs/unreleased/fix-system-hook-docs.yml
 delete mode 100644 changelogs/unreleased/fix-user-tab-activity-mobile.yml
 delete mode 100644 changelogs/unreleased/go-get-ssh.yml
 delete mode 100644 changelogs/unreleased/hide-pipeline-zero-duration.yml
 delete mode 100644 changelogs/unreleased/issue-36484.yml
 delete mode 100644 changelogs/unreleased/issue_38777.yml
 delete mode 100644 changelogs/unreleased/jej-fs-prevent-push-when-missing-objects.yml
 delete mode 100644 changelogs/unreleased/jivl-mobile-friendly-table-runners.yml
 delete mode 100644 changelogs/unreleased/move_markdown_preview_to_concern.yml
 delete mode 100644 changelogs/unreleased/multi-file-editor-submodules.yml
 delete mode 100644 changelogs/unreleased/multiple-query-prometheus-graphs.yml
 delete mode 100644 changelogs/unreleased/new-mr-repo-editor.yml
 delete mode 100644 changelogs/unreleased/not-found-in-commits.yml
 delete mode 100644 changelogs/unreleased/pawel-metrics-to-prometheus-33643.yml
 delete mode 100644 changelogs/unreleased/pawel-show_empty_page_when_prometheus_metrics_are_disabled-35639.yml
 delete mode 100644 changelogs/unreleased/ph-multi-file-upload-file.yml
 delete mode 100644 changelogs/unreleased/refactor-group_links_controller.yml
 delete mode 100644 changelogs/unreleased/remove-ensure-ref-fetched-from-controllers.yml
 delete mode 100644 changelogs/unreleased/replace_explore_projects-feature.yml
 delete mode 100644 changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml
 delete mode 100644 changelogs/unreleased/sh-fix-broken-redirection-relative-url-root.yml
 delete mode 100644 changelogs/unreleased/sh-memoize-logger.yml
 delete mode 100644 changelogs/unreleased/sh-port-hashed-storage-transfer-fix.yml
 delete mode 100644 changelogs/unreleased/sha-handling.yml
 delete mode 100644 changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml
 delete mode 100644 changelogs/unreleased/tc-saml-fix-false-empty.yml
 delete mode 100644 changelogs/unreleased/tree_item_limit.yml
 delete mode 100644 changelogs/unreleased/update-fe-i18n-guide.yml
 delete mode 100644 changelogs/unreleased/use-git-branch-merged.yml
 delete mode 100644 changelogs/unreleased/use-title.yml
 delete mode 100644 changelogs/unreleased/winh-admin-projects-namespace-filter.yml
 delete mode 100644 changelogs/unreleased/winh-i18n-contributors-page.yml
 delete mode 100644 changelogs/unreleased/winh-namespace-rename-hooks.yml
 delete mode 100644 changelogs/unreleased/zj-add-performance-changelog-cat.yml
 delete mode 100644 changelogs/unreleased/zj-commit-cache.yml
 delete mode 100644 changelogs/unreleased/zj-peek-gitaly.yml
 delete mode 100644 changelogs/unreleased/zj-ruby-2-3-5.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f85b78cb277..48282f67ed4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,193 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 10.2.0 (2017-11-22)
+
+### Security (4 changes)
+
+- Upgrade Ruby to 2.3.5 to include security patches. !15099
+- Prevent OAuth phishing attack by presenting detailed wording about app to user during authorization.
+- Convert private tokens to Personal Access Tokens with sudo scope.
+- Remove private tokens from web interface and API.
+
+### Removed (5 changes)
+
+- Remove help text from group issues page and group merge requests page. !14963
+- Remove overzealous tooltips in projects page tabs. !15017
+- Stop merge requests from fetching their refs when the data is already available. !15129
+- Remove update merge request worker tagging.
+- Remove Session API now that private tokens are removed from user API endpoints.
+
+### Fixed (75 changes, 18 of them are from the community)
+
+- Fix 404 errors in API caused when the branch name had a dot. !14462 (gvieira37)
+- Remove unnecessary alt-texts from pipeline emails. !14602 (gernberg)
+- Renders 404 in commits controller if no commits are found for a given path. !14610 (Guilherme Vieira)
+- Cleanup data-page attribute after each Karma test. !14742
+- Removed extra border radius from .file-editor and .file-holder when editing a file. !14803 (Rachel Pipkin)
+- Add support for markdown preview to group milestones. !14806 (Vitaliy @blackst0ne Klachkov)
+- Fixed 'Removed source branch' checkbox in merge widget being ignored. !14832
+- Fix unnecessary ajax requests in admin broadcast message form. !14853
+- Make NamespaceSelect change URL when filtering. !14888
+- Get true failure from evalulate_script by checking for element beforehand. !14898
+- Fix SAML error 500 when no groups are defined for user. !14913
+- Fix 500 errors caused by empty diffs in some discussions. !14945 (Alexander Popov)
+- Fix the atom feed for group events. !14974
+- Hides pipeline duration in commit box when it is zero (nil). !14979 (gvieira37)
+- Add new diff discussions on MR diffs tab in "realtime". !14981
+- Returns a ssh url for go-get=1. !14990 (gvieira37)
+- Case insensitive search for branches. !14995 (George Andrinopoulos)
+- Fixes 404 error to 'Issues assigned to me' and 'Issues I've created' when issues are disabled. !15021 (Jacopo Beschi @jacopo-beschi)
+- Update the groups API documentation. !15024 (Robert Schilling)
+- Validate username/pw for Jiraservice, require them in the API. !15025 (Robert Schilling)
+- Update Merge Request polling so there is only one request at a time. !15032
+- Use project select dropdown not only as a combobutton. !15043
+- Remove create MR button from issues when MRs are disabled. !15071 (George Andrinopoulos)
+- Tighten up whitelisting of certain Geo routes. !15082
+- Allow to disable the Performance Bar. !15084
+- Refresh open Issue and Merge Request project counter caches when re-opening. !15085 (Rob Ede @robjtede)
+- Fix markdown form tabs toggling preview mode from double clicking write mode button. !15119
+- Fix cancel button not working while uploading on the new issue page. !15137
+- Fix webhooks recent deliveries. !15146 (Alexander Randa (@randaalex))
+- Fix issues with forked projects of which the source was deleted. !15150
+- Fix GPG signature popup info in Safari and Firefox. !15228
+- Fix GFM reference links for closed milestones. !15234 (Vitaliy @blackst0ne Klachkov)
+- When deleting merged branches, ignore protected tags. !15252
+- Revert a regression on runners sorting (!15134). !15341 (Takuya Noguchi)
+- Don't use JS to delete memberships from projects and groups. !15344
+- Don't try to create fork network memberships for forks with a missing source. !15366
+- Fix gitlab:backup rake for hashed storage based repositories. !15400
+- Fix issue where clicking a GPG verification badge would scroll to the top of the page. !15407
+- Update container repository path reference and allow using double underscore. !15417
+- Fix crash when navigating to second page of the group dashbaord when there are projects and groups on the first page. !15456
+- Fix flash errors showing up on a non configured prometheus integration. !35652
+- Fix timezone bug in Pikaday and upgrade Pikaday version.
+- Fix arguments Import/Export error importing project merge requests.
+- Moves mini graph of pipeline to the end of sentence in MR widget. Cleans HTML and tests.
+- Fix user autocomplete in subgroups.
+- Fixed user profile activity tab being off-screen on mobile.
+- Fix diff parser so it tolerates to diff special markers in the content.
+- Fix a migration that adds merge_requests_ff_only_enabled column to MR table.
+- Don't create build failed todos when the job is automatically retried.
+- Render 404 when polling commit notes without having permissions.
+- Show error message when fast-forward merge is not possible.
+- Prevents position update for image diff notes.
+- Mobile-friendly table on Admin Runners. (Takuya Noguchi)
+- Decreases z-index of select2 to a lower number of our navigation bar.
+- Fix broken Members link when relative URL root paths are used.
+- Avoid regenerating the ref path for the environment.
+- Memoize GitLab logger to reduce open file descriptors.
+- Fix hashed storage with project transfers to another namespace.
+- Fix bad type checking to prevent 0 count badge to be shown.
+- Fix problem with issuable header wrapping when content is too long.
+- Move retry button in job page to sidebar.
+- Formats bytes to human reabale number in registry table.
+- Fix commit pipeline showing wrong status.
+- Include link to issue in reopen message for Slack and Mattermost notifications.
+- Fix double border UI bug on pipelines/environments table and pagination.
+- Remove native title tooltip in pipeline jobs dropdown in Safari.
+- Fix namespacing for MergeWhenPipelineSucceedsService in MR API.
+- Prevent error when authorizing an admin-created OAauth application without a set owner.
+- Always return full avatar URL for private/internal groups/projects when asset host is set.
+- Make sure group and project creation is blocked for new users that are external by default.
+- Make sure NotesActions#noteable returns a Noteable in the update action.
+- Reallow project paths ending in periods.
+- Only set Auto-Submitted header once for emails on push.
+- Fix overlap of right-sidebar and main content when creating a Wiki page.
+- Enables scroll to bottom once user has scrolled back to bottom in job log.
+
+### Changed (21 changes, 7 of them are from the community)
+
+- Added possibility to enter past date in /spend command to log time in the past. !3044 (g3dinua, LockiStrike)
+- Add Prometheus equivalent of all InfluxDB metrics. !13891
+- Show collapsible project lists. !14055
+- Make Prometheus metrics endpoint return empty response when metrics are disabled. !14490
+- Support custom attributes on groups and projects. !14593 (Markus Koller)
+- Avoid fetching all branches for branch existence checks. !14778
+- Update participants and subscriptions button in issuable sidebar to be async. !14836
+- Replace WikiPage::CreateService calls with wiki_page factory in specs. !14850 (Jacopo Beschi @jacopo-beschi)
+- Add lazy option to UserAvatarImage. !14895
+- Add readme only option as project view. !14900
+- Todos spelled correctly on Todos list page. !15015
+- Support uml:: and captions in reStructuredText. !15120 (Markus Koller)
+- Add system hooks user_rename and group_rename. !15123
+- Change tags order in refs dropdown. !15235 (Vitaliy @blackst0ne Klachkov)
+- Change default cluster size to n1-default-2. !39649 (Fabio Busatto)
+- Change 'Sign Out' route from a DELETE to a GET. !39708 (Joe Marty)
+- Change background color of nav sidebar to match other gl sidebars.
+- Update i18n section in FE docs for marking and interpolation.
+- Add a count of changes to the merge requests API.
+- Improve GitLab Import rake task to work with Hashed Storage and Subgroups.
+- 14830 Move GitLab export option to top of import list when creating a new project.
+
+### Performance (14 changes)
+
+- Improve branch listing page performance. !14729
+- Improve DashboardController#activity.json performance. !14985
+- Add a latest_merge_request_diff_id column to merge_requests. !15035
+- Improve performance of the /projects/:id/repository/branches API endpoint. !15215
+- Ensure merge requests with lots of version don't time out when searching for pipelines.
+- Speed up issues list APIs.
+- Remove Filesystem check metrics that use too much CPU to handle requests.
+- Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor.
+- Truncate tree to max 1,000 items and display notice to users.
+- Add Performance improvement as category on the changelog.
+- Cache commits fetched from the repository.
+- Cache the number of user SSH keys.
+- Optimise getting the pipeline status of commits.
+- Improve performance of commits list by fully using DB index when getting commit note counts.
+
+### Added (26 changes, 10 of them are from the community)
+
+- Expose duration in Job entity. !13644 (Mehdi Lahmam (@mehlah))
+- Prevent git push when LFS objects are missing. !13837
+- Automatic configuration settings page. !13850 (Francisco Lopez)
+- Add API endpoints for Pages Domains. !13917 (Travis Miller)
+- Include the changes in issuable webhook payloads. !14308
+- Add Packagist project service. !14493 (Matt Coleman)
+- Add sort runners on admin runners. !14661 (Takuya Noguchi)
+- Repo Editor: Add option to start a new MR directly from comit section. !14665
+- Issue JWT token with registry:catalog:* scope when requested by GitLab admin. !14751 (Vratislav Kalenda)
+- Support show-all-refs for git over HTTP. !14834
+- Add loading button for new UX paradigm. !14883
+- Get Project Branch API shows an helpful error message on invalid refname. !14884 (Jacopo Beschi @jacopo-beschi)
+- Refactor have_http_status into have_gitlab_http_status. !14958 (Jacopo Beschi @jacopo-beschi)
+- Suggest to rename the remote for existing repository instructions. !14970 (helmo42)
+- Adds project_id to pipeline hook data. !15044 (Jacopo Beschi @jacopo-beschi)
+- Hashed Storage support for Attachments. !15068
+- Add metric tagging for sidekiq workers. !15111
+- Expose project visibility as CI variable - CI_PROJECT_VISIBILITY. !15193
+- Allow multiple queries in a single Prometheus graph to support additional environments (Canary, Staging, et al.). !15201
+- Allow promoting project milestones to group milestones.
+- Added submodule support in multi-file editor.
+- Add applications section to GKE clusters page to easily install Helm Tiller, Ingress.
+- Allow files to uploaded in the multi-file editor.
+- Add Ingress to available Cluster applications.
+- Adds typescript support.
+- Add sudo scope for OAuth and Personal Access Tokens to be used by admins to impersonate other users on the API.
+
+### Other (18 changes, 8 of them are from the community)
+
+- Decrease Perceived Complexity threshold to 14. !14231 (Maxim Rydkin)
+- Replace the 'features/explore/projects.feature' spinach test with an rspec analog. !14755 (Vitaliy @blackst0ne Klachkov)
+- While displaying a commit, do not show list of related branches if there are thousands of branches. !14812
+- Removed d3.js from the graph and users bundles and used the common_d3 bundle instead. !14826
+- Make contributors page translatable. !14915
+- Decrease ABC threshold to 54.28. !14920 (Maxim Rydkin)
+- Clarify system_hook triggers in documentation. !14957 (Joe Marty)
+- Free up some reserved group names. !15052
+- Bump carrierwave to 1.2.1. !15072 (Takuya Noguchi)
+- Enable NestingDepth (level 6) on scss-lint. !15073 (Takuya Noguchi)
+- Enable BorderZero rule in scss-lint. !15168 (Takuya Noguchi)
+- Internationalized tags page. !38589
+- Moves placeholders components into shared folder with documentation. Makes them easier to reuse in MR and Snippets comments.
+- Reorganize welcome page for new users.
+- Refactor GroupLinksController. (15121)
+- Remove filter icon from search bar.
+- Use title as placeholder instead of issue title for reusability.
+- Add Gitaly metrics to the performance bar.
+
+
 ## 10.1.4 (2017-11-14)
 
 ### Fixed (4 changes)
diff --git a/changelogs/unreleased/.yml b/changelogs/unreleased/.yml
deleted file mode 100644
index acf0bb80c72..00000000000
--- a/changelogs/unreleased/.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove update merge request worker tagging.
-merge_request:
-author:
-type: removed
diff --git a/changelogs/unreleased/1312-time-spent-at.yml b/changelogs/unreleased/1312-time-spent-at.yml
deleted file mode 100644
index c029497e9ab..00000000000
--- a/changelogs/unreleased/1312-time-spent-at.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added possibility to enter past date in /spend command to log time in the past
-merge_request: 3044
-author: g3dinua, LockiStrike
-type: changed
diff --git a/changelogs/unreleased/14970-suggest-rename-remote.yml b/changelogs/unreleased/14970-suggest-rename-remote.yml
deleted file mode 100644
index 68a77eb446d..00000000000
--- a/changelogs/unreleased/14970-suggest-rename-remote.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Suggest to rename the remote for existing repository instructions
-merge_request: 14970
-author: helmo42
-type: added
diff --git a/changelogs/unreleased/20666-404-error-issue-assigned-with-issues-disabled.yml b/changelogs/unreleased/20666-404-error-issue-assigned-with-issues-disabled.yml
deleted file mode 100644
index 830a275bfd5..00000000000
--- a/changelogs/unreleased/20666-404-error-issue-assigned-with-issues-disabled.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fixes 404 error to 'Issues assigned to me' and 'Issues I've created' when issues
-  are disabled
-merge_request: 15021
-author: Jacopo Beschi @jacopo-beschi
-type: fixed
diff --git a/changelogs/unreleased/23000-pages-api.yml b/changelogs/unreleased/23000-pages-api.yml
deleted file mode 100644
index 9f6fa13dd07..00000000000
--- a/changelogs/unreleased/23000-pages-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add API endpoints for Pages Domains
-merge_request: 13917
-author: Travis Miller
-type: added
diff --git a/changelogs/unreleased/23206-load-participants-async.yml b/changelogs/unreleased/23206-load-participants-async.yml
deleted file mode 100644
index 12ab43fb88f..00000000000
--- a/changelogs/unreleased/23206-load-participants-async.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update participants and subscriptions button in issuable sidebar to be async
-merge_request: 14836
-author:
-type: changed
diff --git a/changelogs/unreleased/26763-grant-registry-auth-scope-to-admins.yml b/changelogs/unreleased/26763-grant-registry-auth-scope-to-admins.yml
deleted file mode 100644
index 8918c42e3fb..00000000000
--- a/changelogs/unreleased/26763-grant-registry-auth-scope-to-admins.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Issue JWT token with registry:catalog:* scope when requested by GitLab admin
-merge_request: 14751
-author: Vratislav Kalenda
-type: added
diff --git a/changelogs/unreleased/27375-dashboard-activity-performance.yml b/changelogs/unreleased/27375-dashboard-activity-performance.yml
deleted file mode 100644
index 87c6197a24d..00000000000
--- a/changelogs/unreleased/27375-dashboard-activity-performance.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve DashboardController#activity.json performance
-merge_request: 14985
-author:
-type: performance
diff --git a/changelogs/unreleased/27654-retry-button.yml b/changelogs/unreleased/27654-retry-button.yml
deleted file mode 100644
index 11f3b5eb779..00000000000
--- a/changelogs/unreleased/27654-retry-button.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Move retry button in job page to sidebar
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml b/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml
deleted file mode 100644
index 1bff4d6930d..00000000000
--- a/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Decrease ABC threshold to 54.28
-merge_request: 14920
-author: Maxim Rydkin
-type: other
diff --git a/changelogs/unreleased/30140-restore-readme-only-preference.yml b/changelogs/unreleased/30140-restore-readme-only-preference.yml
deleted file mode 100644
index 4b4ee4d5be9..00000000000
--- a/changelogs/unreleased/30140-restore-readme-only-preference.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add readme only option as project view
-merge_request: 14900
-author:
-type: changed
diff --git a/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml b/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml
deleted file mode 100644
index 8ecb832041e..00000000000
--- a/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Decrease Perceived Complexity threshold to 14
-merge_request: 14231
-author: Maxim Rydkin
-type: other
diff --git a/changelogs/unreleased/31454-missing-project-id-pipeline-hook-data.yml b/changelogs/unreleased/31454-missing-project-id-pipeline-hook-data.yml
deleted file mode 100644
index daf7ac715bd..00000000000
--- a/changelogs/unreleased/31454-missing-project-id-pipeline-hook-data.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Adds project_id to pipeline hook data
-merge_request: 15044
-author: Jacopo Beschi @jacopo-beschi
-type: added
diff --git a/changelogs/unreleased/32318-filter-icon.yml b/changelogs/unreleased/32318-filter-icon.yml
deleted file mode 100644
index 71e7c2c4dac..00000000000
--- a/changelogs/unreleased/32318-filter-icon.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove filter icon from search bar
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/3274-geo-route-whitelisting.yml b/changelogs/unreleased/3274-geo-route-whitelisting.yml
deleted file mode 100644
index 43a5af80497..00000000000
--- a/changelogs/unreleased/3274-geo-route-whitelisting.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Tighten up whitelisting of certain Geo routes
-merge_request: 15082
-author:
-type: fixed
diff --git a/changelogs/unreleased/34284-add-changes-to-issuable-webhook-data.yml b/changelogs/unreleased/34284-add-changes-to-issuable-webhook-data.yml
deleted file mode 100644
index 816e1f83111..00000000000
--- a/changelogs/unreleased/34284-add-changes-to-issuable-webhook-data.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Include the changes in issuable webhook payloads
-merge_request: 14308
-author:
-type: added
diff --git a/changelogs/unreleased/34768-fix-issuable-header-wrapping.yml b/changelogs/unreleased/34768-fix-issuable-header-wrapping.yml
deleted file mode 100644
index 49195bd4168..00000000000
--- a/changelogs/unreleased/34768-fix-issuable-header-wrapping.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix problem with issuable header wrapping when content is too long
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/34841-todos.yml b/changelogs/unreleased/34841-todos.yml
deleted file mode 100644
index 37180eefbfc..00000000000
--- a/changelogs/unreleased/34841-todos.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix bad type checking to prevent 0 count badge to be shown
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/34897-delete-branch-after-merge.yml b/changelogs/unreleased/34897-delete-branch-after-merge.yml
deleted file mode 100644
index 96631aa95c8..00000000000
--- a/changelogs/unreleased/34897-delete-branch-after-merge.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed 'Removed source branch' checkbox in merge widget being ignored.
-merge_request: 14832
-author:
-type: fixed
diff --git a/changelogs/unreleased/35199-case-insensitive-branches-search.yml b/changelogs/unreleased/35199-case-insensitive-branches-search.yml
deleted file mode 100644
index da2729e9e55..00000000000
--- a/changelogs/unreleased/35199-case-insensitive-branches-search.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Case insensitive search for branches
-merge_request: 14995
-author: George Andrinopoulos
-type: fixed
diff --git a/changelogs/unreleased/35644-refactor-have-http-status-into-have-gitlab-http-status.yml b/changelogs/unreleased/35644-refactor-have-http-status-into-have-gitlab-http-status.yml
deleted file mode 100644
index b03baab4950..00000000000
--- a/changelogs/unreleased/35644-refactor-have-http-status-into-have-gitlab-http-status.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Refactor have_http_status into have_gitlab_http_status
-merge_request: 14958
-author: Jacopo Beschi @jacopo-beschi
-type: added
diff --git a/changelogs/unreleased/35652-prometheus-service-page-shows-error.yml b/changelogs/unreleased/35652-prometheus-service-page-shows-error.yml
deleted file mode 100644
index 7e2a7222162..00000000000
--- a/changelogs/unreleased/35652-prometheus-service-page-shows-error.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix flash errors showing up on a non configured prometheus integration
-merge_request: 35652
-author:
-type: fixed
diff --git a/changelogs/unreleased/35914-merge-request-update-worker-is-slow.yml b/changelogs/unreleased/35914-merge-request-update-worker-is-slow.yml
deleted file mode 100644
index 34bb76195af..00000000000
--- a/changelogs/unreleased/35914-merge-request-update-worker-is-slow.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add metric tagging for sidekiq workers
-merge_request: 15111
-author:
-type: added
diff --git a/changelogs/unreleased/3615-improve-welcome-screen.yml b/changelogs/unreleased/3615-improve-welcome-screen.yml
deleted file mode 100644
index 862efddb162..00000000000
--- a/changelogs/unreleased/3615-improve-welcome-screen.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reorganize welcome page for new users
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/36160-zindex.yml b/changelogs/unreleased/36160-zindex.yml
deleted file mode 100644
index a836744fb41..00000000000
--- a/changelogs/unreleased/36160-zindex.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Decreases z-index of select2 to a lower number of our navigation bar
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/36629-35958-add-cluster-application-section.yml b/changelogs/unreleased/36629-35958-add-cluster-application-section.yml
deleted file mode 100644
index 0afa53e8642..00000000000
--- a/changelogs/unreleased/36629-35958-add-cluster-application-section.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Add applications section to GKE clusters page to easily install Helm Tiller,
-  Ingress
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/3674-hashed-storage-attachments.yml b/changelogs/unreleased/3674-hashed-storage-attachments.yml
deleted file mode 100644
index 41bdb5fa568..00000000000
--- a/changelogs/unreleased/3674-hashed-storage-attachments.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Hashed Storage support for Attachments
-merge_request: 15068
-author:
-type: added
diff --git a/changelogs/unreleased/37032-get-project-branch-invalid-name-message.yml b/changelogs/unreleased/37032-get-project-branch-invalid-name-message.yml
deleted file mode 100644
index 22651967a40..00000000000
--- a/changelogs/unreleased/37032-get-project-branch-invalid-name-message.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Get Project Branch API shows an helpful error message on invalid refname
-merge_request: 14884
-author: Jacopo Beschi @jacopo-beschi
-type: added
diff --git a/changelogs/unreleased/37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request.yml b/changelogs/unreleased/37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request.yml
deleted file mode 100644
index 11a11a289bf..00000000000
--- a/changelogs/unreleased/37442-api-branches-id-repository-branches-is-calling-gitaly-n-1-times-per-request.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve performance of the /projects/:id/repository/branches API endpoint
-merge_request: 15215
-author:
-type: performance
diff --git a/changelogs/unreleased/37473-expose-project-visibility-as-ci-variable.yml b/changelogs/unreleased/37473-expose-project-visibility-as-ci-variable.yml
deleted file mode 100644
index f6906a3b0e0..00000000000
--- a/changelogs/unreleased/37473-expose-project-visibility-as-ci-variable.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Expose project visibility as CI variable - CI_PROJECT_VISIBILITY
-merge_request: 15193
-author:
-type: added
diff --git a/changelogs/unreleased/37571-replace-wikipage-createservice-with-factory.yml b/changelogs/unreleased/37571-replace-wikipage-createservice-with-factory.yml
deleted file mode 100644
index bc93aa1fca4..00000000000
--- a/changelogs/unreleased/37571-replace-wikipage-createservice-with-factory.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Replace WikiPage::CreateService calls with wiki_page factory in specs
-merge_request: 14850
-author: Jacopo Beschi @jacopo-beschi
-type: changed
diff --git a/changelogs/unreleased/37631-add-a-merge_request_diff_id-column-to-merge_requests.yml b/changelogs/unreleased/37631-add-a-merge_request_diff_id-column-to-merge_requests.yml
deleted file mode 100644
index a7127f49c16..00000000000
--- a/changelogs/unreleased/37631-add-a-merge_request_diff_id-column-to-merge_requests.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add a latest_merge_request_diff_id column to merge_requests
-merge_request: 15035
-author:
-type: performance
diff --git a/changelogs/unreleased/37660-match-sidebar-colors.yml b/changelogs/unreleased/37660-match-sidebar-colors.yml
deleted file mode 100644
index d5600f453e7..00000000000
--- a/changelogs/unreleased/37660-match-sidebar-colors.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change background color of nav sidebar to match other gl sidebars
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/37824-many-branches-lock-server.yml b/changelogs/unreleased/37824-many-branches-lock-server.yml
deleted file mode 100644
index f75f79ec4a0..00000000000
--- a/changelogs/unreleased/37824-many-branches-lock-server.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: While displaying a commit, do not show list of related branches if there are
-  thousands of branches
-merge_request: 14812
-author:
-type: other
diff --git a/changelogs/unreleased/37978-extra-border-radius-while-editing-a-file.yml b/changelogs/unreleased/37978-extra-border-radius-while-editing-a-file.yml
deleted file mode 100644
index 554249a3f88..00000000000
--- a/changelogs/unreleased/37978-extra-border-radius-while-editing-a-file.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Removed extra border radius from .file-editor and .file-holder when editing
-  a file
-merge_request: 14803
-author: Rachel Pipkin
-type: fixed
diff --git a/changelogs/unreleased/38178-fl-mr-notes-components.yml b/changelogs/unreleased/38178-fl-mr-notes-components.yml
deleted file mode 100644
index 244ccfb3071..00000000000
--- a/changelogs/unreleased/38178-fl-mr-notes-components.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Moves placeholders components into shared folder with documentation. Makes
-  them easier to reuse in MR and Snippets comments
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/38236-remove-build-failed-todo-if-it-has-been-auto-retried.yml b/changelogs/unreleased/38236-remove-build-failed-todo-if-it-has-been-auto-retried.yml
deleted file mode 100644
index 48b92c02505..00000000000
--- a/changelogs/unreleased/38236-remove-build-failed-todo-if-it-has-been-auto-retried.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Don't create build failed todos when the job is automatically retried
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/38247-hide-create-mr-button-in-issue-show.yml b/changelogs/unreleased/38247-hide-create-mr-button-in-issue-show.yml
deleted file mode 100644
index 57ddd8f8388..00000000000
--- a/changelogs/unreleased/38247-hide-create-mr-button-in-issue-show.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove create MR button from issues when MRs are disabled
-merge_request: 15071
-author: George Andrinopoulos
-type: fixed
diff --git a/changelogs/unreleased/38394-smarter-interval.yml b/changelogs/unreleased/38394-smarter-interval.yml
deleted file mode 100644
index ead8c3eca5a..00000000000
--- a/changelogs/unreleased/38394-smarter-interval.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update Merge Request polling so there is only one request at a time
-merge_request: 15032
-author:
-type: fixed
diff --git a/changelogs/unreleased/38395-mr-widget-ci.yml b/changelogs/unreleased/38395-mr-widget-ci.yml
deleted file mode 100644
index 5109f1bec44..00000000000
--- a/changelogs/unreleased/38395-mr-widget-ci.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Moves mini graph of pipeline to the end of sentence in MR widget. Cleans HTML
-  and tests
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/38589-internationalize-tags-page.yml b/changelogs/unreleased/38589-internationalize-tags-page.yml
deleted file mode 100644
index 4af3da8c23c..00000000000
--- a/changelogs/unreleased/38589-internationalize-tags-page.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Internationalized tags page
-merge_request: 38589
-author:
-type: other
diff --git a/changelogs/unreleased/38677-render-new-discussions-on-diff-tab.yml b/changelogs/unreleased/38677-render-new-discussions-on-diff-tab.yml
deleted file mode 100644
index 9de6e54e3af..00000000000
--- a/changelogs/unreleased/38677-render-new-discussions-on-diff-tab.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add new diff discussions on MR diffs tab in "realtime"
-merge_request: 14981
-author:
-type: fixed
diff --git a/changelogs/unreleased/38720-sort-admin-runners.yml b/changelogs/unreleased/38720-sort-admin-runners.yml
deleted file mode 100644
index b1047644891..00000000000
--- a/changelogs/unreleased/38720-sort-admin-runners.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add sort runners on admin runners
-merge_request: 14661
-author: Takuya Noguchi
-type: added
diff --git a/changelogs/unreleased/38871-cleanup-data-page-attribute-after-karma-test.yml b/changelogs/unreleased/38871-cleanup-data-page-attribute-after-karma-test.yml
deleted file mode 100644
index 5e142a2b4cf..00000000000
--- a/changelogs/unreleased/38871-cleanup-data-page-attribute-after-karma-test.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Cleanup data-page attribute after each Karma test
-merge_request: 14742
-author:
-type: fixed
diff --git a/changelogs/unreleased/38986-due-date.yml b/changelogs/unreleased/38986-due-date.yml
deleted file mode 100644
index 7799b8d297e..00000000000
--- a/changelogs/unreleased/38986-due-date.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix timezone bug in Pikaday and upgrade Pikaday version
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles.yml b/changelogs/unreleased/39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles.yml
deleted file mode 100644
index d142afa3433..00000000000
--- a/changelogs/unreleased/39033-d3-js-is-being-included-in-the-user_profile-and-graphs_show-bundles.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Removed d3.js from the graph and users bundles and used the common_d3 bundle
-  instead
-merge_request: 14826
-author:
-type: other
diff --git a/changelogs/unreleased/39035-move-gitlab-export-to-top-import-list.yml b/changelogs/unreleased/39035-move-gitlab-export-to-top-import-list.yml
deleted file mode 100644
index 4b90d68d80c..00000000000
--- a/changelogs/unreleased/39035-move-gitlab-export-to-top-import-list.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 14830 Move GitLab export option to top of import list when creating a new project
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/39109-reenable-scroll-job.yml b/changelogs/unreleased/39109-reenable-scroll-job.yml
deleted file mode 100644
index a771f8f8941..00000000000
--- a/changelogs/unreleased/39109-reenable-scroll-job.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enables scroll to bottom once user has scrolled back to bottom in job log
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/39297-remove-help-text-group-lists.yml b/changelogs/unreleased/39297-remove-help-text-group-lists.yml
deleted file mode 100644
index 4773d3c5176..00000000000
--- a/changelogs/unreleased/39297-remove-help-text-group-lists.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove help text from group issues page and group merge requests page
-merge_request: 14963
-author:
-type: removed
diff --git a/changelogs/unreleased/39417-todos-spelled-correctly-on-todos-list-page.yml b/changelogs/unreleased/39417-todos-spelled-correctly-on-todos-list-page.yml
deleted file mode 100644
index edf142f0311..00000000000
--- a/changelogs/unreleased/39417-todos-spelled-correctly-on-todos-list-page.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Todos spelled correctly on Todos list page
-merge_request: 15015
-author:
-type: changed
diff --git a/changelogs/unreleased/39419-remove-overzealous-tooltips.yml b/changelogs/unreleased/39419-remove-overzealous-tooltips.yml
deleted file mode 100644
index d6cf60bebfa..00000000000
--- a/changelogs/unreleased/39419-remove-overzealous-tooltips.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove overzealous tooltips in projects page tabs
-merge_request: 15017
-author:
-type: removed
diff --git a/changelogs/unreleased/39509-fix-wiki-create-sidebar-overlap.yml b/changelogs/unreleased/39509-fix-wiki-create-sidebar-overlap.yml
deleted file mode 100644
index aebf6363d97..00000000000
--- a/changelogs/unreleased/39509-fix-wiki-create-sidebar-overlap.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix overlap of right-sidebar and main content when creating a Wiki page
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/39570-performance-bar-appears-enabled-even-though-it-won-t-show-up.yml b/changelogs/unreleased/39570-performance-bar-appears-enabled-even-though-it-won-t-show-up.yml
deleted file mode 100644
index 66939d89d69..00000000000
--- a/changelogs/unreleased/39570-performance-bar-appears-enabled-even-though-it-won-t-show-up.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow to disable the Performance Bar
-merge_request: 15084
-author:
-type: fixed
diff --git a/changelogs/unreleased/39573-hashed-storage-backup.yml b/changelogs/unreleased/39573-hashed-storage-backup.yml
deleted file mode 100644
index 40ee589c8cc..00000000000
--- a/changelogs/unreleased/39573-hashed-storage-backup.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix gitlab:backup rake for hashed storage based repositories
-merge_request: 15400
-author:
-type: fixed
diff --git a/changelogs/unreleased/39580-bump-carrierwave-to-1-2-1.yml b/changelogs/unreleased/39580-bump-carrierwave-to-1-2-1.yml
deleted file mode 100644
index bda85ac24e0..00000000000
--- a/changelogs/unreleased/39580-bump-carrierwave-to-1-2-1.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bump carrierwave to 1.2.1
-merge_request: 15072
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/39582-nestingdepth-6.yml b/changelogs/unreleased/39582-nestingdepth-6.yml
deleted file mode 100644
index efe15f0a5f3..00000000000
--- a/changelogs/unreleased/39582-nestingdepth-6.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enable NestingDepth (level 6) on scss-lint
-merge_request: 15073
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/39583-reopen-issue-count-cache.yml b/changelogs/unreleased/39583-reopen-issue-count-cache.yml
deleted file mode 100644
index ee35bcbcdae..00000000000
--- a/changelogs/unreleased/39583-reopen-issue-count-cache.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Refresh open Issue and Merge Request project counter caches when re-opening.
-merge_request: 15085
-author: Rob Ede @robjtede
-type: fixed
diff --git a/changelogs/unreleased/39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-ses.yml b/changelogs/unreleased/39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-ses.yml
deleted file mode 100644
index 9a7109d054e..00000000000
--- a/changelogs/unreleased/39593-emails-on-push-are-sent-to-only-the-first-recipient-when-using-aws-ses.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Only set Auto-Submitted header once for emails on push
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails.yml b/changelogs/unreleased/39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails.yml
deleted file mode 100644
index 95251b46ecc..00000000000
--- a/changelogs/unreleased/39619-cancel-merge-when-pipeline-succeeds-from-the-api-fails.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix namespacing for MergeWhenPipelineSucceedsService in MR API
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/39649-change-default-size-for-gke-cluster-creation.yml b/changelogs/unreleased/39649-change-default-size-for-gke-cluster-creation.yml
deleted file mode 100644
index 6faa30177ad..00000000000
--- a/changelogs/unreleased/39649-change-default-size-for-gke-cluster-creation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change default cluster size to n1-default-2
-merge_request: 39649
-author: Fabio Busatto
-type: changed
diff --git a/changelogs/unreleased/39668-tooltip-safari.yml b/changelogs/unreleased/39668-tooltip-safari.yml
deleted file mode 100644
index 5a0f677cf10..00000000000
--- a/changelogs/unreleased/39668-tooltip-safari.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove native title tooltip in pipeline jobs dropdown in Safari
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/39757-border-zero-of-scss-lint.yml b/changelogs/unreleased/39757-border-zero-of-scss-lint.yml
deleted file mode 100644
index ef0ac6c7df9..00000000000
--- a/changelogs/unreleased/39757-border-zero-of-scss-lint.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Enable BorderZero rule in scss-lint
-merge_request: 15168
-author: Takuya Noguchi
-type: other
diff --git a/changelogs/unreleased/39776-remove-responsive-table-bottom-border.yml b/changelogs/unreleased/39776-remove-responsive-table-bottom-border.yml
deleted file mode 100644
index 52b6a267ced..00000000000
--- a/changelogs/unreleased/39776-remove-responsive-table-bottom-border.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix double border UI bug on pipelines/environments table and pagination
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issue.yml b/changelogs/unreleased/39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issue.yml
deleted file mode 100644
index 143641c6183..00000000000
--- a/changelogs/unreleased/39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issue.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Include link to issue in reopen message for Slack and Mattermost notifications
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/39878-commit-pipeline-reads-wrong-key.yml b/changelogs/unreleased/39878-commit-pipeline-reads-wrong-key.yml
deleted file mode 100644
index b24edfe0cb9..00000000000
--- a/changelogs/unreleased/39878-commit-pipeline-reads-wrong-key.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix commit pipeline showing wrong status
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/40068-runner-sorting-regression.yml b/changelogs/unreleased/40068-runner-sorting-regression.yml
deleted file mode 100644
index 6a2bd59d6d6..00000000000
--- a/changelogs/unreleased/40068-runner-sorting-regression.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Revert a regression on runners sorting (!15134)
-merge_request: 15341
-author: Takuya Noguchi
-type: fixed
diff --git a/changelogs/unreleased/40198-fix-gpg-badge-links.yml b/changelogs/unreleased/40198-fix-gpg-badge-links.yml
deleted file mode 100644
index 62b962acefa..00000000000
--- a/changelogs/unreleased/40198-fix-gpg-badge-links.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fix issue where clicking a GPG verification badge would scroll to the top of
-  the page
-merge_request: 15407
-author:
-type: fixed
diff --git a/changelogs/unreleased/add-changes-count-to-merge-requests-api.yml b/changelogs/unreleased/add-changes-count-to-merge-requests-api.yml
deleted file mode 100644
index d0a00fafb52..00000000000
--- a/changelogs/unreleased/add-changes-count-to-merge-requests-api.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add a count of changes to the merge requests API
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/add-ingress-to-cluster-applications.yml b/changelogs/unreleased/add-ingress-to-cluster-applications.yml
deleted file mode 100644
index 0064e8672f8..00000000000
--- a/changelogs/unreleased/add-ingress-to-cluster-applications.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Ingress to available Cluster applications
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/add-lazy-option-to-user-avatar-image-component.yml b/changelogs/unreleased/add-lazy-option-to-user-avatar-image-component.yml
deleted file mode 100644
index eef78cd58f9..00000000000
--- a/changelogs/unreleased/add-lazy-option-to-user-avatar-image-component.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add lazy option to UserAvatarImage
-merge_request: 14895
-author:
-type: changed
diff --git a/changelogs/unreleased/add-packagist-project-service.yml b/changelogs/unreleased/add-packagist-project-service.yml
deleted file mode 100644
index a13d00e91f7..00000000000
--- a/changelogs/unreleased/add-packagist-project-service.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Packagist project service
-merge_request: 14493
-author: Matt Coleman
-type: added
diff --git a/changelogs/unreleased/add-shared-vue-loading-button.yml b/changelogs/unreleased/add-shared-vue-loading-button.yml
deleted file mode 100644
index a8904acc4e7..00000000000
--- a/changelogs/unreleased/add-shared-vue-loading-button.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add loading button for new UX paradigm
-merge_request: 14883
-author:
-type: added
diff --git a/changelogs/unreleased/an-use-branch-exists-over-branch-names-include.yml b/changelogs/unreleased/an-use-branch-exists-over-branch-names-include.yml
deleted file mode 100644
index 19d950b48d6..00000000000
--- a/changelogs/unreleased/an-use-branch-exists-over-branch-names-include.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Avoid fetching all branches for branch existence checks
-merge_request: 14778
-author:
-type: changed
diff --git a/changelogs/unreleased/api-configure-jira.yml b/changelogs/unreleased/api-configure-jira.yml
deleted file mode 100644
index 3ac52d573b0..00000000000
--- a/changelogs/unreleased/api-configure-jira.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Validate username/pw for Jiraservice, require them in the API
-merge_request: 15025
-author: Robert Schilling
-type: fixed
diff --git a/changelogs/unreleased/api-doc-group-statistics.yml b/changelogs/unreleased/api-doc-group-statistics.yml
deleted file mode 100644
index 385ff978024..00000000000
--- a/changelogs/unreleased/api-doc-group-statistics.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update the groups API documentation
-merge_request: 15024
-author: Robert Schilling
-type: fixed
diff --git a/changelogs/unreleased/backport-workhorse-show-all-refs.yml b/changelogs/unreleased/backport-workhorse-show-all-refs.yml
deleted file mode 100644
index 36dd2115152..00000000000
--- a/changelogs/unreleased/backport-workhorse-show-all-refs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Support show-all-refs for git over HTTP
-merge_request: 14834
-author:
-type: added
diff --git a/changelogs/unreleased/bugfix_banzai_closed_milestones.yml b/changelogs/unreleased/bugfix_banzai_closed_milestones.yml
deleted file mode 100644
index 4b5c716ddad..00000000000
--- a/changelogs/unreleased/bugfix_banzai_closed_milestones.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix GFM reference links for closed milestones
-merge_request: 15234
-author: Vitaliy @blackst0ne Klachkov
-type: fixed
diff --git a/changelogs/unreleased/bvl-fix-count-with-selects.yml b/changelogs/unreleased/bvl-fix-count-with-selects.yml
deleted file mode 100644
index 46a882de524..00000000000
--- a/changelogs/unreleased/bvl-fix-count-with-selects.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fix crash when navigating to second page of the group dashbaord when there
-  are projects and groups on the first page
-merge_request: 15456
-author:
-type: fixed
diff --git a/changelogs/unreleased/bvl-fix-group-atom-feed.yml b/changelogs/unreleased/bvl-fix-group-atom-feed.yml
deleted file mode 100644
index 48f67db7799..00000000000
--- a/changelogs/unreleased/bvl-fix-group-atom-feed.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix the atom feed for group events
-merge_request: 14974
-author:
-type: fixed
diff --git a/changelogs/unreleased/bvl-free-paths.yml b/changelogs/unreleased/bvl-free-paths.yml
deleted file mode 100644
index f15459cc788..00000000000
--- a/changelogs/unreleased/bvl-free-paths.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Free up some reserved group names
-merge_request: 15052
-author:
-type: other
diff --git a/changelogs/unreleased/bvl-group-trees.yml b/changelogs/unreleased/bvl-group-trees.yml
deleted file mode 100644
index 9f76eb81627..00000000000
--- a/changelogs/unreleased/bvl-group-trees.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Show collapsible project lists
-merge_request: 14055
-author:
-type: changed
diff --git a/changelogs/unreleased/bvl-refresh-member-listing-on-removal.yml b/changelogs/unreleased/bvl-refresh-member-listing-on-removal.yml
deleted file mode 100644
index 48b4051711c..00000000000
--- a/changelogs/unreleased/bvl-refresh-member-listing-on-removal.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Don't use JS to delete memberships from projects and groups
-merge_request: 15344
-author:
-type: fixed
diff --git a/changelogs/unreleased/cache-user-keys-count.yml b/changelogs/unreleased/cache-user-keys-count.yml
deleted file mode 100644
index 181be95622c..00000000000
--- a/changelogs/unreleased/cache-user-keys-count.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Cache the number of user SSH keys
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/ci-pipeline-status-query.yml b/changelogs/unreleased/ci-pipeline-status-query.yml
deleted file mode 100644
index a464e501418..00000000000
--- a/changelogs/unreleased/ci-pipeline-status-query.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Optimise getting the pipeline status of commits
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/dm-add-sudo-scope.yml b/changelogs/unreleased/dm-add-sudo-scope.yml
deleted file mode 100644
index a0c173ce781..00000000000
--- a/changelogs/unreleased/dm-add-sudo-scope.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Add sudo scope for OAuth and Personal Access Tokens to be used by admins to
-  impersonate other users on the API
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/dm-avatarable-with-asset-host.yml b/changelogs/unreleased/dm-avatarable-with-asset-host.yml
deleted file mode 100644
index 6cf8d719afb..00000000000
--- a/changelogs/unreleased/dm-avatarable-with-asset-host.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Always return full avatar URL for private/internal groups/projects when asset
-  host is set
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/dm-convert-private-tokens.yml b/changelogs/unreleased/dm-convert-private-tokens.yml
deleted file mode 100644
index 8f5145c897b..00000000000
--- a/changelogs/unreleased/dm-convert-private-tokens.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Convert private tokens to Personal Access Tokens with sudo scope
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/dm-notes-actions-noteable-for-update.yml b/changelogs/unreleased/dm-notes-actions-noteable-for-update.yml
deleted file mode 100644
index 1d2f58bc765..00000000000
--- a/changelogs/unreleased/dm-notes-actions-noteable-for-update.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make sure NotesActions#noteable returns a Noteable in the update action
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/dm-notes-for-commit-id.yml b/changelogs/unreleased/dm-notes-for-commit-id.yml
deleted file mode 100644
index 5b83332d82f..00000000000
--- a/changelogs/unreleased/dm-notes-for-commit-id.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Improve performance of commits list by fully using DB index when getting commit
-  note counts
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/dm-reallow-project-path-ending-in-period.yml b/changelogs/unreleased/dm-reallow-project-path-ending-in-period.yml
deleted file mode 100644
index ad41d9b84c3..00000000000
--- a/changelogs/unreleased/dm-reallow-project-path-ending-in-period.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reallow project paths ending in periods
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/dm-remove-private-token-from-interface.yml b/changelogs/unreleased/dm-remove-private-token-from-interface.yml
deleted file mode 100644
index 1b8996b08c3..00000000000
--- a/changelogs/unreleased/dm-remove-private-token-from-interface.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove private tokens from web interface and API
-merge_request:
-author:
-type: security
diff --git a/changelogs/unreleased/dm-remove-private-token.yml b/changelogs/unreleased/dm-remove-private-token.yml
deleted file mode 100644
index d721495721a..00000000000
--- a/changelogs/unreleased/dm-remove-private-token.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove Session API now that private tokens are removed from user API endpoints
-merge_request:
-author:
-type: removed
diff --git a/changelogs/unreleased/enable-scss-lint-mergeable-selector.yml b/changelogs/unreleased/enable-scss-lint-mergeable-selector.yml
deleted file mode 100644
index 5f6e0cafe88..00000000000
--- a/changelogs/unreleased/enable-scss-lint-mergeable-selector.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Enable MergeableSelector in scss-lint
-merge_request: 12810
-author: Takuya Noguchi
diff --git a/changelogs/unreleased/es-module-broadcast_message.yml b/changelogs/unreleased/es-module-broadcast_message.yml
deleted file mode 100644
index 031bcc449ae..00000000000
--- a/changelogs/unreleased/es-module-broadcast_message.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix unnecessary ajax requests in admin broadcast message form
-merge_request: 14853
-author:
-type: fixed
diff --git a/changelogs/unreleased/expose-job-duration.yml b/changelogs/unreleased/expose-job-duration.yml
deleted file mode 100644
index 1fe5d897d47..00000000000
--- a/changelogs/unreleased/expose-job-duration.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Expose duration in Job entity
-merge_request: 13644
-author: Mehdi Lahmam (@mehlah)
-type: added
diff --git a/changelogs/unreleased/feature-change-signout-route.yml b/changelogs/unreleased/feature-change-signout-route.yml
deleted file mode 100644
index bccb85b3eaf..00000000000
--- a/changelogs/unreleased/feature-change-signout-route.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change 'Sign Out' route from a DELETE to a GET
-merge_request: 39708
-author: Joe Marty
-type: changed
diff --git a/changelogs/unreleased/feature-custom-attributes-on-projects-and-groups.yml b/changelogs/unreleased/feature-custom-attributes-on-projects-and-groups.yml
deleted file mode 100644
index 9eae989a270..00000000000
--- a/changelogs/unreleased/feature-custom-attributes-on-projects-and-groups.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Support custom attributes on groups and projects
-merge_request: 14593
-author: Markus Koller
-type: changed
diff --git a/changelogs/unreleased/feature-hashed-storage-repo-import.yml b/changelogs/unreleased/feature-hashed-storage-repo-import.yml
deleted file mode 100644
index 73c16a99053..00000000000
--- a/changelogs/unreleased/feature-hashed-storage-repo-import.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve GitLab Import rake task to work with Hashed Storage and Subgroups
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/feature-plantuml-restructured-text-captions.yml b/changelogs/unreleased/feature-plantuml-restructured-text-captions.yml
deleted file mode 100644
index 3d8d0f4fcd1..00000000000
--- a/changelogs/unreleased/feature-plantuml-restructured-text-captions.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Support uml:: and captions in reStructuredText'
-merge_request: 15120
-author: Markus Koller
-type: changed
diff --git a/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml b/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml
deleted file mode 100644
index 1f36d84092a..00000000000
--- a/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Get true failure from evalulate_script by checking for element beforehand
-merge_request: 14898
-author:
-type: fixed
diff --git a/changelogs/unreleased/feature-ssh_host_fingerprint.yml b/changelogs/unreleased/feature-ssh_host_fingerprint.yml
deleted file mode 100644
index 04f9fd1d6ed..00000000000
--- a/changelogs/unreleased/feature-ssh_host_fingerprint.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Automatic configuration settings page
-merge_request: 13850
-author: Francisco Lopez
-type: added
diff --git a/changelogs/unreleased/feature_change_sort_refs.yml b/changelogs/unreleased/feature_change_sort_refs.yml
deleted file mode 100644
index 2dccd87d228..00000000000
--- a/changelogs/unreleased/feature_change_sort_refs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Change tags order in refs dropdown
-merge_request: 15235
-author: Vitaliy @blackst0ne Klachkov
-type: changed
diff --git a/changelogs/unreleased/fix-500-on-old-merge-requests.yml b/changelogs/unreleased/fix-500-on-old-merge-requests.yml
deleted file mode 100644
index 765d7466819..00000000000
--- a/changelogs/unreleased/fix-500-on-old-merge-requests.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix 500 errors caused by empty diffs in some discussions
-merge_request: 14945
-author: Alexander Popov
-type: fixed
diff --git a/changelogs/unreleased/fix-502-mrs-with-lots-of-versions.yml b/changelogs/unreleased/fix-502-mrs-with-lots-of-versions.yml
deleted file mode 100644
index 32cdfba4eec..00000000000
--- a/changelogs/unreleased/fix-502-mrs-with-lots-of-versions.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Ensure merge requests with lots of version don't time out when searching for
-  pipelines
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/fix-gb-update-registry-path-reference-regexp.yml b/changelogs/unreleased/fix-gb-update-registry-path-reference-regexp.yml
deleted file mode 100644
index 55c1089ade5..00000000000
--- a/changelogs/unreleased/fix-gb-update-registry-path-reference-regexp.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update container repository path reference and allow using double underscore
-merge_request: 15417
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-issues-api-list-performance.yml b/changelogs/unreleased/fix-issues-api-list-performance.yml
deleted file mode 100644
index 9c180f4d55e..00000000000
--- a/changelogs/unreleased/fix-issues-api-list-performance.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Speed up issues list APIs
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/fix-md-form-tabs-double-click-toggle.yml b/changelogs/unreleased/fix-md-form-tabs-double-click-toggle.yml
deleted file mode 100644
index 0ec9bcbcde2..00000000000
--- a/changelogs/unreleased/fix-md-form-tabs-double-click-toggle.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Fix markdown form tabs toggling preview mode from double clicking write mode
-  button
-merge_request: 15119
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-project-select-js-without-button.yml b/changelogs/unreleased/fix-project-select-js-without-button.yml
deleted file mode 100644
index 389ca2394f0..00000000000
--- a/changelogs/unreleased/fix-project-select-js-without-button.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use project select dropdown not only as a combobutton
-merge_request: 15043
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-subgroup-autocomplete.yml b/changelogs/unreleased/fix-subgroup-autocomplete.yml
deleted file mode 100644
index 4baa2b02f77..00000000000
--- a/changelogs/unreleased/fix-subgroup-autocomplete.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix user autocomplete in subgroups
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/fix-system-hook-docs.yml b/changelogs/unreleased/fix-system-hook-docs.yml
deleted file mode 100644
index 393c84a2eff..00000000000
--- a/changelogs/unreleased/fix-system-hook-docs.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Clarify system_hook triggers in documentation
-merge_request: 14957
-author: Joe Marty
-type: other
diff --git a/changelogs/unreleased/fix-user-tab-activity-mobile.yml b/changelogs/unreleased/fix-user-tab-activity-mobile.yml
deleted file mode 100644
index a7e4fcb4355..00000000000
--- a/changelogs/unreleased/fix-user-tab-activity-mobile.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fixed user profile activity tab being off-screen on mobile
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/go-get-ssh.yml b/changelogs/unreleased/go-get-ssh.yml
deleted file mode 100644
index e485a94c6db..00000000000
--- a/changelogs/unreleased/go-get-ssh.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Returns a ssh url for go-get=1
-merge_request: 14990
-author: gvieira37
-type: fixed
diff --git a/changelogs/unreleased/hide-pipeline-zero-duration.yml b/changelogs/unreleased/hide-pipeline-zero-duration.yml
deleted file mode 100644
index 5d7a0983537..00000000000
--- a/changelogs/unreleased/hide-pipeline-zero-duration.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Hides pipeline duration in commit box when it is zero (nil)
-merge_request: 14979
-author: gvieira37
-type: fixed
diff --git a/changelogs/unreleased/issue-36484.yml b/changelogs/unreleased/issue-36484.yml
deleted file mode 100644
index a19126e650f..00000000000
--- a/changelogs/unreleased/issue-36484.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Remove unnecessary alt-texts from pipeline emails
-merge_request: 14602
-author: gernberg
-type: fixed
diff --git a/changelogs/unreleased/issue_38777.yml b/changelogs/unreleased/issue_38777.yml
deleted file mode 100644
index 5c49b2f7879..00000000000
--- a/changelogs/unreleased/issue_38777.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow promoting project milestones to group milestones
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/jej-fs-prevent-push-when-missing-objects.yml b/changelogs/unreleased/jej-fs-prevent-push-when-missing-objects.yml
deleted file mode 100644
index 4eeedec2c99..00000000000
--- a/changelogs/unreleased/jej-fs-prevent-push-when-missing-objects.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Prevent git push when LFS objects are missing
-merge_request: 13837
-author:
-type: added
diff --git a/changelogs/unreleased/jivl-mobile-friendly-table-runners.yml b/changelogs/unreleased/jivl-mobile-friendly-table-runners.yml
deleted file mode 100644
index 3448b003ee0..00000000000
--- a/changelogs/unreleased/jivl-mobile-friendly-table-runners.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Mobile-friendly table on Admin Runners
-merge_request:
-author: Takuya Noguchi
-type: fixed
diff --git a/changelogs/unreleased/move_markdown_preview_to_concern.yml b/changelogs/unreleased/move_markdown_preview_to_concern.yml
deleted file mode 100644
index 036e77610b9..00000000000
--- a/changelogs/unreleased/move_markdown_preview_to_concern.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add support for markdown preview to group milestones
-merge_request: 14806
-author: Vitaliy @blackst0ne Klachkov
-type: fixed
diff --git a/changelogs/unreleased/multi-file-editor-submodules.yml b/changelogs/unreleased/multi-file-editor-submodules.yml
deleted file mode 100644
index b83a50957c5..00000000000
--- a/changelogs/unreleased/multi-file-editor-submodules.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Added submodule support in multi-file editor
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/multiple-query-prometheus-graphs.yml b/changelogs/unreleased/multiple-query-prometheus-graphs.yml
deleted file mode 100644
index 9d09166845e..00000000000
--- a/changelogs/unreleased/multiple-query-prometheus-graphs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Allow multiple queries in a single Prometheus graph to support additional environments
-  (Canary, Staging, et al.)
-merge_request: 15201
-author:
-type: added
diff --git a/changelogs/unreleased/new-mr-repo-editor.yml b/changelogs/unreleased/new-mr-repo-editor.yml
deleted file mode 100644
index a6c15ee30a9..00000000000
--- a/changelogs/unreleased/new-mr-repo-editor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 'Repo Editor: Add option to start a new MR directly from comit section'
-merge_request: 14665
-author:
-type: added
diff --git a/changelogs/unreleased/not-found-in-commits.yml b/changelogs/unreleased/not-found-in-commits.yml
deleted file mode 100644
index d5f9ff15a36..00000000000
--- a/changelogs/unreleased/not-found-in-commits.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Renders 404 in commits controller if no commits are found for a given path
-merge_request: 14610
-author: Guilherme Vieira
-type: fixed
diff --git a/changelogs/unreleased/pawel-metrics-to-prometheus-33643.yml b/changelogs/unreleased/pawel-metrics-to-prometheus-33643.yml
deleted file mode 100644
index abab2e55f90..00000000000
--- a/changelogs/unreleased/pawel-metrics-to-prometheus-33643.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Prometheus equivalent of all InfluxDB metrics
-merge_request: 13891
-author:
-type: changed
diff --git a/changelogs/unreleased/pawel-show_empty_page_when_prometheus_metrics_are_disabled-35639.yml b/changelogs/unreleased/pawel-show_empty_page_when_prometheus_metrics_are_disabled-35639.yml
deleted file mode 100644
index 987f7286244..00000000000
--- a/changelogs/unreleased/pawel-show_empty_page_when_prometheus_metrics_are_disabled-35639.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make Prometheus metrics endpoint return empty response when metrics are disabled
-merge_request: 14490
-author:
-type: changed
diff --git a/changelogs/unreleased/ph-multi-file-upload-file.yml b/changelogs/unreleased/ph-multi-file-upload-file.yml
deleted file mode 100644
index a2bd3cfe459..00000000000
--- a/changelogs/unreleased/ph-multi-file-upload-file.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Allow files to uploaded in the multi-file editor
-merge_request:
-author:
-type: added
diff --git a/changelogs/unreleased/refactor-group_links_controller.yml b/changelogs/unreleased/refactor-group_links_controller.yml
deleted file mode 100644
index af3d22c34cb..00000000000
--- a/changelogs/unreleased/refactor-group_links_controller.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Refactor GroupLinksController
-merge_request:
-author: 15121
-type: other
diff --git a/changelogs/unreleased/remove-ensure-ref-fetched-from-controllers.yml b/changelogs/unreleased/remove-ensure-ref-fetched-from-controllers.yml
deleted file mode 100644
index 57f54bec1e6..00000000000
--- a/changelogs/unreleased/remove-ensure-ref-fetched-from-controllers.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Stop merge requests from fetching their refs when the data is already available.
-merge_request: 15129
-author:
-type: removed
diff --git a/changelogs/unreleased/replace_explore_projects-feature.yml b/changelogs/unreleased/replace_explore_projects-feature.yml
deleted file mode 100644
index 85ef045fb4b..00000000000
--- a/changelogs/unreleased/replace_explore_projects-feature.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Replace the 'features/explore/projects.feature' spinach test with an rspec analog
-merge_request: 14755
-author: Vitaliy @blackst0ne Klachkov
-type: other
diff --git a/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml b/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml
deleted file mode 100644
index c4ed017dacd..00000000000
--- a/changelogs/unreleased/sh-disable-unicorn-sampling-sidekiq.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Disable Unicorn sampling in Sidekiq since there are no Unicorn sockets to monitor
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/sh-fix-broken-redirection-relative-url-root.yml b/changelogs/unreleased/sh-fix-broken-redirection-relative-url-root.yml
deleted file mode 100644
index 96e5195d247..00000000000
--- a/changelogs/unreleased/sh-fix-broken-redirection-relative-url-root.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix broken Members link when relative URL root paths are used
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-memoize-logger.yml b/changelogs/unreleased/sh-memoize-logger.yml
deleted file mode 100644
index 1b6567ce72f..00000000000
--- a/changelogs/unreleased/sh-memoize-logger.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Memoize GitLab logger to reduce open file descriptors
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sh-port-hashed-storage-transfer-fix.yml b/changelogs/unreleased/sh-port-hashed-storage-transfer-fix.yml
deleted file mode 100644
index c32afc90f64..00000000000
--- a/changelogs/unreleased/sh-port-hashed-storage-transfer-fix.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix hashed storage with project transfers to another namespace
-merge_request:
-author:
-type: fixed
diff --git a/changelogs/unreleased/sha-handling.yml b/changelogs/unreleased/sha-handling.yml
deleted file mode 100644
index d776edafef5..00000000000
--- a/changelogs/unreleased/sha-handling.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix 404 errors in API caused when the branch name had a dot
-merge_request: 14462
-author: gvieira37
-type: fixed
diff --git a/changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml b/changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml
deleted file mode 100644
index 5d5c39108b0..00000000000
--- a/changelogs/unreleased/tc-delete-merged-protected-tags-fix.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: When deleting merged branches, ignore protected tags
-merge_request: 15252
-author:
-type: fixed
diff --git a/changelogs/unreleased/tc-saml-fix-false-empty.yml b/changelogs/unreleased/tc-saml-fix-false-empty.yml
deleted file mode 100644
index 987f596475b..00000000000
--- a/changelogs/unreleased/tc-saml-fix-false-empty.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Fix SAML error 500 when no groups are defined for user
-merge_request: 14913
-author:
-type: fixed
diff --git a/changelogs/unreleased/tree_item_limit.yml b/changelogs/unreleased/tree_item_limit.yml
deleted file mode 100644
index d95c5776075..00000000000
--- a/changelogs/unreleased/tree_item_limit.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Truncate tree to max 1,000 items and display notice to users
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/update-fe-i18n-guide.yml b/changelogs/unreleased/update-fe-i18n-guide.yml
deleted file mode 100644
index 10bcf7836c6..00000000000
--- a/changelogs/unreleased/update-fe-i18n-guide.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Update i18n section in FE docs for marking and interpolation
-merge_request:
-author:
-type: changed
diff --git a/changelogs/unreleased/use-git-branch-merged.yml b/changelogs/unreleased/use-git-branch-merged.yml
deleted file mode 100644
index 24ec226250c..00000000000
--- a/changelogs/unreleased/use-git-branch-merged.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Improve branch listing page performance
-merge_request: 14729
-author:
-type: performance
diff --git a/changelogs/unreleased/use-title.yml b/changelogs/unreleased/use-title.yml
deleted file mode 100644
index 647e282eb69..00000000000
--- a/changelogs/unreleased/use-title.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Use title as placeholder instead of issue title for reusability
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/winh-admin-projects-namespace-filter.yml b/changelogs/unreleased/winh-admin-projects-namespace-filter.yml
deleted file mode 100644
index 7e906f446b0..00000000000
--- a/changelogs/unreleased/winh-admin-projects-namespace-filter.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make NamespaceSelect change URL when filtering
-merge_request: 14888
-author:
-type: fixed
diff --git a/changelogs/unreleased/winh-i18n-contributors-page.yml b/changelogs/unreleased/winh-i18n-contributors-page.yml
deleted file mode 100644
index 9b2611fc4fa..00000000000
--- a/changelogs/unreleased/winh-i18n-contributors-page.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Make contributors page translatable
-merge_request: 14915
-author:
-type: other
diff --git a/changelogs/unreleased/winh-namespace-rename-hooks.yml b/changelogs/unreleased/winh-namespace-rename-hooks.yml
deleted file mode 100644
index f5090b03b74..00000000000
--- a/changelogs/unreleased/winh-namespace-rename-hooks.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add system hooks user_rename and group_rename
-merge_request: 15123
-author:
-type: changed
diff --git a/changelogs/unreleased/zj-add-performance-changelog-cat.yml b/changelogs/unreleased/zj-add-performance-changelog-cat.yml
deleted file mode 100644
index 3d58044a254..00000000000
--- a/changelogs/unreleased/zj-add-performance-changelog-cat.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Performance improvement as category on the changelog
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/zj-commit-cache.yml b/changelogs/unreleased/zj-commit-cache.yml
deleted file mode 100644
index e3afe0ea7ef..00000000000
--- a/changelogs/unreleased/zj-commit-cache.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Cache commits fetched from the repository
-merge_request:
-author:
-type: performance
diff --git a/changelogs/unreleased/zj-peek-gitaly.yml b/changelogs/unreleased/zj-peek-gitaly.yml
deleted file mode 100644
index bd2f2a07540..00000000000
--- a/changelogs/unreleased/zj-peek-gitaly.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add Gitaly metrics to the performance bar
-merge_request:
-author:
-type: other
diff --git a/changelogs/unreleased/zj-ruby-2-3-5.yml b/changelogs/unreleased/zj-ruby-2-3-5.yml
deleted file mode 100644
index 09ec02417aa..00000000000
--- a/changelogs/unreleased/zj-ruby-2-3-5.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Upgrade Ruby to 2.3.5 to include security patches
-merge_request: 15099
-author:
-type: security
-- 
cgit v1.2.1


From 6369db0196ec7b6e288b16382c95243424a59b62 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Tue, 21 Nov 2017 15:49:50 -0800
Subject: Update VERSION to 10.3.0-pre

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 19eac09041d..73cdb768a24 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.2.0-pre
+10.3.0-pre
-- 
cgit v1.2.1


From 131e74d10dafbf2b781ab5d5517e42a18e20a587 Mon Sep 17 00:00:00 2001
From: "Vitaliy @blackst0ne Klachkov" <blackst0ne.ru@gmail.com>
Date: Wed, 22 Nov 2017 14:12:04 +1100
Subject: Add support of Mermaid

---
 app/assets/javascripts/main.js                     |  1 +
 app/assets/javascripts/render_gfm.js               |  3 +-
 app/assets/javascripts/render_mermaid.js           | 30 +++++++++++++++
 changelogs/unreleased/feature_add_mermaid.yml      |  5 +++
 config/initializers/math_lexer.rb                  |  2 -
 config/initializers/plantuml_lexer.rb              |  2 -
 doc/user/markdown.md                               | 32 +++++++++++++++
 lib/banzai/filter/mermaid_filter.rb                | 20 ++++++++++
 lib/banzai/filter/syntax_highlight_filter.rb       | 35 ++++++++++-------
 lib/banzai/pipeline/gfm_pipeline.rb                |  1 +
 lib/rouge/lexers/math.rb                           |  9 -----
 lib/rouge/lexers/plantuml.rb                       |  9 -----
 package.json                                       |  1 +
 spec/features/markdown_spec.rb                     |  6 +++
 spec/fixtures/markdown.md.erb                      | 34 ++++++++++++++++
 spec/javascripts/notes_spec.js                     |  3 +-
 spec/lib/banzai/filter/mermaid_filter_spec.rb      | 12 ++++++
 .../banzai/filter/syntax_highlight_filter_spec.rb  |  2 +-
 yarn.lock                                          | 45 +++++++++++++++++++++-
 19 files changed, 211 insertions(+), 41 deletions(-)
 create mode 100644 app/assets/javascripts/render_mermaid.js
 create mode 100644 changelogs/unreleased/feature_add_mermaid.yml
 delete mode 100644 config/initializers/math_lexer.rb
 delete mode 100644 config/initializers/plantuml_lexer.rb
 create mode 100644 lib/banzai/filter/mermaid_filter.rb
 delete mode 100644 lib/rouge/lexers/math.rb
 delete mode 100644 lib/rouge/lexers/plantuml.rb
 create mode 100644 spec/lib/banzai/filter/mermaid_filter_spec.rb

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index cef79eec273..3ace25ad3fa 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -75,6 +75,7 @@ import './projects_dropdown';
 import './projects_list';
 import './syntax_highlight';
 import './render_math';
+import './render_mermaid';
 import './render_gfm';
 import './right_sidebar';
 import './search';
diff --git a/app/assets/javascripts/render_gfm.js b/app/assets/javascripts/render_gfm.js
index bcdc0fd67b8..bf6fc0ec305 100644
--- a/app/assets/javascripts/render_gfm.js
+++ b/app/assets/javascripts/render_gfm.js
@@ -2,12 +2,13 @@
 
 // Render Gitlab flavoured Markdown
 //
-// Delegates to syntax highlight and render math
+// Delegates to syntax highlight and render math & mermaid diagrams.
 //
 (function() {
   $.fn.renderGFM = function() {
     this.find('.js-syntax-highlight').syntaxHighlight();
     this.find('.js-render-math').renderMath();
+    this.find('.js-render-mermaid').renderMermaid();
     return this;
   };
 
diff --git a/app/assets/javascripts/render_mermaid.js b/app/assets/javascripts/render_mermaid.js
new file mode 100644
index 00000000000..a253601f8e8
--- /dev/null
+++ b/app/assets/javascripts/render_mermaid.js
@@ -0,0 +1,30 @@
+// Renders diagrams and flowcharts from text using Mermaid in any element with the
+// `js-render-mermaid` class.
+//
+// Example markup:
+//
+// <pre class="js-render-mermaid">
+//  graph TD;
+//    A-- > B;
+//    A-- > C;
+//    B-- > D;
+//    C-- > D;
+// </pre>
+//
+
+import Flash from './flash';
+
+$.fn.renderMermaid = function renderMermaid() {
+  if (this.length === 0) return;
+
+  import(/* webpackChunkName: 'mermaid' */ 'blackst0ne-mermaid').then((mermaid) => {
+    mermaid.initialize({
+      loadOnStart: false,
+      theme: 'neutral',
+    });
+
+    mermaid.init(undefined, this);
+  }).catch((err) => {
+    Flash(`Can't load mermaid module: ${err}`);
+  });
+};
diff --git a/changelogs/unreleased/feature_add_mermaid.yml b/changelogs/unreleased/feature_add_mermaid.yml
new file mode 100644
index 00000000000..caeb5d3470d
--- /dev/null
+++ b/changelogs/unreleased/feature_add_mermaid.yml
@@ -0,0 +1,5 @@
+---
+title: 'Add support of Mermaid (generation of diagrams and flowcharts from text)'
+merge_request: 15107
+author: Vitaliy @blackst0ne Klachkov
+type: added
diff --git a/config/initializers/math_lexer.rb b/config/initializers/math_lexer.rb
deleted file mode 100644
index 8a3388a267e..00000000000
--- a/config/initializers/math_lexer.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# Touch the lexers so it is registered with Rouge
-Rouge::Lexers::Math
diff --git a/config/initializers/plantuml_lexer.rb b/config/initializers/plantuml_lexer.rb
deleted file mode 100644
index e8a77b146fa..00000000000
--- a/config/initializers/plantuml_lexer.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# Touch the lexers so it is registered with Rouge
-Rouge::Lexers::Plantuml
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index 454988b9b80..fb61e360996 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -368,6 +368,37 @@ _Be advised that KaTeX only supports a [subset][katex-subset] of LaTeX._
 >**Note:**
 This also works for the asciidoctor `:stem: latexmath`. For details see the [asciidoctor user manual][asciidoctor-manual].
 
+### Mermaid
+
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#mermaid
+
+It is possible to generate diagrams and flowcharts from text using [Mermaid][mermaid]. 
+
+In order to generate a diagram or flowchart, you should write your text inside the `mermaid` block. 
+
+Example: 
+
+    ```mermaid
+    graph TD;
+      A-->B;
+      A-->C;
+      B-->D;
+      C-->D;
+    ```   
+
+Becomes:
+
+```mermaid
+graph TD;
+  A-->B;
+  A-->C;
+  B-->D;
+  C-->D;
+```   
+
+For details see the [Mermaid official page][mermaid].
+
 ## Standard Markdown
 
 ### Headers
@@ -814,6 +845,7 @@ A link starting with a `/` is relative to the wiki root.
 [^2]: This is my awesome footnote.
 
 [markdown.md]: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md
+[mermaid]: https://mermaidjs.github.io/ "Mermaid website"
 [rouge]: http://rouge.jneen.net/ "Rouge website"
 [redcarpet]: https://github.com/vmg/redcarpet "Redcarpet website"
 [katex]: https://github.com/Khan/KaTeX "KaTeX website"
diff --git a/lib/banzai/filter/mermaid_filter.rb b/lib/banzai/filter/mermaid_filter.rb
new file mode 100644
index 00000000000..b545b947a2c
--- /dev/null
+++ b/lib/banzai/filter/mermaid_filter.rb
@@ -0,0 +1,20 @@
+module Banzai
+  module Filter
+    class MermaidFilter < HTML::Pipeline::Filter
+      def call
+        doc.css('pre[lang="mermaid"]').add_class('mermaid')
+        doc.css('pre[lang="mermaid"]').add_class('js-render-mermaid')
+
+        # The `<code></code>` blocks are added in the lib/banzai/filter/syntax_highlight_filter.rb
+        # We want to keep context and consistency, so we the blocks are added for all filters.
+        # Details: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15107/diffs?diff_id=7962900#note_45495859
+        doc.css('pre[lang="mermaid"]').each do |pre|
+          document = pre.at('code')
+          document.replace(document.content)
+        end
+
+        doc
+      end
+    end
+  end
+end
diff --git a/lib/banzai/filter/syntax_highlight_filter.rb b/lib/banzai/filter/syntax_highlight_filter.rb
index 7da565043d1..a79a0154846 100644
--- a/lib/banzai/filter/syntax_highlight_filter.rb
+++ b/lib/banzai/filter/syntax_highlight_filter.rb
@@ -14,23 +14,26 @@ module Banzai
       end
 
       def highlight_node(node)
-        language = node.attr('lang')
         code = node.text
-        css_classes = "code highlight"
-        lexer = lexer_for(language)
-        lang = lexer.tag
-
-        begin
-          code = Rouge::Formatters::HTMLGitlab.format(lex(lexer, code), tag: lang)
-
-          css_classes << " js-syntax-highlight #{lang}"
-        rescue
-          lang = nil
-          # Gracefully handle syntax highlighter bugs/errors to ensure
-          # users can still access an issue/comment/etc.
+        css_classes = 'code highlight js-syntax-highlight'
+        language = node.attr('lang')
+
+        if use_rouge?(language)
+          lexer = lexer_for(language)
+          language = lexer.tag
+
+          begin
+            code = Rouge::Formatters::HTMLGitlab.format(lex(lexer, code), tag: language)
+            css_classes << " #{language}"
+          rescue
+            # Gracefully handle syntax highlighter bugs/errors to ensure
+            # users can still access an issue/comment/etc.
+
+            language = nil
+          end
         end
 
-        highlighted = %(<pre class="#{css_classes}" lang="#{lang}" v-pre="true"><code>#{code}</code></pre>)
+        highlighted = %(<pre class="#{css_classes}" lang="#{language}" v-pre="true"><code>#{code}</code></pre>)
 
         # Extracted to a method to measure it
         replace_parent_pre_element(node, highlighted)
@@ -51,6 +54,10 @@ module Banzai
         # Replace the parent `pre` element with the entire highlighted block
         node.parent.replace(highlighted)
       end
+
+      def use_rouge?(language)
+        %w(math mermaid plantuml).exclude?(language)
+      end
     end
   end
 end
diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
index 3208abfc538..55874ad50a3 100644
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -14,6 +14,7 @@ module Banzai
           Filter::SyntaxHighlightFilter,
 
           Filter::MathFilter,
+          Filter::MermaidFilter,
           Filter::UploadLinkFilter,
           Filter::VideoLinkFilter,
           Filter::ImageLazyLoadFilter,
diff --git a/lib/rouge/lexers/math.rb b/lib/rouge/lexers/math.rb
deleted file mode 100644
index 939b23a3421..00000000000
--- a/lib/rouge/lexers/math.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Rouge
-  module Lexers
-    class Math < PlainText
-      title "A passthrough lexer used for LaTeX input"
-      desc "PLEASE REFACTOR - this should be handled by SyntaxHighlightFilter"
-      tag 'math'
-    end
-  end
-end
diff --git a/lib/rouge/lexers/plantuml.rb b/lib/rouge/lexers/plantuml.rb
deleted file mode 100644
index 63c461764fc..00000000000
--- a/lib/rouge/lexers/plantuml.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-module Rouge
-  module Lexers
-    class Plantuml < PlainText
-      title "A passthrough lexer used for PlantUML input"
-      desc "PLEASE REFACTOR - this should be handled by SyntaxHighlightFilter"
-      tag 'plantuml'
-    end
-  end
-end
diff --git a/package.json b/package.json
index cbcce40ffb9..591238dff73 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "babel-plugin-transform-define": "^1.2.0",
     "babel-preset-latest": "^6.24.0",
     "babel-preset-stage-2": "^6.22.0",
+    "blackst0ne-mermaid": "^7.1.0-fixed",
     "bootstrap-sass": "^3.3.6",
     "brace-expansion": "^1.1.8",
     "compression-webpack-plugin": "^1.0.0",
diff --git a/spec/features/markdown_spec.rb b/spec/features/markdown_spec.rb
index b70d3060f05..cc1b187ff54 100644
--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -69,6 +69,12 @@ describe 'GitLab Markdown' do
         end
       end
 
+      it 'parses mermaid code block' do
+        aggregate_failures do
+          expect(doc).to have_selector('pre.code.js-render-mermaid')
+        end
+      end
+
       it 'parses strikethroughs' do
         expect(doc).to have_selector(%{del:contains("and this text doesn't")})
       end
diff --git a/spec/fixtures/markdown.md.erb b/spec/fixtures/markdown.md.erb
index 4f46e40ce7a..638cd8b07c8 100644
--- a/spec/fixtures/markdown.md.erb
+++ b/spec/fixtures/markdown.md.erb
@@ -268,3 +268,37 @@ However the wrapping tags can not be mixed as such -
 ### Videos
 
 ![My Video](/assets/videos/gitlab-demo.mp4)
+
+### Mermaid
+
+> If this is not rendered correctly, see
+https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#mermaid
+
+It is possible to generate diagrams and flowcharts from text using [Mermaid][mermaid].
+
+In order to generate a diagram or flowchart, you should write your text inside the `mermaid` block.
+
+Example:
+
+    ```mermaid
+    graph TD;
+      A-->B;
+      A-->C;
+      B-->D;
+      C-->D;
+    ```
+
+Becomes:
+
+```mermaid
+graph TD;
+  A-->B;
+  A-->C;
+  B-->D;
+  C-->D;
+```
+
+For details see the [Mermaid official page][mermaid].
+
+[mermaid]: https://mermaidjs.github.io/ "Mermaid website"
+
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js
index 928a4b461cc..63abac222c4 100644
--- a/spec/javascripts/notes_spec.js
+++ b/spec/javascripts/notes_spec.js
@@ -4,8 +4,9 @@
 import 'autosize';
 import '~/gl_form';
 import '~/lib/utils/text_utility';
-import '~/render_gfm';
 import '~/render_math';
+import '~/render_mermaid';
+import '~/render_gfm';
 import '~/notes';
 
 (function() {
diff --git a/spec/lib/banzai/filter/mermaid_filter_spec.rb b/spec/lib/banzai/filter/mermaid_filter_spec.rb
new file mode 100644
index 00000000000..532d25e121d
--- /dev/null
+++ b/spec/lib/banzai/filter/mermaid_filter_spec.rb
@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Banzai::Filter::MermaidFilter do
+  include FilterSpecHelper
+
+  it 'adds `js-render-mermaid` class to the `pre` tag' do
+    doc = filter("<pre class='code highlight js-syntax-highlight mermaid' lang='mermaid' v-pre='true'><code>graph TD;\n  A--&gt;B;\n</code></pre>")
+    result = doc.xpath('descendant-or-self::pre').first
+
+    expect(result[:class]).to include('js-render-mermaid')
+  end
+end
diff --git a/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb b/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
index 5a23e0e70cc..9f2efa05a01 100644
--- a/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
+++ b/spec/lib/banzai/filter/syntax_highlight_filter_spec.rb
@@ -31,7 +31,7 @@ describe Banzai::Filter::SyntaxHighlightFilter do
 
     it "highlights as plaintext" do
       result = filter('<pre><code lang="ruby">This is a test</code></pre>')
-      expect(result.to_html).to eq('<pre class="code highlight" lang="" v-pre="true"><code>This is a test</code></pre>')
+      expect(result.to_html).to eq('<pre class="code highlight js-syntax-highlight" lang="" v-pre="true"><code>This is a test</code></pre>')
     end
   end
 end
diff --git a/yarn.lock b/yarn.lock
index 1271c8a1ee3..1d6242d800b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -922,6 +922,17 @@ binary-extensions@^1.0.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.10.0.tgz#9aeb9a6c5e88638aad171e167f5900abe24835d0"
 
+blackst0ne-mermaid@^7.1.0-fixed:
+  version "7.1.0-fixed"
+  resolved "https://registry.yarnpkg.com/blackst0ne-mermaid/-/blackst0ne-mermaid-7.1.0-fixed.tgz#3707b3a113d78610e3068e18a588f46b4688de49"
+  dependencies:
+    d3 "3.5.17"
+    dagre-d3-renderer "^0.4.24"
+    dagre-layout "^0.8.0"
+    he "^1.1.1"
+    lodash "^4.17.4"
+    moment "^2.18.1"
+
 blob@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.4.tgz#bcf13052ca54463f30f9fc7e95b9a47630a94921"
@@ -1638,6 +1649,10 @@ custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
 
+d3@3.5.17:
+  version "3.5.17"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8"
+
 d3@^3.5.11:
   version "3.5.11"
   resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.11.tgz#d130750eed0554db70e8432102f920a12407b69c"
@@ -1654,6 +1669,22 @@ d@^0.1.1:
   dependencies:
     es5-ext "~0.10.2"
 
+dagre-d3-renderer@^0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/dagre-d3-renderer/-/dagre-d3-renderer-0.4.24.tgz#b36ce2fe4ea20de43e7698627c6ede2a9f15ec45"
+  dependencies:
+    d3 "3.5.17"
+    dagre-layout "^0.8.0"
+    graphlib "^2.1.1"
+    lodash "^4.17.4"
+
+dagre-layout@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/dagre-layout/-/dagre-layout-0.8.0.tgz#7147b6afb655602f855158dfea171db9aa98d4ff"
+  dependencies:
+    graphlib "^2.1.1"
+    lodash "^4.17.4"
+
 dashdash@^1.12.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
@@ -2852,6 +2883,12 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
 
+graphlib@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.1.tgz#42352c52ba2f4d035cb566eb91f7395f76ebc951"
+  dependencies:
+    lodash "^4.11.1"
+
 gzip-size@3.0.0, gzip-size@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
@@ -2946,7 +2983,7 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
-he@^1.1.0:
+he@^1.1.0, he@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
 
@@ -3942,7 +3979,7 @@ lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
+lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -4156,6 +4193,10 @@ moment@2.x:
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
 
+moment@^2.18.1:
+  version "2.19.2"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.2.tgz#8a7f774c95a64550b4c7ebd496683908f9419dbe"
+
 monaco-editor@0.10.0:
   version "0.10.0"
   resolved "https://registry.yarnpkg.com/monaco-editor/-/monaco-editor-0.10.0.tgz#6604932585fe9c1f993f000a503d0d20fbe5896a"
-- 
cgit v1.2.1


From 52b6cbcb9df7e2c968da3e9a9779500cacfac465 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 20 Nov 2017 09:18:15 -0800
Subject: Add QUERY_RECORDER_DEBUG environment variable to improve performance
 debugging

---
 doc/development/query_recorder.md | 46 +++++++++++++++++++++++++++++++++++++++
 spec/support/query_recorder.rb    |  7 ++++++
 2 files changed, 53 insertions(+)

diff --git a/doc/development/query_recorder.md b/doc/development/query_recorder.md
index e0127aaed4c..12e90101139 100644
--- a/doc/development/query_recorder.md
+++ b/doc/development/query_recorder.md
@@ -22,6 +22,52 @@ As an example you might create 5 issues in between counts, which would cause the
 
 > **Note:** In some cases the query count might change slightly between runs for unrelated reasons. In this case you might need to test `exceed_query_limit(control_count + acceptable_change)`, but this should be avoided if possible.
 
+## Finding the source of the query
+
+It may be useful to identify the source of the queries by looking at the call backtrace.
+To enable this, run the specs with the `QUERY_RECORDER_DEBUG` environment variable set. For example:
+
+```
+QUERY_RECORDER_DEBUG=1 bundle exec rspec spec/requests/api/projects_spec.rb
+```
+
+This will log calls to QueryRecorder into the `test.log`. For example:
+
+```
+QueryRecorder SQL: SELECT COUNT(*) FROM "issues" WHERE "issues"."deleted_at" IS NULL AND "issues"."project_id" = $1 AND ("issues"."state" IN ('opened')) AND "issues"."confidential" = $2
+   --> /home/user/gitlab/gdk/gitlab/spec/support/query_recorder.rb:19:in `callback'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/notifications/fanout.rb:127:in `finish'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/notifications/fanout.rb:46:in `block in finish'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/notifications/fanout.rb:46:in `each'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/notifications/fanout.rb:46:in `finish'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/notifications/instrumenter.rb:36:in `finish'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/notifications/instrumenter.rb:25:in `instrument'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/connection_adapters/abstract_adapter.rb:478:in `log'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/connection_adapters/postgresql_adapter.rb:601:in `exec_cache'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/connection_adapters/postgresql_adapter.rb:585:in `execute_and_clear'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/connection_adapters/postgresql/database_statements.rb:160:in `exec_query'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/connection_adapters/abstract/database_statements.rb:356:in `select'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/connection_adapters/abstract/database_statements.rb:32:in `select_all'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/connection_adapters/abstract/query_cache.rb:68:in `block in select_all'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/connection_adapters/abstract/query_cache.rb:83:in `cache_sql'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/connection_adapters/abstract/query_cache.rb:68:in `select_all'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/relation/calculations.rb:270:in `execute_simple_calculation'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/relation/calculations.rb:227:in `perform_calculation'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/relation/calculations.rb:133:in `calculate'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activerecord-4.2.8/lib/active_record/relation/calculations.rb:48:in `count'
+   --> /home/user/gitlab/gdk/gitlab/app/services/base_count_service.rb:20:in `uncached_count'
+   --> /home/user/gitlab/gdk/gitlab/app/services/base_count_service.rb:12:in `block in count'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/cache.rb:299:in `block in fetch'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/cache.rb:585:in `block in save_block_result_to_cache'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/cache.rb:547:in `block in instrument'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/notifications.rb:166:in `instrument'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/cache.rb:547:in `instrument'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/cache.rb:584:in `save_block_result_to_cache'
+   --> /home/user/.rbenv/versions/2.3.5/lib/ruby/gems/2.3.0/gems/activesupport-4.2.8/lib/active_support/cache.rb:299:in `fetch'
+   --> /home/user/gitlab/gdk/gitlab/app/services/base_count_service.rb:12:in `count'
+   --> /home/user/gitlab/gdk/gitlab/app/models/project.rb:1296:in `open_issues_count'
+```
+
 ## See also
 
 - [Bullet](profiling.md#Bullet) For finding `N+1` query problems
diff --git a/spec/support/query_recorder.rb b/spec/support/query_recorder.rb
index ba0b805caad..cd67b517ea0 100644
--- a/spec/support/query_recorder.rb
+++ b/spec/support/query_recorder.rb
@@ -8,7 +8,14 @@ module ActiveRecord
       ActiveSupport::Notifications.subscribed(method(:callback), 'sql.active_record', &block)
     end
 
+    def show_backtrace(values)
+      Rails.logger.debug("QueryRecorder SQL: #{values[:sql]}")
+      caller.each { |line| Rails.logger.debug("   --> #{line}") }
+    end
+
     def callback(name, start, finish, message_id, values)
+      show_backtrace(values) if ENV['QUERY_RECORDER_DEBUG']
+
       if values[:name]&.include?("CACHE")
         @cached << values[:sql]
       elsif !values[:name]&.include?("SCHEMA")
-- 
cgit v1.2.1


From 58e8c6b34766e03b6b8fd9d913505249db7a164c Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Wed, 22 Nov 2017 02:59:04 -0600
Subject: Fix missing MR widget status icons

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40283

Regressed in
https://gitlab.com/gitlab-org/gitlab-ce/commit/d01d509bd8612f9879fa762de8ea3763bcff81cf
---
 .../vue_merge_request_widget/components/mr_widget_status_icon.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.js
index 4998a47b691..eeb990908f6 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.js
@@ -14,7 +14,7 @@ export default {
     statusObj() {
       return {
         group: this.status,
-        icon: `icon_status_${this.status}`,
+        icon: `status_${this.status}`,
       };
     },
   },
-- 
cgit v1.2.1


From dabd858812c6d342d095c69ef85aeba7af894121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 20 Nov 2017 12:21:56 +0000
Subject: Backport QA code that belongs to CE from EE Geo

Merge branch 'qa/gb/add-geo-integration-tests' into 'master'

See merge request gitlab-org/gitlab-ee!3294
---
 qa/qa.rb                                      | 14 ++++++++++
 qa/qa/page/admin/menu.rb                      |  7 +++--
 qa/qa/page/admin/settings.rb                  | 18 +++++++++++++
 qa/qa/page/base.rb                            | 17 ++++++++++++
 qa/qa/page/dashboard/projects.rb              | 11 ++++++++
 qa/qa/page/main/menu.rb                       |  5 +++-
 qa/qa/page/main/oauth.rb                      | 15 +++++++++++
 qa/qa/page/project/show.rb                    |  4 +++
 qa/qa/scenario/bootable.rb                    |  2 +-
 qa/qa/scenario/gitlab/admin/hashed_storage.rb | 25 +++++++++++++++++
 qa/qa/shell/omnibus.rb                        | 39 +++++++++++++++++++++++++++
 11 files changed, 153 insertions(+), 4 deletions(-)
 create mode 100644 qa/qa/page/admin/settings.rb
 create mode 100644 qa/qa/page/dashboard/projects.rb
 create mode 100644 qa/qa/page/main/oauth.rb
 create mode 100644 qa/qa/scenario/gitlab/admin/hashed_storage.rb
 create mode 100644 qa/qa/shell/omnibus.rb

diff --git a/qa/qa.rb b/qa/qa.rb
index dc1cd9abc6a..06b6a76489b 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -49,6 +49,10 @@ module QA
       module Sandbox
         autoload :Prepare, 'qa/scenario/gitlab/sandbox/prepare'
       end
+
+      module Admin
+        autoload :HashedStorage, 'qa/scenario/gitlab/admin/hashed_storage'
+      end
     end
   end
 
@@ -64,9 +68,11 @@ module QA
       autoload :Entry, 'qa/page/main/entry'
       autoload :Login, 'qa/page/main/login'
       autoload :Menu, 'qa/page/main/menu'
+      autoload :OAuth, 'qa/page/main/oauth'
     end
 
     module Dashboard
+      autoload :Projects, 'qa/page/dashboard/projects'
       autoload :Groups, 'qa/page/dashboard/groups'
     end
 
@@ -82,6 +88,7 @@ module QA
 
     module Admin
       autoload :Menu, 'qa/page/admin/menu'
+      autoload :Settings, 'qa/page/admin/settings'
     end
 
     module Mattermost
@@ -97,6 +104,13 @@ module QA
     autoload :Repository, 'qa/git/repository'
   end
 
+  ##
+  # Classes describing shell interaction with GitLab
+  #
+  module Shell
+    autoload :Omnibus, 'qa/shell/omnibus'
+  end
+
   ##
   # Classes that make it possible to execute features tests.
   #
diff --git a/qa/qa/page/admin/menu.rb b/qa/qa/page/admin/menu.rb
index baa06b1c75e..dd289ffe269 100644
--- a/qa/qa/page/admin/menu.rb
+++ b/qa/qa/page/admin/menu.rb
@@ -3,8 +3,11 @@ module QA
     module Admin
       class Menu < Page::Base
         def go_to_license
-          link = find_link 'License'
-          link.click
+          click_link 'License'
+        end
+
+        def go_to_settings
+          click_link 'Settings'
         end
       end
     end
diff --git a/qa/qa/page/admin/settings.rb b/qa/qa/page/admin/settings.rb
new file mode 100644
index 00000000000..39e2f2062ad
--- /dev/null
+++ b/qa/qa/page/admin/settings.rb
@@ -0,0 +1,18 @@
+module QA
+  module Page
+    module Admin
+      class Settings < Page::Base
+        def enable_hashed_storage
+          scroll_to 'legend', text: 'Repository Storage'
+          check 'Create new projects using hashed storage paths'
+        end
+
+        def save_settings
+          scroll_to '.form-actions' do
+            click_button 'Save'
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/base.rb b/qa/qa/page/base.rb
index bdddfb877c5..f9a93ef051e 100644
--- a/qa/qa/page/base.rb
+++ b/qa/qa/page/base.rb
@@ -1,3 +1,5 @@
+require 'capybara/dsl'
+
 module QA
   module Page
     class Base
@@ -7,6 +9,21 @@ module QA
       def refresh
         visit current_url
       end
+
+      def scroll_to(selector, text: nil)
+        page.execute_script <<~JS
+          var elements = Array.from(document.querySelectorAll('#{selector}'));
+          var text = '#{text}';
+
+          if (text.length > 0) {
+            elements.find(e => e.textContent === text).scrollIntoView();
+          } else {
+            elements[0].scrollIntoView();
+          }
+        JS
+
+        page.within(selector) { yield } if block_given?
+      end
     end
   end
 end
diff --git a/qa/qa/page/dashboard/projects.rb b/qa/qa/page/dashboard/projects.rb
new file mode 100644
index 00000000000..7ed27da6d89
--- /dev/null
+++ b/qa/qa/page/dashboard/projects.rb
@@ -0,0 +1,11 @@
+module QA
+  module Page
+    module Dashboard
+      class Projects < Page::Base
+        def go_to_project(name)
+          find_link(text: name).click
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/main/menu.rb b/qa/qa/page/main/menu.rb
index 178c5ea6930..bc9c4ec1215 100644
--- a/qa/qa/page/main/menu.rb
+++ b/qa/qa/page/main/menu.rb
@@ -7,7 +7,10 @@ module QA
         end
 
         def go_to_projects
-          within_top_menu { click_link 'Projects' }
+          within_top_menu do
+            click_link 'Projects'
+            click_link 'Your projects'
+          end
         end
 
         def go_to_admin_area
diff --git a/qa/qa/page/main/oauth.rb b/qa/qa/page/main/oauth.rb
new file mode 100644
index 00000000000..e746cff0a80
--- /dev/null
+++ b/qa/qa/page/main/oauth.rb
@@ -0,0 +1,15 @@
+module QA
+  module Page
+    module Main
+      class OAuth < Page::Base
+        def needs_authorization?
+          page.current_url.include?('/oauth')
+        end
+
+        def authorize!
+          click_button 'Authorize'
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/page/project/show.rb b/qa/qa/page/project/show.rb
index 68d9597c4d2..3b2bac84f3f 100644
--- a/qa/qa/page/project/show.rb
+++ b/qa/qa/page/project/show.rb
@@ -14,6 +14,10 @@ module QA
           find('#project_clone').value
         end
 
+        def project_name
+          find('.project-title').text
+        end
+
         def wait_for_push
           sleep 5
         end
diff --git a/qa/qa/scenario/bootable.rb b/qa/qa/scenario/bootable.rb
index cf8996cd597..d6de4d404c8 100644
--- a/qa/qa/scenario/bootable.rb
+++ b/qa/qa/scenario/bootable.rb
@@ -28,7 +28,7 @@ module QA
 
         private
 
-        def attribute(name, arg, desc)
+        def attribute(name, arg, desc = '')
           options.push(Option.new(name, arg, desc))
         end
 
diff --git a/qa/qa/scenario/gitlab/admin/hashed_storage.rb b/qa/qa/scenario/gitlab/admin/hashed_storage.rb
new file mode 100644
index 00000000000..ac2cd549829
--- /dev/null
+++ b/qa/qa/scenario/gitlab/admin/hashed_storage.rb
@@ -0,0 +1,25 @@
+module QA
+  module Scenario
+    module Gitlab
+      module Admin
+        class HashedStorage < Scenario::Template
+          def perform(*traits)
+            raise ArgumentError unless traits.include?(:enabled)
+
+            Page::Main::Entry.act { visit_login_page }
+            Page::Main::Login.act { sign_in_using_credentials }
+            Page::Main::Menu.act { go_to_admin_area }
+            Page::Admin::Menu.act { go_to_settings }
+
+            Page::Admin::Settings.act do
+              enable_hashed_storage
+              save_settings
+            end
+
+            QA::Page::Main::Menu.act { sign_out }
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/qa/qa/shell/omnibus.rb b/qa/qa/shell/omnibus.rb
new file mode 100644
index 00000000000..6b3628d3109
--- /dev/null
+++ b/qa/qa/shell/omnibus.rb
@@ -0,0 +1,39 @@
+require 'open3'
+
+module QA
+  module Shell
+    class Omnibus
+      include Scenario::Actable
+
+      def initialize(container)
+        @name = container
+      end
+
+      def gitlab_ctl(command, input: nil)
+        if input.nil?
+          shell "docker exec #{@name} gitlab-ctl #{command}"
+        else
+          shell "docker exec #{@name} bash -c '#{input} | gitlab-ctl #{command}'"
+        end
+      end
+
+      private
+
+      ##
+      # TODO, make it possible to use generic QA framework classes
+      # as a library - gitlab-org/gitlab-qa#94
+      #
+      def shell(command)
+        puts "Executing `#{command}`"
+
+        Open3.popen2e(command) do |_in, out, wait|
+          out.each { |line| puts line }
+
+          if wait.value.exited? && wait.value.exitstatus.nonzero?
+            raise "Docker command `#{command}` failed!"
+          end
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.1


From 571f1dda17203d162dac65270a6b68366de1f101 Mon Sep 17 00:00:00 2001
From: "Jacob Vosmaer (GitLab)" <jacob@gitlab.com>
Date: Wed, 22 Nov 2017 10:19:42 +0000
Subject: Add FetchSourceBranch Gitaly call

---
 GITALY_SERVER_VERSION                          |  2 +-
 lib/gitlab/git/repository.rb                   | 20 +++++++++++++++-----
 lib/gitlab/gitaly_client.rb                    | 12 +++++++++---
 lib/gitlab/gitaly_client/repository_service.rb | 19 +++++++++++++++++++
 lib/tasks/gitlab/gitaly.rake                   |  2 ++
 spec/requests/api/merge_requests_spec.rb       |  2 +-
 spec/requests/api/v3/merge_requests_spec.rb    |  2 +-
 spec/tasks/gitlab/gitaly_rake_spec.rb          |  1 +
 8 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 524456c7767..316ba4bd9e6 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-0.54.0
+0.55.0
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 3cb9b254e6e..dcca20c75ef 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1058,12 +1058,11 @@ module Gitlab
       end
 
       def fetch_source_branch!(source_repository, source_branch, local_ref)
-        with_repo_branch_commit(source_repository, source_branch) do |commit|
-          if commit
-            write_ref(local_ref, commit.sha)
-            true
+        Gitlab::GitalyClient.migrate(:fetch_source_branch) do |is_enabled|
+          if is_enabled
+            gitaly_repository_client.fetch_source_branch(source_repository, source_branch, local_ref)
           else
-            false
+            rugged_fetch_source_branch(source_repository, source_branch, local_ref)
           end
         end
       end
@@ -1216,6 +1215,17 @@ module Gitlab
 
       private
 
+      def rugged_fetch_source_branch(source_repository, source_branch, local_ref)
+        with_repo_branch_commit(source_repository, source_branch) do |commit|
+          if commit
+            write_ref(local_ref, commit.sha)
+            true
+          else
+            false
+          end
+        end
+      end
+
       # Gitaly note: JV: Trying to get rid of the 'filter' option so we can implement this with 'git'.
       def branches_filter(filter: nil, sort_by: nil)
         # n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/37464
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 0b35a787e07..572f4c892f6 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -75,6 +75,10 @@ module Gitlab
       address
     end
 
+    def self.address_metadata(storage)
+      Base64.strict_encode64(JSON.dump({ storage => { 'address' => address(storage), 'token' => token(storage) } }))
+    end
+
     # All Gitaly RPC call sites should use GitalyClient.call. This method
     # makes sure that per-request authentication headers are set.
     #
@@ -89,18 +93,19 @@ module Gitlab
     #   kwargs.merge(deadline: Time.now + 10)
     # end
     #
-    def self.call(storage, service, rpc, request)
+    def self.call(storage, service, rpc, request, remote_storage: nil)
       start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       enforce_gitaly_request_limits(:call)
 
-      kwargs = request_kwargs(storage)
+      kwargs = request_kwargs(storage, remote_storage: remote_storage)
       kwargs = yield(kwargs) if block_given?
+
       stub(service, storage).__send__(rpc, request, kwargs) # rubocop:disable GitlabSecurity/PublicSend
     ensure
       self.query_time += Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
     end
 
-    def self.request_kwargs(storage)
+    def self.request_kwargs(storage, remote_storage: nil)
       encoded_token = Base64.strict_encode64(token(storage).to_s)
       metadata = {
         'authorization' => "Bearer #{encoded_token}",
@@ -110,6 +115,7 @@ module Gitlab
       feature_stack = Thread.current[:gitaly_feature_stack]
       feature = feature_stack && feature_stack[0]
       metadata['call_site'] = feature.to_s if feature
+      metadata['gitaly-servers'] = address_metadata(remote_storage) if remote_storage
 
       { metadata: metadata }
     end
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index cef692d3c2a..70cb16bd810 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -65,6 +65,25 @@ module Gitlab
 
         response.value
       end
+
+      def fetch_source_branch(source_repository, source_branch, local_ref)
+        request = Gitaly::FetchSourceBranchRequest.new(
+          repository: @gitaly_repo,
+          source_repository: source_repository.gitaly_repository,
+          source_branch: source_branch.b,
+          target_ref: local_ref.b
+        )
+
+        response = GitalyClient.call(
+          @storage,
+          :repository_service,
+          :fetch_source_branch,
+          request,
+          remote_storage: source_repository.storage
+        )
+
+        response.result
+      end
     end
   end
 end
diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index f2002d7a426..4d880c05f99 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -78,6 +78,8 @@ namespace :gitlab do
       config[:auth] = { token: 'secret' } if Rails.env.test?
       config[:'gitaly-ruby'] = { dir: File.join(Dir.pwd, 'ruby') } if gitaly_ruby
       config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
+      config[:bin_dir] = Gitlab.config.gitaly.client_path
+
       TOML.dump(config)
     end
 
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index a928ba79a4d..35c6b3bb2fb 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -628,7 +628,7 @@ describe API::MergeRequests do
 
     context 'forked projects' do
       let!(:user2) { create(:user) }
-      let!(:forked_project) { fork_project(project, user2) }
+      let!(:forked_project) { fork_project(project, user2, repository: true) }
       let!(:unrelated_project) { create(:project,  namespace: create(:user).namespace, creator_id: user2.id) }
 
       before do
diff --git a/spec/requests/api/v3/merge_requests_spec.rb b/spec/requests/api/v3/merge_requests_spec.rb
index 91897e5ee01..2e2b9449429 100644
--- a/spec/requests/api/v3/merge_requests_spec.rb
+++ b/spec/requests/api/v3/merge_requests_spec.rb
@@ -314,7 +314,7 @@ describe API::MergeRequests do
 
     context 'forked projects' do
       let!(:user2) { create(:user) }
-      let!(:forked_project) { fork_project(project, user2) }
+      let!(:forked_project) { fork_project(project, user2, repository: true) }
       let!(:unrelated_project) { create(:project,  namespace: create(:user).namespace, creator_id: user2.id) }
 
       before do
diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb
index a51374e2645..6aba86fdc3c 100644
--- a/spec/tasks/gitlab/gitaly_rake_spec.rb
+++ b/spec/tasks/gitlab/gitaly_rake_spec.rb
@@ -112,6 +112,7 @@ describe 'gitlab:gitaly namespace rake task' do
         expected_output = <<~TOML
           # Gitaly storage configuration generated from #{Gitlab.config.source} on #{Time.current.to_s(:long)}
           # This is in TOML format suitable for use in Gitaly's config.toml file.
+          bin_dir = "tmp/tests/gitaly"
           socket_path = "/path/to/my.socket"
           [gitlab-shell]
           dir = "#{Gitlab.config.gitlab_shell.path}"
-- 
cgit v1.2.1


From 05e0c4c1c57077735dd91564750696dc76b1b90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 20 Nov 2017 17:16:45 +0100
Subject: Try to find the merge-base against the canonical master
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also, name the remotes in Gitlab::EeCompatCheck

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .gitlab-ci.yml                |  2 +-
 lib/gitlab/ee_compat_check.rb | 69 ++++++++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4b375696c2..2f149ef9a35 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -419,7 +419,7 @@ ee_compat_check:
   retry: 0
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMIT_REF_NAME}_${CI_COMMIT_SHA}"
-    when: on_failure
+    when: always
     expire_in: 10d
     paths:
       - ee_compat_check/patches/*.patch
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb
index efc2e46d289..3a6165f504c 100644
--- a/lib/gitlab/ee_compat_check.rb
+++ b/lib/gitlab/ee_compat_check.rb
@@ -31,16 +31,22 @@ module Gitlab
 
     def check
       ensure_patches_dir
-      generate_patch(ce_branch, ce_patch_full_path)
+      add_remote('canonical-ce', "#{DEFAULT_CE_PROJECT_URL}.git")
+      generate_patch(branch: ce_branch, patch_path: ce_patch_full_path, remote: 'canonical-ce')
 
       ensure_ee_repo
       Dir.chdir(ee_repo_dir) do
         step("In the #{ee_repo_dir} directory")
 
+        add_remote('canonical-ee', EE_REPO_URL)
+
         status = catch(:halt_check) do
           ce_branch_compat_check!
           delete_ee_branches_locally!
           ee_branch_presence_check!
+
+          step("Checking out #{ee_branch_found}", %W[git checkout -b #{ee_branch_found} canonical-ee/#{ee_branch_found}])
+          generate_patch(branch: ee_branch_found, patch_path: ee_patch_full_path, remote: 'canonical-ee')
           ee_branch_compat_check!
         end
 
@@ -56,6 +62,13 @@ module Gitlab
 
     private
 
+    def add_remote(name, url)
+      step(
+        "Adding the #{name} remote (#{url})",
+        %W[git remote add #{name} #{url}]
+      )
+    end
+
     def ensure_ee_repo
       if Dir.exist?(ee_repo_dir)
         step("#{ee_repo_dir} already exists")
@@ -71,14 +84,14 @@ module Gitlab
       FileUtils.mkdir_p(patches_dir)
     end
 
-    def generate_patch(branch, patch_path)
+    def generate_patch(branch:, patch_path:, remote:)
       FileUtils.rm(patch_path, force: true)
 
-      find_merge_base_with_master(branch: branch)
+      find_merge_base_with_master(branch: branch, master_remote: remote)
 
       step(
-        "Generating the patch against origin/master in #{patch_path}",
-        %w[git diff --binary origin/master...HEAD]
+        "Generating the patch against #{remote}/master in #{patch_path}",
+        %W[git diff --binary #{remote}/master...#{branch}]
       ) do |output, status|
         throw(:halt_check, :ko) unless status.zero?
 
@@ -89,21 +102,21 @@ module Gitlab
     end
 
     def ce_branch_compat_check!
-      if check_patch(ce_patch_full_path).zero?
+      if check_patch(ce_patch_full_path, remote: 'canonical-ce').zero?
         puts applies_cleanly_msg(ce_branch)
         throw(:halt_check)
       end
     end
 
     def ee_branch_presence_check!
-      _, status = step("Fetching origin/#{ee_branch_prefix}", %W[git fetch origin #{ee_branch_prefix}])
+      _, status = step("Fetching origin/#{ee_branch_prefix}", %W[git fetch canonical-ee #{ee_branch_prefix}])
 
       if status.zero?
         @ee_branch_found = ee_branch_prefix
         return
       end
 
-      _, status = step("Fetching origin/#{ee_branch_suffix}", %W[git fetch origin #{ee_branch_suffix}])
+      _, status = step("Fetching origin/#{ee_branch_suffix}", %W[git fetch canonical-ee #{ee_branch_suffix}])
 
       if status.zero?
         @ee_branch_found = ee_branch_suffix
@@ -116,11 +129,7 @@ module Gitlab
     end
 
     def ee_branch_compat_check!
-      step("Checking out origin/#{ee_branch_found}", %W[git checkout -b #{ee_branch_found} FETCH_HEAD])
-
-      generate_patch(ee_branch_found, ee_patch_full_path)
-
-      unless check_patch(ee_patch_full_path).zero?
+      unless check_patch(ee_patch_full_path, remote: 'canonical-ee').zero?
         puts
         puts ee_branch_doesnt_apply_cleanly_msg
 
@@ -131,10 +140,9 @@ module Gitlab
       puts applies_cleanly_msg(ee_branch_found)
     end
 
-    def check_patch(patch_path)
+    def check_patch(patch_path, remote:)
       step("Checking out master", %w[git checkout master])
-      step("Resetting to latest master", %w[git reset --hard origin/master])
-      step("Fetching CE/#{ce_branch}", %W[git fetch #{ce_repo_url} #{ce_branch}])
+      step("Resetting to latest master", %W[git reset --hard #{remote}/master])
       step(
         "Checking if #{patch_path} applies cleanly to EE/master",
         # Don't use --check here because it can result in a 0-exit status even
@@ -171,10 +179,10 @@ module Gitlab
       command(%W[git branch --delete --force #{ee_branch_suffix}])
     end
 
-    def merge_base_found?
+    def merge_base_found?(master_remote:, branch:)
       step(
-        "Finding merge base with master",
-        %w[git merge-base origin/master HEAD]
+        "Finding merge base with #{master_remote}/master",
+        %W[git merge-base #{master_remote}/master #{branch}]
       ) do |output, status|
         if status.zero?
           puts "Merge base was found: #{output}"
@@ -183,7 +191,7 @@ module Gitlab
       end
     end
 
-    def find_merge_base_with_master(branch:)
+    def find_merge_base_with_master(branch:, master_remote:)
       # Start with (Math.exp(3).to_i = 20) until (Math.exp(6).to_i = 403)
       # In total we go (20 + 54 + 148 + 403 = 625) commits deeper
       depth = 20
@@ -192,19 +200,19 @@ module Gitlab
           depth += Math.exp(factor).to_i
           # Repository is initially cloned with a depth of 20 so we need to fetch
           # deeper in the case the branch has more than 20 commits on top of master
-          fetch(branch: branch, depth: depth)
-          fetch(branch: 'master', depth: depth, remote: DEFAULT_CE_PROJECT_URL)
+          fetch(branch: branch, depth: depth, remote: 'origin')
+          fetch(branch: 'master', depth: depth, remote: master_remote)
 
-          merge_base_found?
+          merge_base_found?(master_remote: master_remote, branch: branch)
         end
 
-      raise "\n#{branch} is too far behind master, please rebase it!\n" unless success
+      raise "\n#{branch} is too far behind #{master_remote}/master, please rebase it!\n" unless success
     end
 
     def fetch(branch:, depth:, remote: 'origin')
       step(
         "Fetching deeper...",
-        %W[git fetch --depth=#{depth} --prune #{remote} +refs/heads/#{branch}:refs/remotes/origin/#{branch}]
+        %W[git fetch --depth=#{depth} --prune #{remote} +refs/heads/#{branch}:refs/remotes/#{remote}/#{branch}]
       ) do |output, status|
         raise "Fetch failed: #{output}" unless status.zero?
       end
@@ -304,8 +312,8 @@ module Gitlab
         1. Create a new branch from master and cherry-pick your CE commits
 
           # In the EE repo
-          $ git fetch origin
-          $ git checkout -b #{ee_branch_prefix} origin/master
+          $ git fetch #{EE_REPO_URL} master
+          $ git checkout -b #{ee_branch_prefix} FETCH_HEAD
           $ git fetch #{ce_repo_url} #{ce_branch}
           $ git cherry-pick SHA # Repeat for all the commits you want to pick
 
@@ -314,10 +322,9 @@ module Gitlab
         2. Apply your branch's patch to EE
 
           # In the EE repo
-          $ git fetch origin master
-          $ git checkout -b #{ee_branch_prefix} origin/master
-          $ wget #{patch_url}
-          $ git apply --3way #{ce_patch_name}
+          $ git fetch #{EE_REPO_URL} master
+          $ git checkout -b #{ee_branch_prefix} FETCH_HEAD
+          $ wget #{patch_url} && git apply --3way #{ce_patch_name}
 
           At this point you might have conflicts such as:
 
-- 
cgit v1.2.1


From 1f15e8cf48a6fba4fd6306bbcd8377ab062b2ece Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Tue, 21 Nov 2017 10:56:56 +0000
Subject: Fixed new group milestone breadcrumb

Closes #40338
---
 app/views/groups/milestones/new.html.haml               | 1 -
 changelogs/unreleased/group-new-miletone-breadcrumb.yml | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/group-new-miletone-breadcrumb.yml

diff --git a/app/views/groups/milestones/new.html.haml b/app/views/groups/milestones/new.html.haml
index eca7fb9ddb1..d758e314d41 100644
--- a/app/views/groups/milestones/new.html.haml
+++ b/app/views/groups/milestones/new.html.haml
@@ -1,6 +1,5 @@
 - breadcrumb_title "Milestones"
 - page_title "Milestones"
-- header_title group_title(@group, "Milestones", group_milestones_path(@group))
 
 %h3.page-title
   New Milestone
diff --git a/changelogs/unreleased/group-new-miletone-breadcrumb.yml b/changelogs/unreleased/group-new-miletone-breadcrumb.yml
new file mode 100644
index 00000000000..b82c5b604e8
--- /dev/null
+++ b/changelogs/unreleased/group-new-miletone-breadcrumb.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed new group milestone breadcrumbs
+merge_request:
+author:
+type: fixed
-- 
cgit v1.2.1


From 3fed014c22b4aeed227268bdbaa248c560e3c66e Mon Sep 17 00:00:00 2001
From: Tim Zallmann <tzallmann@gitlab.com>
Date: Wed, 22 Nov 2017 15:46:50 +0100
Subject: Updated axios

---
 package.json |  2 +-
 yarn.lock    | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 16a6e45e820..26445caeb7a 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "autosize": "^4.0.0",
-    "axios": "^0.16.2",
+    "axios": "^0.17.1",
     "axios-mock-adapter": "^1.10.0",
     "babel-core": "^6.22.1",
     "babel-eslint": "^7.2.1",
diff --git a/yarn.lock b/yarn.lock
index 9bdf5e0f64b..97117f3e332 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -270,11 +270,11 @@ axios-mock-adapter@^1.10.0:
   dependencies:
     deep-equal "^1.0.1"
 
-axios@^0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.16.2.tgz#ba4f92f17167dfbab40983785454b9ac149c3c6d"
+axios@^0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.17.1.tgz#2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"
   dependencies:
-    follow-redirects "^1.2.3"
+    follow-redirects "^1.2.5"
     is-buffer "^1.1.5"
 
 babel-code-frame@^6.11.0, babel-code-frame@^6.22.0:
@@ -1723,12 +1723,18 @@ debug@2.6.7:
   dependencies:
     ms "2.0.0"
 
-debug@2.6.8, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.4.5, debug@^2.6.6, debug@^2.6.8:
+debug@2.6.8, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.6.6, debug@^2.6.8:
   version "2.6.8"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
   dependencies:
     ms "2.0.0"
 
+debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+  dependencies:
+    ms "2.0.0"
+
 decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -2614,11 +2620,11 @@ flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
 
-follow-redirects@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.3.tgz#01abaeca85e3609837d9fcda3167a7e42fdaca21"
+follow-redirects@^1.2.5:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.2.6.tgz#4dcdc7e4ab3dd6765a97ff89c3b4c258117c79bf"
   dependencies:
-    debug "^2.4.5"
+    debug "^3.1.0"
 
 for-each@~0.3.2:
   version "0.3.2"
-- 
cgit v1.2.1


From db1925f917b30571e0e9d4de63417db90dc693d7 Mon Sep 17 00:00:00 2001
From: Sean McGivern <sean@gitlab.com>
Date: Wed, 22 Nov 2017 11:12:47 +0000
Subject: Improve output for extra queries in specs

Previously, this used `Array#-`, which would remove all queries that matches the
query text in the original set.

However, sometimes we have a problem with parameterised queries, where the query
text is identical both times, so we'd run a query N times instead of once, and
it would be hidden from the output.

Replace the logic to only remove a given query N times from the actual log,
where N is the number of times it appears in the expected log.
---
 spec/requests/api/merge_requests_spec.rb |  6 +++---
 spec/support/query_recorder.rb           | 11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 35c6b3bb2fb..91616da6d9a 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -172,15 +172,15 @@ describe API::MergeRequests do
 
     context "when authenticated" do
       it 'avoids N+1 queries' do
-        control_count = ActiveRecord::QueryRecorder.new do
+        control = ActiveRecord::QueryRecorder.new do
           get api("/projects/#{project.id}/merge_requests", user)
-        end.count
+        end
 
         create(:merge_request, state: 'closed', milestone: milestone1, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time)
 
         expect do
           get api("/projects/#{project.id}/merge_requests", user)
-        end.not_to exceed_query_limit(control_count)
+        end.not_to exceed_query_limit(control)
       end
 
       it "returns an array of all merge_requests" do
diff --git a/spec/support/query_recorder.rb b/spec/support/query_recorder.rb
index ba0b805caad..a771b50ec4c 100644
--- a/spec/support/query_recorder.rb
+++ b/spec/support/query_recorder.rb
@@ -69,10 +69,17 @@ RSpec::Matchers.define :exceed_query_limit do |expected|
     @recorder.count
   end
 
+  def count_queries(queries)
+    queries.each_with_object(Hash.new(0)) { |query, counts| counts[query] += 1 }
+  end
+
   def log_message
     if expected.is_a?(ActiveRecord::QueryRecorder)
-      extra_queries = (expected.log - @recorder.log).join("\n\n")
-      "Extra queries: \n\n #{extra_queries}"
+      counts = count_queries(expected.log)
+      extra_queries = @recorder.log.reject { |query| counts[query] -= 1 unless counts[query].zero? }
+      extra_queries_display = count_queries(extra_queries).map { |query, count| "[#{count}] #{query}" }
+
+      (['Extra queries:'] + extra_queries_display).join("\n\n")
     else
       @recorder.log_message
     end
-- 
cgit v1.2.1


From e67373007997ea61167a08d69008caed6e2d6c8e Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Wed, 22 Nov 2017 10:33:53 -0600
Subject: Replaced vue-resource for axios in the prometheus dashboard

---
 .../javascripts/monitoring/services/monitoring_service.js | 13 +++++--------
 spec/javascripts/monitoring/dashboard_spec.js             | 12 +++++++++---
 spec/javascripts/monitoring/mock_data.js                  | 15 ---------------
 3 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/app/assets/javascripts/monitoring/services/monitoring_service.js b/app/assets/javascripts/monitoring/services/monitoring_service.js
index fed884d5c94..e230a06cd8c 100644
--- a/app/assets/javascripts/monitoring/services/monitoring_service.js
+++ b/app/assets/javascripts/monitoring/services/monitoring_service.js
@@ -1,10 +1,7 @@
-import Vue from 'vue';
-import VueResource from 'vue-resource';
+import axios from '../../lib/utils/axios_utils';
 import statusCodes from '../../lib/utils/http_status';
 import { backOff } from '../../lib/utils/common_utils';
 
-Vue.use(VueResource);
-
 const MAX_REQUESTS = 3;
 
 function backOffRequest(makeRequestCallback) {
@@ -32,8 +29,8 @@ export default class MonitoringService {
   }
 
   getGraphsData() {
-    return backOffRequest(() => Vue.http.get(this.metricsEndpoint))
-      .then(resp => resp.json())
+    return backOffRequest(() => axios.get(this.metricsEndpoint))
+      .then(resp => resp.data)
       .then((response) => {
         if (!response || !response.data) {
           throw new Error('Unexpected metrics data response from prometheus endpoint');
@@ -43,8 +40,8 @@ export default class MonitoringService {
   }
 
   getDeploymentData() {
-    return backOffRequest(() => Vue.http.get(this.deploymentEndpoint))
-      .then(resp => resp.json())
+    return backOffRequest(() => axios.get(this.deploymentEndpoint))
+      .then(resp => resp.data)
       .then((response) => {
         if (!response || !response.deployments) {
           throw new Error('Unexpected deployment data response from prometheus endpoint');
diff --git a/spec/javascripts/monitoring/dashboard_spec.js b/spec/javascripts/monitoring/dashboard_spec.js
index 752fdfb4614..9885b8a790f 100644
--- a/spec/javascripts/monitoring/dashboard_spec.js
+++ b/spec/javascripts/monitoring/dashboard_spec.js
@@ -1,6 +1,8 @@
 import Vue from 'vue';
+import MockAdapter from 'axios-mock-adapter';
 import Dashboard from '~/monitoring/components/dashboard.vue';
-import { MonitorMockInterceptor } from './mock_data';
+import axios from '~/lib/utils/axios_utils';
+import { metricsGroupsAPIResponse, mockApiEndpoint } from './mock_data';
 
 describe('Dashboard', () => {
   const fixtureName = 'environments/metrics/metrics.html.raw';
@@ -26,13 +28,17 @@ describe('Dashboard', () => {
   });
 
   describe('requests information to the server', () => {
+    let mock;
     beforeEach(() => {
       document.querySelector('#prometheus-graphs').setAttribute('data-has-metrics', 'true');
-      Vue.http.interceptors.push(MonitorMockInterceptor);
+      mock = new MockAdapter(axios);
+      mock.onGet(mockApiEndpoint).reply(200, {
+        metricsGroupsAPIResponse,
+      });
     });
 
     afterEach(() => {
-      Vue.http.interceptors = _.without(Vue.http.interceptors, MonitorMockInterceptor);
+      mock.reset();
     });
 
     it('shows up a loading state', (done) => {
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js
index 7ceab657464..6b34855b8b2 100644
--- a/spec/javascripts/monitoring/mock_data.js
+++ b/spec/javascripts/monitoring/mock_data.js
@@ -2425,13 +2425,6 @@ const metricsGroupsAPIResponse = {
 
 export default metricsGroupsAPIResponse;
 
-const responseMockData = {
-  'GET': {
-    '/root/hello-prometheus/environments/30/additional_metrics.json': metricsGroupsAPIResponse,
-    'http://test.host/frontend-fixtures/environments-project/environments/1/additional_metrics.json': metricsGroupsAPIResponse, // TODO: MAke sure this works in the monitoring_bundle_spec
-  },
-};
-
 export const deploymentData = [
   {
     id: 111,
@@ -8320,11 +8313,3 @@ export function convertDatesMultipleSeries(multipleSeries) {
   });
   return convertedMultiple;
 }
-
-export function MonitorMockInterceptor(request, next) {
-  const body = responseMockData[request.method.toUpperCase()][request.url];
-
-  next(request.respondWith(JSON.stringify(body), {
-    status: 200,
-  }));
-}
-- 
cgit v1.2.1


From 1760e377d8bc0731d2da38a86d6743e2eb8cfc94 Mon Sep 17 00:00:00 2001
From: Travis Miller <travis@travismiller.com>
Date: Sun, 5 Nov 2017 21:25:44 -0600
Subject: Add edit button to mobile file view

---
 app/assets/stylesheets/framework/files.scss                  | 12 ++++++++++++
 app/views/projects/blob/_header.html.haml                    |  2 +-
 .../unreleased/28377-add-edit-button-to-mobile-file-view.yml |  5 +++++
 spec/features/projects/blobs/blob_show_spec.rb               | 12 ++++++++++++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/28377-add-edit-button-to-mobile-file-view.yml

diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index c2a3cd16e67..609f33582e1 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -364,6 +364,18 @@ span.idiff {
       float: none;
     }
   }
+
+  @media (max-width: $screen-xs-max) {
+    display: block;
+
+    .file-actions {
+      white-space: normal;
+
+      .btn-group {
+        padding-top: 5px;
+      }
+    }
+  }
 }
 
 .is-stl-loading {
diff --git a/app/views/projects/blob/_header.html.haml b/app/views/projects/blob/_header.html.haml
index 0be15cc179f..281363d2e01 100644
--- a/app/views/projects/blob/_header.html.haml
+++ b/app/views/projects/blob/_header.html.haml
@@ -2,7 +2,7 @@
 .js-file-title.file-title-flex-parent
   = render 'projects/blob/header_content', blob: blob
 
-  .file-actions.hidden-xs
+  .file-actions
     = render 'projects/blob/viewer_switcher', blob: blob unless blame
 
     .btn-group{ role: "group" }<
diff --git a/changelogs/unreleased/28377-add-edit-button-to-mobile-file-view.yml b/changelogs/unreleased/28377-add-edit-button-to-mobile-file-view.yml
new file mode 100644
index 00000000000..b6646379b8d
--- /dev/null
+++ b/changelogs/unreleased/28377-add-edit-button-to-mobile-file-view.yml
@@ -0,0 +1,5 @@
+---
+title: Add edit button to mobile file view
+merge_request: 15199
+author: Travis Miller
+type: added
diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb
index 3d465e709b9..88813d9b5ff 100644
--- a/spec/features/projects/blobs/blob_show_spec.rb
+++ b/spec/features/projects/blobs/blob_show_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 feature 'File blob', :js do
+  include MobileHelpers
+
   let(:project) { create(:project, :public, :repository) }
 
   def visit_blob(path, anchor: nil, ref: 'master')
@@ -30,6 +32,16 @@ feature 'File blob', :js do
         expect(page).to have_link('Open raw')
       end
     end
+
+    it 'displays file actions on all screen sizes' do
+      file_actions_selector = '.file-actions'
+
+      resize_screen_sm
+      expect(page).to have_selector(file_actions_selector, visible: true)
+
+      resize_screen_xs
+      expect(page).to have_selector(file_actions_selector, visible: true)
+    end
   end
 
   context 'Markdown file' do
-- 
cgit v1.2.1


From bf77f1cd10e424be25ef9b155fc1b2a48d7556c2 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Wed, 22 Nov 2017 19:13:47 +0100
Subject: Force disable Prometheus metrics

Until https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/11
is ready, Prometheus metrics will not work and cause issues such as #40457.
---
 changelogs/unreleased/pawel-disable_prometheus_metrics.yml | 5 +++++
 lib/gitlab/metrics/prometheus.rb                           | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/pawel-disable_prometheus_metrics.yml

diff --git a/changelogs/unreleased/pawel-disable_prometheus_metrics.yml b/changelogs/unreleased/pawel-disable_prometheus_metrics.yml
new file mode 100644
index 00000000000..74d83256603
--- /dev/null
+++ b/changelogs/unreleased/pawel-disable_prometheus_metrics.yml
@@ -0,0 +1,5 @@
+---
+title: Force disable Prometheus metrics
+merge_request:
+author:
+type: fixed
diff --git a/lib/gitlab/metrics/prometheus.rb b/lib/gitlab/metrics/prometheus.rb
index 09103b4ca2d..4f165d12a94 100644
--- a/lib/gitlab/metrics/prometheus.rb
+++ b/lib/gitlab/metrics/prometheus.rb
@@ -17,9 +17,9 @@ module Gitlab
       end
 
       def prometheus_metrics_enabled?
-        return @prometheus_metrics_enabled if defined?(@prometheus_metrics_enabled)
-
-        @prometheus_metrics_enabled = prometheus_metrics_enabled_unmemoized
+        # force disable prometheus_metrics until
+        # https://gitlab.com/gitlab-org/prometheus-client-mmap/merge_requests/11 is ready
+        false
       end
 
       def registry
-- 
cgit v1.2.1


From 11d0787961b33efdbfdad9bf0bbc48afecc3cc53 Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Wed, 22 Nov 2017 17:46:40 +0000
Subject: Speed up Unicorn specs by using a dummy Rack application instead of
 GitLab

---
 app/controllers/unicorn_test_controller.rb | 14 --------------
 config/routes.rb                           |  2 --
 config/routes/test.rb                      |  2 --
 lib/gitlab/path_regex.rb                   |  1 -
 lib/tasks/brakeman.rake                    |  2 +-
 spec/unicorn/unicorn_spec.rb               | 21 ++++++++++++++++++---
 6 files changed, 19 insertions(+), 23 deletions(-)
 delete mode 100644 app/controllers/unicorn_test_controller.rb
 delete mode 100644 config/routes/test.rb

diff --git a/app/controllers/unicorn_test_controller.rb b/app/controllers/unicorn_test_controller.rb
deleted file mode 100644
index ed04bd1f77d..00000000000
--- a/app/controllers/unicorn_test_controller.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# :nocov:
-if Rails.env.test?
-  class UnicornTestController < ActionController::Base
-    def pid
-      render plain: Process.pid.to_s
-    end
-
-    def kill
-      Process.kill(params[:signal], Process.pid)
-      render plain: 'Bye!'
-    end
-  end
-end
-# :nocov:
diff --git a/config/routes.rb b/config/routes.rb
index fc13dc4865f..4f27fea0e92 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -100,7 +100,5 @@ Rails.application.routes.draw do
 
   root to: "root#index"
 
-  draw :test if Rails.env.test?
-
   get '*unmatched_route', to: 'application#route_not_found'
 end
diff --git a/config/routes/test.rb b/config/routes/test.rb
deleted file mode 100644
index ac477cdbbbc..00000000000
--- a/config/routes/test.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-get '/unicorn_test/pid' => 'unicorn_test#pid'
-post '/unicorn_test/kill' => 'unicorn_test#kill'
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb
index 9a91f8bf96a..7e5dfd33502 100644
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -51,7 +51,6 @@ module Gitlab
       slash-command-logo.png
       snippets
       u
-      unicorn_test
       unsubscribes
       uploads
       users
diff --git a/lib/tasks/brakeman.rake b/lib/tasks/brakeman.rake
index 99b3168d9eb..2301ec9b228 100644
--- a/lib/tasks/brakeman.rake
+++ b/lib/tasks/brakeman.rake
@@ -2,7 +2,7 @@ desc 'Security check via brakeman'
 task :brakeman do
   # We get 0 warnings at level 'w3' but we would like to reach 'w2'. Merge
   # requests are welcome!
-  if system(*%w(brakeman --no-progress --skip-files lib/backup/repository.rb,app/controllers/unicorn_test_controller.rb -w3 -z))
+  if system(*%w(brakeman --no-progress --skip-files lib/backup/repository.rb -w3 -z))
     puts 'Security check succeed'
   else
     puts 'Security check failed'
diff --git a/spec/unicorn/unicorn_spec.rb b/spec/unicorn/unicorn_spec.rb
index 79a566975df..a4cf479a339 100644
--- a/spec/unicorn/unicorn_spec.rb
+++ b/spec/unicorn/unicorn_spec.rb
@@ -37,7 +37,22 @@ describe 'Unicorn' do
     config_path = 'tmp/tests/unicorn.rb'
     File.write(config_path, config_lines.join("\n") + "\n")
 
-    cmd = %W[unicorn -E test -c #{config_path} #{Rails.root.join('config.ru')}]
+    rackup_path = 'tmp/tests/config.ru'
+    File.write(rackup_path, <<~EOS)
+      app =
+        proc do |env|
+          if env['REQUEST_METHOD'] == 'GET'
+            [200, {}, [Process.pid]]
+          else
+            Process.kill(env['QUERY_STRING'], Process.pid)
+            [200, {}, ['Bye!']]
+          end
+        end
+
+      run app
+    EOS
+
+    cmd = %W[unicorn -E test -c #{config_path} #{rackup_path}]
     @unicorn_master_pid = spawn(*cmd)
     wait_unicorn_boot!(@unicorn_master_pid, ready_file)
     WebMock.allow_net_connect!
@@ -45,14 +60,14 @@ describe 'Unicorn' do
 
   %w[SIGQUIT SIGTERM SIGKILL].each do |signal|
     it "has a worker that self-terminates on signal #{signal}" do
-      response = Excon.get('unix:///unicorn_test/pid', socket: @socket_path)
+      response = Excon.get('unix://', socket: @socket_path)
       expect(response.status).to eq(200)
 
       worker_pid = response.body.to_i
       expect(worker_pid).to be > 0
 
       begin
-        Excon.post('unix:///unicorn_test/kill', socket: @socket_path, body: "signal=#{signal}")
+        Excon.post("unix://?#{signal}", socket: @socket_path)
       rescue Excon::Error::Socket
         # The connection may be closed abruptly
       end
-- 
cgit v1.2.1


From 967ee2647445da9145895aff514d9bf4f3dba7e3 Mon Sep 17 00:00:00 2001
From: Tim Zallmann <tzallmann@gitlab.com>
Date: Wed, 22 Nov 2017 16:01:56 +0100
Subject: Upgraded babel related libraries

---
 package.json |  14 +-
 yarn.lock    | 791 ++++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 490 insertions(+), 315 deletions(-)

diff --git a/package.json b/package.json
index 26445caeb7a..383f6b9fb6e 100644
--- a/package.json
+++ b/package.json
@@ -16,12 +16,12 @@
     "autosize": "^4.0.0",
     "axios": "^0.17.1",
     "axios-mock-adapter": "^1.10.0",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^7.2.1",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-transform-define": "^1.2.0",
-    "babel-preset-latest": "^6.24.0",
-    "babel-preset-stage-2": "^6.22.0",
+    "babel-core": "^6.26.0",
+    "babel-eslint": "^8.0.2",
+    "babel-loader": "^7.1.2",
+    "babel-plugin-transform-define": "^1.3.0",
+    "babel-preset-latest": "^6.24.1",
+    "babel-preset-stage-2": "^6.24.1",
     "blackst0ne-mermaid": "^7.1.0-fixed",
     "bootstrap-sass": "^3.3.6",
     "brace-expansion": "^1.1.8",
@@ -77,7 +77,7 @@
   },
   "devDependencies": {
     "@gitlab-org/gitlab-svgs": "^1.0.2",
-    "babel-plugin-istanbul": "^4.0.0",
+    "babel-plugin-istanbul": "^4.1.5",
     "eslint": "^3.10.1",
     "eslint-config-airbnb-base": "^10.0.1",
     "eslint-import-resolver-webpack": "^0.8.3",
diff --git a/yarn.lock b/yarn.lock
index 97117f3e332..9ac5690a96e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,58 @@
 # yarn lockfile v1
 
 
+"@babel/code-frame@7.0.0-beta.32", "@babel/code-frame@^7.0.0-beta.31":
+  version "7.0.0-beta.32"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.32.tgz#04f231b8ec70370df830d9926ce0f5add074ec4c"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/helper-function-name@7.0.0-beta.32":
+  version "7.0.0-beta.32"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.32.tgz#6161af4419f1b4e3ed2d28c0c79c160e218be1f3"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-beta.32"
+    "@babel/template" "7.0.0-beta.32"
+    "@babel/types" "7.0.0-beta.32"
+
+"@babel/helper-get-function-arity@7.0.0-beta.32":
+  version "7.0.0-beta.32"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.32.tgz#93721a99db3757de575a83bab7c453299abca568"
+  dependencies:
+    "@babel/types" "7.0.0-beta.32"
+
+"@babel/template@7.0.0-beta.32":
+  version "7.0.0-beta.32"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.32.tgz#e1d9fdbd2a7bcf128f2f920744a67dab18072495"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.32"
+    "@babel/types" "7.0.0-beta.32"
+    babylon "7.0.0-beta.32"
+    lodash "^4.2.0"
+
+"@babel/traverse@^7.0.0-beta.31":
+  version "7.0.0-beta.32"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.32.tgz#b78b754c6e1af3360626183738e4c7a05951bc99"
+  dependencies:
+    "@babel/code-frame" "7.0.0-beta.32"
+    "@babel/helper-function-name" "7.0.0-beta.32"
+    "@babel/types" "7.0.0-beta.32"
+    babylon "7.0.0-beta.32"
+    debug "^3.0.1"
+    globals "^10.0.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+"@babel/types@7.0.0-beta.32", "@babel/types@^7.0.0-beta.31":
+  version "7.0.0-beta.32"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.32.tgz#c317d0ecc89297b80bbcb2f50608e31f6452a5ff"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^2.0.0"
+
 "@gitlab-org/gitlab-svgs@^1.0.2":
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.0.2.tgz#e4d29058e2bb438ba71ac525c6397ef15ae2877b"
@@ -105,6 +157,12 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
+ansi-styles@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.0.tgz#c159b8d5be0f9e5a6f346dab94f16ce022161b88"
+  dependencies:
+    color-convert "^1.9.0"
+
 anymatch@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -285,7 +343,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-code-frame@^6.16.0:
+babel-code-frame@^6.16.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -293,40 +351,40 @@ babel-code-frame@^6.16.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@^6.22.1, babel-core@^6.23.0:
-  version "6.23.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df"
+babel-core@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
   dependencies:
-    babel-code-frame "^6.22.0"
-    babel-generator "^6.23.0"
-    babel-helpers "^6.23.0"
+    babel-code-frame "^6.26.0"
+    babel-generator "^6.26.0"
+    babel-helpers "^6.24.1"
     babel-messages "^6.23.0"
-    babel-register "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.1"
-    babel-types "^6.23.0"
-    babylon "^6.11.0"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.5.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
+    babel-register "^6.26.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    convert-source-map "^1.5.0"
+    debug "^2.6.8"
+    json5 "^0.5.1"
+    lodash "^4.17.4"
+    minimatch "^3.0.4"
+    path-is-absolute "^1.0.1"
+    private "^0.1.7"
     slash "^1.0.0"
-    source-map "^0.5.0"
+    source-map "^0.5.6"
 
-babel-eslint@^7.2.1:
-  version "7.2.1"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.1.tgz#079422eb73ba811e3ca0865ce87af29327f8c52f"
+babel-eslint@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.0.2.tgz#e44fb9a037d749486071d52d65312f5c20aa7530"
   dependencies:
-    babel-code-frame "^6.22.0"
-    babel-traverse "^6.23.1"
-    babel-types "^6.23.0"
-    babylon "^6.16.1"
+    "@babel/code-frame" "^7.0.0-beta.31"
+    "@babel/traverse" "^7.0.0-beta.31"
+    "@babel/types" "^7.0.0-beta.31"
+    babylon "^7.0.0-beta.31"
 
-babel-generator@^6.18.0, babel-generator@^6.23.0:
+babel-generator@^6.18.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.23.0.tgz#6b8edab956ef3116f79d8c84c5a3c05f32a74bc5"
   dependencies:
@@ -339,127 +397,140 @@ babel-generator@^6.18.0, babel-generator@^6.23.0:
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-babel-helper-bindify-decorators@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.22.0.tgz#d7f5bc261275941ac62acfc4e20dacfb8a3fe952"
+babel-generator@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.0.tgz#ac1ae20070b79f6e3ca1d3269613053774f20dc5"
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.17.4"
+    source-map "^0.5.6"
+    trim-right "^1.0.1"
 
-babel-helper-builder-binary-assignment-operator-visitor@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.22.0.tgz#29df56be144d81bdeac08262bfa41d2c5e91cdcd"
+babel-helper-bindify-decorators@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz#14c19e5f142d7b47f19a52431e52b1ccbc40a330"
   dependencies:
-    babel-helper-explode-assignable-expression "^6.22.0"
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-helper-call-delegate@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.22.0.tgz#119921b56120f17e9dae3f74b4f5cc7bcc1b37ef"
+babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
   dependencies:
-    babel-helper-hoist-variables "^6.22.0"
+    babel-helper-explode-assignable-expression "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.24.1"
 
-babel-helper-define-map@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.23.0.tgz#1444f960c9691d69a2ced6a205315f8fd00804e7"
+babel-helper-call-delegate@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
   dependencies:
-    babel-helper-function-name "^6.23.0"
+    babel-helper-hoist-variables "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
-    lodash "^4.2.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-helper-explode-assignable-expression@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.22.0.tgz#c97bf76eed3e0bae4048121f2b9dae1a4e7d0478"
+babel-helper-define-map@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
+    babel-helper-function-name "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
 
-babel-helper-explode-class@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.22.0.tgz#646304924aa6388a516843ba7f1855ef8dfeb69b"
+babel-helper-explode-assignable-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
   dependencies:
-    babel-helper-bindify-decorators "^6.22.0"
     babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-helper-function-name@^6.22.0, babel-helper-function-name@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz#25742d67175c8903dbe4b6cb9d9e1fcb8dcf23a6"
+babel-helper-explode-class@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz#7dc2a3910dee007056e1e31d640ced3d54eaa9eb"
   dependencies:
-    babel-helper-get-function-arity "^6.22.0"
+    babel-helper-bindify-decorators "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-helper-get-function-arity@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz#0beb464ad69dc7347410ac6ade9f03a50634f5ce"
+babel-helper-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
   dependencies:
+    babel-helper-get-function-arity "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-helper-hoist-variables@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.22.0.tgz#3eacbf731d80705845dd2e9718f600cfb9b4ba72"
+babel-helper-get-function-arity@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.24.1"
 
-babel-helper-optimise-call-expression@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.23.0.tgz#f3ee7eed355b4282138b33d02b78369e470622f5"
+babel-helper-hoist-variables@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
+    babel-types "^6.24.1"
 
-babel-helper-regex@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.22.0.tgz#79f532be1647b1f0ee3474b5f5c3da58001d247d"
+babel-helper-optimise-call-expression@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-    lodash "^4.2.0"
+    babel-types "^6.24.1"
 
-babel-helper-remap-async-to-generator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.22.0.tgz#2186ae73278ed03b8b15ced089609da981053383"
+babel-helper-regex@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
   dependencies:
-    babel-helper-function-name "^6.22.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
+
+babel-helper-remap-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-helper-replace-supers@^6.22.0, babel-helper-replace-supers@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.23.0.tgz#eeaf8ad9b58ec4337ca94223bacdca1f8d9b4bfd"
+babel-helper-replace-supers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
   dependencies:
-    babel-helper-optimise-call-expression "^6.23.0"
+    babel-helper-optimise-call-expression "^6.24.1"
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-helpers@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
+babel-helpers@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
+    babel-template "^6.24.1"
 
-babel-loader@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.1.tgz#b87134c8b12e3e4c2a94e0546085bc680a2b8488"
+babel-loader@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.2.tgz#f6cbe122710f1aa2af4d881c6d5b54358ca24126"
   dependencies:
     find-cache-dir "^1.0.0"
     loader-utils "^1.0.2"
@@ -477,13 +548,13 @@ babel-plugin-check-es2015-constants@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-istanbul@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.0.0.tgz#36bde8fbef4837e5ff0366531a2beabd7b1ffa10"
+babel-plugin-istanbul@^4.1.5:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.5.tgz#6760cdd977f411d3e175bb064f2bc327d99b2b6e"
   dependencies:
     find-up "^2.1.0"
-    istanbul-lib-instrument "^1.4.2"
-    test-exclude "^4.0.0"
+    istanbul-lib-instrument "^1.7.5"
+    test-exclude "^4.1.1"
 
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
@@ -517,46 +588,46 @@ babel-plugin-syntax-trailing-function-commas@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
 
-babel-plugin-transform-async-generator-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.22.0.tgz#a720a98153a7596f204099cd5409f4b3c05bab46"
+babel-plugin-transform-async-generator-functions@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz#f058900145fd3e9907a6ddf28da59f215258a5db"
   dependencies:
-    babel-helper-remap-async-to-generator "^6.22.0"
+    babel-helper-remap-async-to-generator "^6.24.1"
     babel-plugin-syntax-async-generators "^6.5.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-async-to-generator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.22.0.tgz#194b6938ec195ad36efc4c33a971acf00d8cd35e"
+babel-plugin-transform-async-to-generator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
   dependencies:
-    babel-helper-remap-async-to-generator "^6.22.0"
+    babel-helper-remap-async-to-generator "^6.24.1"
     babel-plugin-syntax-async-functions "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-class-properties@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.23.0.tgz#187b747ee404399013563c993db038f34754ac3b"
+babel-plugin-transform-class-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
   dependencies:
-    babel-helper-function-name "^6.23.0"
+    babel-helper-function-name "^6.24.1"
     babel-plugin-syntax-class-properties "^6.8.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
+    babel-template "^6.24.1"
 
-babel-plugin-transform-decorators@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.22.0.tgz#c03635b27a23b23b7224f49232c237a73988d27c"
+babel-plugin-transform-decorators@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz#788013d8f8c6b5222bdf7b344390dfd77569e24d"
   dependencies:
-    babel-helper-explode-class "^6.22.0"
+    babel-helper-explode-class "^6.24.1"
     babel-plugin-syntax-decorators "^6.13.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-types "^6.22.0"
+    babel-template "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-plugin-transform-define@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-define/-/babel-plugin-transform-define-1.2.0.tgz#f036bda05162f29a542e434f585da1ccf1e7ec6a"
+babel-plugin-transform-define@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-define/-/babel-plugin-transform-define-1.3.0.tgz#94c5f9459c810c738cc7c50cbd44a31829d6f319"
   dependencies:
-    lodash.get "4.4.2"
+    lodash "4.17.4"
     traverse "0.6.6"
 
 babel-plugin-transform-es2015-arrow-functions@^6.22.0:
@@ -571,36 +642,36 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.23.0.tgz#e48895cf0b375be148cd7c8879b422707a053b51"
+babel-plugin-transform-es2015-block-scoping@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
   dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-    lodash "^4.2.0"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    lodash "^4.17.4"
 
-babel-plugin-transform-es2015-classes@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.23.0.tgz#49b53f326202a2fd1b3bbaa5e2edd8a4f78643c1"
+babel-plugin-transform-es2015-classes@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
   dependencies:
-    babel-helper-define-map "^6.23.0"
-    babel-helper-function-name "^6.23.0"
-    babel-helper-optimise-call-expression "^6.23.0"
-    babel-helper-replace-supers "^6.23.0"
+    babel-helper-define-map "^6.24.1"
+    babel-helper-function-name "^6.24.1"
+    babel-helper-optimise-call-expression "^6.24.1"
+    babel-helper-replace-supers "^6.24.1"
     babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-computed-properties@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.22.0.tgz#7c383e9629bba4820c11b0425bdd6290f7f057e7"
+babel-plugin-transform-es2015-computed-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
+    babel-template "^6.24.1"
 
 babel-plugin-transform-es2015-destructuring@^6.22.0:
   version "6.23.0"
@@ -608,12 +679,12 @@ babel-plugin-transform-es2015-destructuring@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.22.0.tgz#672397031c21610d72dd2bbb0ba9fb6277e1c36b"
+babel-plugin-transform-es2015-duplicate-keys@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.24.1"
 
 babel-plugin-transform-es2015-for-of@^6.22.0:
   version "6.23.0"
@@ -621,13 +692,13 @@ babel-plugin-transform-es2015-for-of@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-function-name@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.22.0.tgz#f5fcc8b09093f9a23c76ac3d9e392c3ec4b77104"
+babel-plugin-transform-es2015-function-name@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
   dependencies:
-    babel-helper-function-name "^6.22.0"
+    babel-helper-function-name "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.24.1"
 
 babel-plugin-transform-es2015-literals@^6.22.0:
   version "6.22.0"
@@ -635,63 +706,63 @@ babel-plugin-transform-es2015-literals@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-modules-amd@^6.24.0:
-  version "6.24.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.0.tgz#a1911fb9b7ec7e05a43a63c5995007557bcf6a2e"
+babel-plugin-transform-es2015-modules-amd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
   dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
+    babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-commonjs@^6.24.0:
-  version "6.24.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.0.tgz#e921aefb72c2cc26cb03d107626156413222134f"
+babel-plugin-transform-es2015-modules-commonjs@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a"
   dependencies:
-    babel-plugin-transform-strict-mode "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-types "^6.23.0"
+    babel-plugin-transform-strict-mode "^6.24.1"
+    babel-runtime "^6.26.0"
+    babel-template "^6.26.0"
+    babel-types "^6.26.0"
 
-babel-plugin-transform-es2015-modules-systemjs@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.23.0.tgz#ae3469227ffac39b0310d90fec73bfdc4f6317b0"
+babel-plugin-transform-es2015-modules-systemjs@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
   dependencies:
-    babel-helper-hoist-variables "^6.22.0"
+    babel-helper-hoist-variables "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
+    babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-modules-umd@^6.24.0:
-  version "6.24.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.0.tgz#fd5fa63521cae8d273927c3958afd7c067733450"
+babel-plugin-transform-es2015-modules-umd@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
   dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
+    babel-template "^6.24.1"
 
-babel-plugin-transform-es2015-object-super@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.22.0.tgz#daa60e114a042ea769dd53fe528fc82311eb98fc"
+babel-plugin-transform-es2015-object-super@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
   dependencies:
-    babel-helper-replace-supers "^6.22.0"
+    babel-helper-replace-supers "^6.24.1"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-parameters@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.23.0.tgz#3a2aabb70c8af945d5ce386f1a4250625a83ae3b"
+babel-plugin-transform-es2015-parameters@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
   dependencies:
-    babel-helper-call-delegate "^6.22.0"
-    babel-helper-get-function-arity "^6.22.0"
+    babel-helper-call-delegate "^6.24.1"
+    babel-helper-get-function-arity "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
+    babel-template "^6.24.1"
+    babel-traverse "^6.24.1"
+    babel-types "^6.24.1"
 
-babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz#8ba776e0affaa60bff21e921403b8a652a2ff723"
+babel-plugin-transform-es2015-shorthand-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.24.1"
 
 babel-plugin-transform-es2015-spread@^6.22.0:
   version "6.22.0"
@@ -699,13 +770,13 @@ babel-plugin-transform-es2015-spread@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-sticky-regex@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.22.0.tgz#ab316829e866ee3f4b9eb96939757d19a5bc4593"
+babel-plugin-transform-es2015-sticky-regex@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
   dependencies:
-    babel-helper-regex "^6.22.0"
+    babel-helper-regex "^6.24.1"
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.24.1"
 
 babel-plugin-transform-es2015-template-literals@^6.22.0:
   version "6.22.0"
@@ -719,19 +790,19 @@ babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-es2015-unicode-regex@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.22.0.tgz#8d9cc27e7ee1decfe65454fb986452a04a613d20"
+babel-plugin-transform-es2015-unicode-regex@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
   dependencies:
-    babel-helper-regex "^6.22.0"
+    babel-helper-regex "^6.24.1"
     babel-runtime "^6.22.0"
     regexpu-core "^2.0.0"
 
-babel-plugin-transform-exponentiation-operator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.22.0.tgz#d57c8335281918e54ef053118ce6eb108468084d"
+babel-plugin-transform-exponentiation-operator@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
   dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.22.0"
+    babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
     babel-runtime "^6.22.0"
 
@@ -742,99 +813,99 @@ babel-plugin-transform-object-rest-spread@^6.22.0:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-regenerator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"
+babel-plugin-transform-regenerator@^6.24.1:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
   dependencies:
-    regenerator-transform "0.9.8"
+    regenerator-transform "^0.10.0"
 
-babel-plugin-transform-strict-mode@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz#e008df01340fdc87e959da65991b7e05970c8c7c"
+babel-plugin-transform-strict-mode@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.24.1"
 
-babel-preset-es2015@^6.24.0:
-  version "6.24.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.0.tgz#c162d68b1932696e036cd3110dc1ccd303d2673a"
+babel-preset-es2015@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz#d44050d6bc2c9feea702aaf38d727a0210538939"
   dependencies:
     babel-plugin-check-es2015-constants "^6.22.0"
     babel-plugin-transform-es2015-arrow-functions "^6.22.0"
     babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.22.0"
-    babel-plugin-transform-es2015-classes "^6.22.0"
-    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.24.1"
+    babel-plugin-transform-es2015-classes "^6.24.1"
+    babel-plugin-transform-es2015-computed-properties "^6.24.1"
     babel-plugin-transform-es2015-destructuring "^6.22.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.24.1"
     babel-plugin-transform-es2015-for-of "^6.22.0"
-    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-function-name "^6.24.1"
     babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.24.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.24.0"
-    babel-plugin-transform-es2015-modules-systemjs "^6.22.0"
-    babel-plugin-transform-es2015-modules-umd "^6.24.0"
-    babel-plugin-transform-es2015-object-super "^6.22.0"
-    babel-plugin-transform-es2015-parameters "^6.22.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.1"
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
+    babel-plugin-transform-es2015-modules-systemjs "^6.24.1"
+    babel-plugin-transform-es2015-modules-umd "^6.24.1"
+    babel-plugin-transform-es2015-object-super "^6.24.1"
+    babel-plugin-transform-es2015-parameters "^6.24.1"
+    babel-plugin-transform-es2015-shorthand-properties "^6.24.1"
     babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.24.1"
     babel-plugin-transform-es2015-template-literals "^6.22.0"
     babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
-    babel-plugin-transform-regenerator "^6.22.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.24.1"
+    babel-plugin-transform-regenerator "^6.24.1"
 
-babel-preset-es2016@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2016/-/babel-preset-es2016-6.22.0.tgz#b061aaa3983d40c9fbacfa3743b5df37f336156c"
+babel-preset-es2016@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2016/-/babel-preset-es2016-6.24.1.tgz#f900bf93e2ebc0d276df9b8ab59724ebfd959f8b"
   dependencies:
-    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-exponentiation-operator "^6.24.1"
 
-babel-preset-es2017@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2017/-/babel-preset-es2017-6.22.0.tgz#de2f9da5a30c50d293fb54a0ba15d6ddc573f0f2"
+babel-preset-es2017@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2017/-/babel-preset-es2017-6.24.1.tgz#597beadfb9f7f208bcfd8a12e9b2b29b8b2f14d1"
   dependencies:
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.22.0"
+    babel-plugin-transform-async-to-generator "^6.24.1"
 
-babel-preset-latest@^6.24.0:
-  version "6.24.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-latest/-/babel-preset-latest-6.24.0.tgz#a68d20f509edcc5d7433a48dfaebf7e4f2cd4cb7"
+babel-preset-latest@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-latest/-/babel-preset-latest-6.24.1.tgz#677de069154a7485c2d25c577c02f624b85b85e8"
   dependencies:
-    babel-preset-es2015 "^6.24.0"
-    babel-preset-es2016 "^6.22.0"
-    babel-preset-es2017 "^6.22.0"
+    babel-preset-es2015 "^6.24.1"
+    babel-preset-es2016 "^6.24.1"
+    babel-preset-es2017 "^6.24.1"
 
-babel-preset-stage-2@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.22.0.tgz#ccd565f19c245cade394b21216df704a73b27c07"
+babel-preset-stage-2@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz#d9e2960fb3d71187f0e64eec62bc07767219bdc1"
   dependencies:
     babel-plugin-syntax-dynamic-import "^6.18.0"
-    babel-plugin-transform-class-properties "^6.22.0"
-    babel-plugin-transform-decorators "^6.22.0"
-    babel-preset-stage-3 "^6.22.0"
+    babel-plugin-transform-class-properties "^6.24.1"
+    babel-plugin-transform-decorators "^6.24.1"
+    babel-preset-stage-3 "^6.24.1"
 
-babel-preset-stage-3@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.22.0.tgz#a4e92bbace7456fafdf651d7a7657ee0bbca9c2e"
+babel-preset-stage-3@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz#836ada0a9e7a7fa37cb138fb9326f87934a48395"
   dependencies:
     babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-generator-functions "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.22.0"
-    babel-plugin-transform-exponentiation-operator "^6.22.0"
+    babel-plugin-transform-async-generator-functions "^6.24.1"
+    babel-plugin-transform-async-to-generator "^6.24.1"
+    babel-plugin-transform-exponentiation-operator "^6.24.1"
     babel-plugin-transform-object-rest-spread "^6.22.0"
 
-babel-register@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3"
+babel-register@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
   dependencies:
-    babel-core "^6.23.0"
-    babel-runtime "^6.22.0"
-    core-js "^2.4.0"
+    babel-core "^6.26.0"
+    babel-runtime "^6.26.0"
+    core-js "^2.5.0"
     home-or-tmp "^2.0.0"
-    lodash "^4.2.0"
+    lodash "^4.17.4"
     mkdirp "^0.5.1"
-    source-map-support "^0.4.2"
+    source-map-support "^0.4.15"
 
 babel-runtime@^6.18.0, babel-runtime@^6.22.0:
   version "6.22.0"
@@ -843,7 +914,14 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.23.0:
+babel-runtime@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.11.0"
+
+babel-template@^6.16.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
   dependencies:
@@ -853,7 +931,17 @@ babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.23.0:
     babylon "^6.11.0"
     lodash "^4.2.0"
 
-babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1:
+babel-template@^6.24.1, babel-template@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+  dependencies:
+    babel-runtime "^6.26.0"
+    babel-traverse "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    lodash "^4.17.4"
+
+babel-traverse@^6.18.0, babel-traverse@^6.23.0:
   version "6.23.1"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
   dependencies:
@@ -867,7 +955,21 @@ babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0, babel-tr
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0:
+babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+  dependencies:
+    babel-code-frame "^6.26.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.26.0"
+    babel-types "^6.26.0"
+    babylon "^6.18.0"
+    debug "^2.6.8"
+    globals "^9.18.0"
+    invariant "^2.2.2"
+    lodash "^4.17.4"
+
+babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
   dependencies:
@@ -876,10 +978,27 @@ babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
-babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0, babylon@^6.16.1:
+babel-types@^6.24.1, babel-types@^6.26.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+  dependencies:
+    babel-runtime "^6.26.0"
+    esutils "^2.0.2"
+    lodash "^4.17.4"
+    to-fast-properties "^1.0.3"
+
+babylon@7.0.0-beta.32, babylon@^7.0.0-beta.31:
+  version "7.0.0-beta.32"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.32.tgz#e9033cb077f64d6895f4125968b37dc0a8c3bc6e"
+
+babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0:
   version "6.16.1"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
 
+babylon@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
+
 backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
@@ -1191,6 +1310,14 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
+chalk@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+
 chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.6.0, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
@@ -1280,6 +1407,12 @@ color-convert@^1.3.0:
   dependencies:
     color-name "^1.1.1"
 
+color-convert@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  dependencies:
+    color-name "^1.1.1"
+
 color-name@^1.0.0, color-name@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
@@ -1450,9 +1583,9 @@ content-type@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
 
-convert-source-map@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67"
+convert-source-map@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
 cookie-signature@1.0.6:
   version "1.0.6"
@@ -1483,6 +1616,10 @@ core-js@^2.4.0, core-js@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
 
+core-js@^2.5.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.1.tgz#ae6874dc66937789b80754ff5428df66819ca50b"
+
 core-js@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
@@ -2822,7 +2959,11 @@ glob@^7.0.3, glob@^7.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globals@^9.0.0, globals@^9.14.0:
+globals@^10.0.0:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7"
+
+globals@^9.0.0, globals@^9.14.0, globals@^9.18.0:
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -3196,7 +3337,7 @@ interpret@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
 
-invariant@^2.2.0:
+invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
@@ -3474,13 +3615,17 @@ istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-c
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212"
 
+istanbul-lib-coverage@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
+
 istanbul-lib-hook@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.0.tgz#fc5367ee27f59268e8f060b0c7aaf051d9c425c5"
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.3.0, istanbul-lib-instrument@^1.4.2:
+istanbul-lib-instrument@^1.3.0:
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.4.2.tgz#0e2fdfac93c1dabf2e31578637dc78a19089f43e"
   dependencies:
@@ -3492,6 +3637,18 @@ istanbul-lib-instrument@^1.3.0, istanbul-lib-instrument@^1.4.2:
     istanbul-lib-coverage "^1.0.0"
     semver "^5.3.0"
 
+istanbul-lib-instrument@^1.7.5:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.1.1"
+    semver "^5.3.0"
+
 istanbul-lib-report@^1.0.0-alpha.3:
   version "1.0.0-alpha.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0-alpha.3.tgz#32d5f6ec7f33ca3a602209e278b2e6ff143498af"
@@ -3930,10 +4087,6 @@ lodash.defaults@^3.1.2:
     lodash.assign "^3.0.0"
     lodash.restparam "^3.0.0"
 
-lodash.get@4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-
 lodash.get@^3.7.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-3.7.0.tgz#3ce68ae2c91683b281cc5394128303cbf75e691f"
@@ -3987,14 +4140,14 @@ lodash.words@^4.0.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.words/-/lodash.words-4.2.0.tgz#5ecfeaf8ecf8acaa8e0c8386295f1993c9cf4036"
 
+lodash@4.17.4, lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
 lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0:
-  version "4.17.4"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
-
 log4js@^0.6.31:
   version "0.6.38"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-0.6.38.tgz#2c494116695d6fb25480943d3fc872e662a522fd"
@@ -4680,7 +4833,7 @@ path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
 
-path-is-absolute@^1.0.0:
+path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
 
@@ -5067,6 +5220,10 @@ private@^0.1.6:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
 
+private@^0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+
 process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -5363,9 +5520,13 @@ regenerator-runtime@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb"
 
-regenerator-transform@0.9.8:
-  version "0.9.8"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c"
+regenerator-runtime@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
+
+regenerator-transform@^0.10.0:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
   dependencies:
     babel-runtime "^6.18.0"
     babel-types "^6.19.0"
@@ -5785,11 +5946,11 @@ source-list-map@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
 
-source-map-support@^0.4.2:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322"
+source-map-support@^0.4.15:
+  version "0.4.18"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
   dependencies:
-    source-map "^0.5.3"
+    source-map "^0.5.6"
 
 source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.6"
@@ -5996,6 +6157,12 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2, supports-co
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@^4.0.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+  dependencies:
+    has-flag "^2.0.0"
+
 supports-color@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.2.1.tgz#65a4bb2631e90e02420dba5554c375a4754bb836"
@@ -6076,9 +6243,9 @@ tar@^2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
-test-exclude@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.0.tgz#0ddc0100b8ae7e88b34eb4fd98a907e961991900"
+test-exclude@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
   dependencies:
     arrify "^1.0.1"
     micromatch "^2.3.11"
@@ -6166,6 +6333,14 @@ to-fast-properties@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
 
+to-fast-properties@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+
+to-fast-properties@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+
 touch@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/touch/-/touch-1.0.0.tgz#449cbe2dbae5a8c8038e30d71fa0ff464947c4de"
-- 
cgit v1.2.1


From 9fefb6c2be1e9772599aa376ae8ae37241ace0c6 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Wed, 22 Nov 2017 14:10:25 -0800
Subject: Update CHANGELOG.md for 10.2.1

[ci skip]
---
 CHANGELOG.md                                               | 7 +++++++
 changelogs/unreleased/pawel-disable_prometheus_metrics.yml | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/unreleased/pawel-disable_prometheus_metrics.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48282f67ed4..221626e7bf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 10.2.1 (2017-11-22)
+
+### Fixed (1 change)
+
+- Force disable Prometheus metrics.
+
+
 ## 10.2.0 (2017-11-22)
 
 ### Security (4 changes)
diff --git a/changelogs/unreleased/pawel-disable_prometheus_metrics.yml b/changelogs/unreleased/pawel-disable_prometheus_metrics.yml
deleted file mode 100644
index 74d83256603..00000000000
--- a/changelogs/unreleased/pawel-disable_prometheus_metrics.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Force disable Prometheus metrics
-merge_request:
-author:
-type: fixed
-- 
cgit v1.2.1


From e882455a9d5107f143ad62ce4a14792277b9fdcd Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas Lopez <jvargas@gitlab.com>
Date: Thu, 23 Nov 2017 07:52:15 +0000
Subject: Change star, filter and settings icons to the their sprite based
 replacements

---
 app/assets/javascripts/groups/components/item_actions.vue | 8 +++++---
 app/assets/javascripts/star.js                            | 9 ++++++---
 app/views/projects/buttons/_star.html.haml                | 6 +++---
 app/views/shared/groups/_group.html.haml                  | 2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/groups/components/item_actions.vue b/app/assets/javascripts/groups/components/item_actions.vue
index 7eff19e2e5a..09cb79c1afd 100644
--- a/app/assets/javascripts/groups/components/item_actions.vue
+++ b/app/assets/javascripts/groups/components/item_actions.vue
@@ -4,9 +4,11 @@ import tooltip from '../../vue_shared/directives/tooltip';
 import PopupDialog from '../../vue_shared/components/popup_dialog.vue';
 import eventHub from '../event_hub';
 import { COMMON_STR } from '../constants';
+import Icon from '../../vue_shared/components/icon.vue';
 
 export default {
   components: {
+    Icon,
     PopupDialog,
   },
   directives: {
@@ -63,9 +65,9 @@ export default {
       :aria-label="editBtnTitle"
       data-container="body"
       class="edit-group btn no-expand">
-      <i
-        class="fa fa-cogs"
-        aria-hidden="true"/>
+      <icon
+        name="settings">
+      </icon>
     </a>
     <a
       v-tooltip
diff --git a/app/assets/javascripts/star.js b/app/assets/javascripts/star.js
index 1a8dc085772..d5606e153f6 100644
--- a/app/assets/javascripts/star.js
+++ b/app/assets/javascripts/star.js
@@ -1,5 +1,6 @@
 import Flash from './flash';
 import { __, s__ } from './locale';
+import { spriteIcon } from './lib/utils/common_utils';
 
 export default class Star {
   constructor() {
@@ -7,16 +8,18 @@ export default class Star {
       .on('ajax:success', function handleSuccess(e, data) {
         const $this = $(this);
         const $starSpan = $this.find('span');
-        const $starIcon = $this.find('i');
+        const $startIcon = $this.find('svg');
 
         function toggleStar(isStarred) {
           $this.parent().find('.star-count').text(data.star_count);
           if (isStarred) {
             $starSpan.removeClass('starred').text(s__('StarProject|Star'));
-            $starIcon.removeClass('fa-star').addClass('fa-star-o');
+            $startIcon.remove();
+            $this.prepend(spriteIcon('star-o'));
           } else {
             $starSpan.addClass('starred').text(__('Unstar'));
-            $starIcon.removeClass('fa-star-o').addClass('fa-star');
+            $startIcon.remove();
+            $this.prepend(spriteIcon('star'));
           }
         }
 
diff --git a/app/views/projects/buttons/_star.html.haml b/app/views/projects/buttons/_star.html.haml
index c82ae35a685..0a54c736761 100644
--- a/app/views/projects/buttons/_star.html.haml
+++ b/app/views/projects/buttons/_star.html.haml
@@ -1,10 +1,10 @@
 - if current_user
   = link_to toggle_star_project_path(@project), { class: 'btn star-btn toggle-star', method: :post, remote: true } do
     - if current_user.starred?(@project)
-      = icon('star')
+      = sprite_icon('star')
       %span.starred= _('Unstar')
     - else
-      = icon('star-o')
+      = sprite_icon('star-o')
       %span= s_('StarProject|Star')
   .count-with-arrow
     %span.arrow
@@ -13,7 +13,7 @@
 
 - else
   = link_to new_user_session_path, class: 'btn has-tooltip star-btn', title: _('You must sign in to star a project') do
-    = icon('star')
+    = sprite_icon('star')
     #{ s_('StarProject|Star') }
   .count-with-arrow
     %span.arrow
diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml
index 059dd24be6d..321d8767d08 100644
--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
@@ -9,7 +9,7 @@
     .controls.hidden-xs
       - if can?(current_user, :admin_group, group)
         = link_to edit_group_path(group), class: "btn" do
-          = icon('cogs')
+          = sprite_icon('settings')
 
       = link_to leave_group_group_members_path(group), data: { confirm: leave_confirmation_message(group) }, method: :delete, class: "btn", title: s_("GroupsTree|Leave this group") do
         = icon('sign-out')
-- 
cgit v1.2.1


From 9549726ff0dc519e265259f919ce5cf213d50257 Mon Sep 17 00:00:00 2001
From: Chenjerai Katanda <ckatanda@gitlab.com>
Date: Thu, 23 Nov 2017 09:17:09 +0000
Subject: Add redis and sentinel HA roles to CE docs

---
 doc/administration/high_availability/redis.md | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/doc/administration/high_availability/redis.md b/doc/administration/high_availability/redis.md
index 0e92f7c5a34..1641022dedc 100644
--- a/doc/administration/high_availability/redis.md
+++ b/doc/administration/high_availability/redis.md
@@ -268,9 +268,8 @@ The prerequisites for a HA Redis setup are the following:
 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
 
     ```ruby
-    # Enable the master role and disable all other services in the machine
-    # (you can still enable Sentinel).
-    redis_master_role['enable'] = true
+    # Specify server role as 'redis_master_role'
+    roles ['redis_master_role']
 
     # IP address pointing to a local IP that the other machines can reach to.
     # You can also set bind to '0.0.0.0' which listen in all interfaces.
@@ -296,6 +295,10 @@ The prerequisites for a HA Redis setup are the following:
 
 1. [Reconfigure Omnibus GitLab][reconfigure] for the changes to take effect.
 
+> Note: You can specify multiple roles like sentinel and redis as: 
+> roles ['redis_sentinel_role', 'redis_master_role']. Read more about high 
+> availability roles at https://docs.gitlab.com/omnibus/roles/
+
 ### Step 2. Configuring the slave Redis instances
 
 1. SSH into the **slave** Redis server.
@@ -308,10 +311,8 @@ The prerequisites for a HA Redis setup are the following:
 1. Edit `/etc/gitlab/gitlab.rb` and add the contents:
 
     ```ruby
-    # Enable the slave role and disable all other services in the machine
-    # (you can still enable Sentinel). This will also set automatically
-    # `redis['master'] = false`.
-    redis_slave_role['enable'] = true
+    # Specify server role as 'redis_slave_role'
+    roles ['redis_slave_role']
 
     # IP address pointing to a local IP that the other machines can reach to.
     # You can also set bind to '0.0.0.0' which listen in all interfaces.
@@ -345,6 +346,10 @@ The prerequisites for a HA Redis setup are the following:
 1. [Reconfigure Omnibus GitLab][reconfigure] for the changes to take effect.
 1. Go through the steps again for all the other slave nodes.
 
+> Note: You can specify multiple roles like sentinel and redis as: 
+> roles ['redis_sentinel_role', 'redis_slave_role']. Read more about high 
+> availability roles at https://docs.gitlab.com/omnibus/roles/
+
 ---
 
 These values don't have to be changed again in `/etc/gitlab/gitlab.rb` after
@@ -392,7 +397,7 @@ multiple machines with the Sentinel daemon.
    be duplicate below):
 
     ```ruby
-    redis_sentinel_role['enable'] = true
+    roles ['redis_sentinel_role']
 
     # Must be the same in every sentinel node
     redis['master_name'] = 'gitlab-redis'
-- 
cgit v1.2.1