diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2019-03-14 10:18:18 +0100 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-04-10 11:49:06 -0700 |
commit | c57529556c2ba3053e3a622efc2f5b6eeaabe009 (patch) | |
tree | 1cb928c3fa9c214f083e2f8b1ccc292ebda438db /spec/lib/gitlab | |
parent | ddab30ad3561c6834fd779458ce89084c8a95ca5 (diff) | |
download | gitlab-ce-c57529556c2ba3053e3a622efc2f5b6eeaabe009.tar.gz |
Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"tz-revert-new-emojis-loading
Reverts the loading of emojis and its images to move forward with RC
Diffstat (limited to 'spec/lib/gitlab')
-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 71e69a0d418..857862a2abd 100644 --- a/spec/lib/gitlab/path_regex_spec.rb +++ b/spec/lib/gitlab/path_regex_spec.rb @@ -107,7 +107,7 @@ describe Gitlab::PathRegex do git = Gitlab.config.git.bin_path tracked = `cd #{Rails.root} && #{git} ls-files public` .split("\n") - .map { |entry| entry.start_with?('public/-/') ? '-' : entry.gsub('public/', '') } + .map { |entry| entry.gsub('public/', '') } .uniq tracked + %w(assets uploads) end |