diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 00:09:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-13 00:09:45 +0300 |
commit | dd4bee69b7d55620f7dc9db8c36b478bd4959755 (patch) | |
tree | 78ba4c486ad8aa2d5effaccf23241ffb6c6dde26 /app/helpers | |
parent | ce8a0b90849ac5d1895e741c023432930f24d724 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/blob_helper.rb | 4 | ||||
-rw-r--r-- | app/helpers/ide_helper.rb | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 9c09ddafbf1..cc5ae32856a 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -353,4 +353,8 @@ module BlobHelper def suggest_pipeline_commit_cookie_name "suggest_gitlab_ci_yml_commit_#{@project.id}" end + + def human_access + @project.team.human_max_access(current_user&.id).try(:downcase) + end end diff --git a/app/helpers/ide_helper.rb b/app/helpers/ide_helper.rb index e4d0e605254..d6145493ba6 100644 --- a/app/helpers/ide_helper.rb +++ b/app/helpers/ide_helper.rb @@ -10,8 +10,9 @@ module IdeHelper "promotion-svg-path": image_path('illustrations/web-ide_promotion.svg'), "ci-help-page-path" => help_page_path('ci/quick_start/README'), "web-ide-help-page-path" => help_page_path('user/project/web_ide/index.html'), - "clientside-preview-enabled": Gitlab::CurrentSettings.current_application_settings.web_ide_clientside_preview_enabled.to_s, - "render-whitespace-in-code": current_user.render_whitespace_in_code.to_s + "clientside-preview-enabled": Gitlab::CurrentSettings.web_ide_clientside_preview_enabled?.to_s, + "render-whitespace-in-code": current_user.render_whitespace_in_code.to_s, + "codesandbox-bundler-url": Gitlab::CurrentSettings.web_ide_clientside_preview_bundler_url } end end |