summaryrefslogtreecommitdiff
path: root/app/helpers/ide_helper.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-16 21:08:30 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-16 21:08:30 +0000
commitaf11eb63cf4eaab8801416cc4a65f0bd4fad8817 (patch)
tree1159645ca9b4034aaac935c4b62752ff3f28b7e8 /app/helpers/ide_helper.rb
parent0122d00cac3c058508a2fcb258f12ecfb7bc9055 (diff)
downloadgitlab-ce-af11eb63cf4eaab8801416cc4a65f0bd4fad8817.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/ide_helper.rb')
-rw-r--r--app/helpers/ide_helper.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/ide_helper.rb b/app/helpers/ide_helper.rb
index aa2c8ad3719..0e81cea8ac7 100644
--- a/app/helpers/ide_helper.rb
+++ b/app/helpers/ide_helper.rb
@@ -7,7 +7,10 @@ module IdeHelper
'use-new-web-ide' => use_new_web_ide?.to_s,
'new-web-ide-help-page-path' => help_page_path('user/project/web_ide/index.md', anchor: 'vscode-reimplementation'),
'user-preferences-path' => profile_preferences_path,
- 'branch-name' => @branch
+ 'branch-name' => @branch,
+ 'file-path' => @path,
+ 'fork-info' => @fork_info&.to_json,
+ 'merge-request' => @merge_request
}.merge(use_new_web_ide? ? new_ide_data : legacy_ide_data)
end
@@ -44,9 +47,6 @@ module IdeHelper
'render-whitespace-in-code': current_user.render_whitespace_in_code.to_s,
'codesandbox-bundler-url': Gitlab::CurrentSettings.web_ide_clientside_preview_bundler_url,
'default-branch' => @project && @project.default_branch,
- 'file-path' => @path,
- 'merge-request' => @merge_request,
- 'fork-info' => @fork_info&.to_json,
'project' => convert_to_project_entity_json(@project),
'enable-environments-guidance' => enable_environments_guidance?.to_s,
'preview-markdown-path' => @project && preview_markdown_path(@project),