From 565fa11a26c6824b1c6072d2dc5459979345ee57 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 14 Oct 2019 21:06:30 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/lib/gitlab/path_regex_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/lib/gitlab') diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb index 0829a2b4334..3cbcae4cdeb 100644 --- a/spec/lib/gitlab/path_regex_spec.rb +++ b/spec/lib/gitlab/path_regex_spec.rb @@ -108,7 +108,7 @@ describe Gitlab::PathRegex do git = Gitlab.config.git.bin_path tracked = `cd #{Rails.root} && #{git} ls-files public` .split("\n") - .map { |entry| entry.gsub('public/', '') } + .map { |entry| entry.start_with?('public/-/') ? '-' : entry.gsub('public/', '') } .uniq tracked + %w(assets uploads) end -- cgit v1.2.1