diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-04-11 00:55:02 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-04-11 00:55:02 +0100 |
| commit | 3f73bdd837f9803b75eca484a0a0615db6c58c80 (patch) | |
| tree | 0bd2c99d9198bfa22e7a29f375131f940033da7b /app/helpers/tree_helper.rb | |
| parent | b594ab949d1a2ceb9d949ff2641679fbdf273452 (diff) | |
| parent | 37a5632483b67ddcfa4c535cc911319b25f01fb5 (diff) | |
| download | gitlab-ce-xterm-npm.tar.gz | |
Merge branch 'master' into xterm-npmxterm-npm
Diffstat (limited to 'app/helpers/tree_helper.rb')
| -rw-r--r-- | app/helpers/tree_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index b64be89c181..5e7c20ef51e 100644 --- a/app/helpers/tree_helper.rb +++ b/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? |