Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-04-04

# Conflicts:
#	app/assets/javascripts/pages/groups/issues/index.js
#	app/views/admin/application_settings/show.html.haml
#	doc/user/project/labels.md

[ci skip]

app/assets/javascripts/pages/groups/issues/index.js

@@ -6,7 +6,10 @@ import FilteredSearchTokenKeysIssues from 'ee/filtered_search/filtered_search_to
 document.addEventListener('DOMContentLoaded', () => {
   initFilteredSearch({
     page: FILTERED_SEARCH.ISSUES,
+<<<<<<< HEAD
     filteredSearchTokenKeys: FilteredSearchTokenKeysIssues,
+=======
+>>>>>>> upstream/master
     isGroupDecendent: true,
   });
   projectSelect();

app/helpers/tree_helper.rb

@@ -123,7 +123,7 @@ module TreeHelper
 
   # returns the relative path of the first subdir that doesn't have only one directory descendant
   def flatten_tree(root_path, tree)
-    return tree.flat_path.sub(%r{\A#{root_path}/}, '') if tree.flat_path.present?
+    return tree.flat_path.sub(%r{\A#{Regexp.escape(root_path)}/}, '') if tree.flat_path.present?
 
     subtree = Gitlab::Git::Tree.where(@repository, @commit.id, tree.path)
     if subtree.count == 1 && subtree.first.dir?

app/views/admin/application_settings/show.html.haml

@@ -302,6 +302,7 @@
       = _('Allow requests to the local network from hooks and services.')
   .settings-content
     = render 'outbound'
+<<<<<<< HEAD
 
 -# EE-only
 - if Gitlab::Geo.license_allows?
@@ -363,3 +364,5 @@
         = _('Geo allows you to replicate your GitLab instance to other geographical locations.')
     .settings-content
       = render partial: 'slack'
+=======
+>>>>>>> upstream/master

changelogs/unreleased/dm-flatten-tree-plus-chars.yml

+---
+title: Fix links to subdirectories of a directory with a plus character in its path
+merge_request:
+author:
+type: fixed

changelogs/unreleased/zj-opt-out-delete-refs.yml

+---
+title: Bulk deleting refs is handled by Gitaly by default
+merge_request:
+author:
+type: performance

doc/user/project/labels.md

@@ -78,10 +78,15 @@ Every issue and merge request can be assigned any number of labels. The labels a
 ### Filtering in list pages
 
 From the project issue list page and the project merge request list page, you can [filter](../search/index.md#issues-and-merge-requests) by both group (including subgroup ancestors) labels and project labels.
+<<<<<<< HEAD
 
 From the group issue list page and the group merge request list page, you can [filter](../search/index.md#issues-and-merge-requests) by both group labels (including subgroup ancestors and subgroup descendants) and project labels.
 
 From the group epic list page, you can [filter](../search/index.md#issues-and-merge-requests) by both current group labels as well as decendent group labels.
+=======
+
+From the group issue list page and the group merge request list page, you can [filter](../search/index.md#issues-and-merge-requests) by both group labels (including subgroup ancestors and subgroup descendants) and project labels.
+>>>>>>> upstream/master
 
 ![Labels group issues](img/labels_group_issues.png)
 

lib/gitlab/git/repository.rb

@@ -885,7 +885,8 @@ module Gitlab
       end
 
       def delete_refs(*ref_names)
-        gitaly_migrate(:delete_refs) do |is_enabled|
+        gitaly_migrate(:delete_refs,
+                      status: Gitlab::GitalyClient::MigrationStatus::OPT_OUT) do |is_enabled|
           if is_enabled
             gitaly_delete_refs(*ref_names)
           else

spec/features/projects/issues/user_sorts_issues_spec.rb

@@ -25,17 +25,14 @@ describe "User sorts issues" do
     page.within(".issues-list") do
       page.within("li.issue:nth-child(1)") do
         expect(page).to have_content(issue1.title)
-        expect(page).to have_content("2 1")
       end
 
       page.within("li.issue:nth-child(2)") do
         expect(page).to have_content(issue2.title)
-        expect(page).to have_content("1 2")
       end
 
       page.within("li.issue:nth-child(3)") do
         expect(page).to have_content(issue3.title)
-        expect(page).not_to have_content("0 0")
       end
     end
   end

spec/helpers/tree_helper_spec.rb

@@ -8,6 +8,7 @@ describe TreeHelper do
   describe '.render_tree' do
     before do
       @id = sha
+      @path = ""
       @project = project
       @lfs_blob_ids = []
     end
@@ -61,6 +62,15 @@ describe TreeHelper do
         end
       end
     end
+
+    context 'when the root path contains a plus character' do
+      let(:root_path) { 'gtk/C++' }
+      let(:tree_item) { double(flat_path: 'gtk/C++/glade') }
+
+      it 'returns the flattened path' do
+        expect(subject).to eq('glade')
+      end
+    end
   end
 
   describe '#commit_in_single_accessible_branch' do