diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-05 18:09:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-05 18:09:12 +0300 |
commit | e2937892231e082f4981c31e25cb8d1cca36ea60 (patch) | |
tree | a543551ce5980395b9ee826c78e83d4d9c1ae9d4 /app/helpers | |
parent | fdb953945da752dc52c1957f64a179de39f507e5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/ide_helper.rb | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/app/helpers/ide_helper.rb b/app/helpers/ide_helper.rb index 93f5ca7258d..5f0d513ba35 100644 --- a/app/helpers/ide_helper.rb +++ b/app/helpers/ide_helper.rb @@ -3,18 +3,31 @@ module IdeHelper def ide_data { - "empty-state-svg-path" => image_path('illustrations/multi_file_editor_empty.svg'), - "no-changes-state-svg-path" => image_path('illustrations/multi-editor_no_changes_empty.svg'), - "committed-state-svg-path" => image_path('illustrations/multi-editor_all_changes_committed_empty.svg'), - "pipelines-empty-state-svg-path": image_path('illustrations/pipelines_empty.svg'), - "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.md'), - "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 + 'empty-state-svg-path' => image_path('illustrations/multi_file_editor_empty.svg'), + 'no-changes-state-svg-path' => image_path('illustrations/multi-editor_no_changes_empty.svg'), + 'committed-state-svg-path' => image_path('illustrations/multi-editor_all_changes_committed_empty.svg'), + 'pipelines-empty-state-svg-path': image_path('illustrations/pipelines_empty.svg'), + '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.md'), + '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, + 'branch-name' => @branch, + 'file-path' => @path, + 'merge-request' => @merge_request, + 'forked-project' => convert_to_project_entity_json(@forked_project), + 'project' => convert_to_project_entity_json(@project) } end + + private + + def convert_to_project_entity_json(project) + return unless project + + API::Entities::Project.represent(project).to_json + end end ::IdeHelper.prepend_if_ee('::EE::IdeHelper') |