diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-15 00:06:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-15 00:06:30 +0300 |
| commit | 565fa11a26c6824b1c6072d2dc5459979345ee57 (patch) | |
| tree | 2668b631d925341e121c06b7b77cfe12954a015a /spec/lib/gitlab/path_regex_spec.rb | |
| parent | 8c30d396c5a789080345303330069981aa06e4af (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/path_regex_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/path_regex_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |