diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 10:03:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 10:03:30 +0000 |
| commit | d35df0ad158c14cb28f583f4b26c4196ef23a3f7 (patch) | |
| tree | 5a1992758772519104eacb5de2c231721876541c /app/helpers | |
| parent | 3c51da6f5782e53123a7ed5af98ba0828cbfa49f (diff) | |
| download | gitlab-ce-d35df0ad158c14cb28f583f4b26c4196ef23a3f7.tar.gz | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/explore_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/tree_helper.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb index b66c7a69b71..026dbd60ac6 100644 --- a/app/helpers/explore_helper.rb +++ b/app/helpers/explore_helper.rb @@ -52,7 +52,7 @@ module ExploreHelper end def public_visibility_restricted? - Gitlab::CurrentSettings.restricted_visibility_levels&.include? Gitlab::VisibilityLevel::PUBLIC + Gitlab::VisibilityLevel.public_visibility_restricted? end private diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb index 0b50b8b1130..4dc00581703 100644 --- a/app/helpers/tree_helper.rb +++ b/app/helpers/tree_helper.rb @@ -194,6 +194,7 @@ module TreeHelper project_path: project.full_path, project_short_path: project.path, ref: ref, + escaped_ref: ActionDispatch::Journey::Router::Utils.escape_path(ref), full_name: project.name_with_namespace } end |