Commit 2c84eb5c authored by Stan Hu's avatar Stan Hu

Merge branch 'ce-to-ee-2018-04-04' into 'master'

CE upstream - 2018-04-04 18:26 UTC

See merge request gitlab-org/gitlab-ee!5232
parents 55a0095b 62776a45
...@@ -123,7 +123,7 @@ module TreeHelper ...@@ -123,7 +123,7 @@ module TreeHelper
# returns the relative path of the first subdir that doesn't have only one directory descendant # returns the relative path of the first subdir that doesn't have only one directory descendant
def flatten_tree(root_path, tree) 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) subtree = Gitlab::Git::Tree.where(@repository, @commit.id, tree.path)
if subtree.count == 1 && subtree.first.dir? if subtree.count == 1 && subtree.first.dir?
......
---
title: Fix links to subdirectories of a directory with a plus character in its path
merge_request:
author:
type: fixed
---
title: Bulk deleting refs is handled by Gitaly by default
merge_request:
author:
type: performance
...@@ -885,7 +885,8 @@ module Gitlab ...@@ -885,7 +885,8 @@ module Gitlab
end end
def delete_refs(*ref_names) 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 if is_enabled
gitaly_delete_refs(*ref_names) gitaly_delete_refs(*ref_names)
else else
......
...@@ -25,17 +25,14 @@ describe "User sorts issues" do ...@@ -25,17 +25,14 @@ describe "User sorts issues" do
page.within(".issues-list") do page.within(".issues-list") do
page.within("li.issue:nth-child(1)") do page.within("li.issue:nth-child(1)") do
expect(page).to have_content(issue1.title) expect(page).to have_content(issue1.title)
expect(page).to have_content("2 1")
end end
page.within("li.issue:nth-child(2)") do page.within("li.issue:nth-child(2)") do
expect(page).to have_content(issue2.title) expect(page).to have_content(issue2.title)
expect(page).to have_content("1 2")
end end
page.within("li.issue:nth-child(3)") do page.within("li.issue:nth-child(3)") do
expect(page).to have_content(issue3.title) expect(page).to have_content(issue3.title)
expect(page).not_to have_content("0 0")
end end
end end
end end
......
...@@ -8,6 +8,7 @@ describe TreeHelper do ...@@ -8,6 +8,7 @@ describe TreeHelper do
describe '.render_tree' do describe '.render_tree' do
before do before do
@id = sha @id = sha
@path = ""
@project = project @project = project
@lfs_blob_ids = [] @lfs_blob_ids = []
end end
...@@ -61,6 +62,15 @@ describe TreeHelper do ...@@ -61,6 +62,15 @@ describe TreeHelper do
end end
end 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 end
describe '#commit_in_single_accessible_branch' do describe '#commit_in_single_accessible_branch' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment