diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-01 07:13:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-01 07:13:49 +0000 |
commit | fb58d337f0b8b6f685c1e94a9327d8d12ebfbf81 (patch) | |
tree | a285b8beb8303a81a7af0db968822fa05595e529 /app/helpers | |
parent | 3333112d46dd179a55295ebed754544a97b49b7f (diff) | |
download | gitlab-ce-fb58d337f0b8b6f685c1e94a9327d8d12ebfbf81.tar.gz |
Add latest changes from gitlab-org/gitlab@14-2-stable-ee
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/blob_helper.rb | 3 | ||||
-rw-r--r-- | app/helpers/ide_helper.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index eccd0e7a34c..c1a33794b50 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -220,7 +220,8 @@ module BlobHelper 'assets-prefix' => Gitlab::Application.config.assets.prefix, 'blob-filename' => @blob && @blob.path, 'project-id' => project.id, - 'is-markdown' => @blob && @blob.path && Gitlab::MarkupHelper.gitlab_markdown?(@blob.path) + 'is-markdown' => @blob && @blob.path && Gitlab::MarkupHelper.gitlab_markdown?(@blob.path), + 'preview-markdown-path' => preview_markdown_path(project) } end diff --git a/app/helpers/ide_helper.rb b/app/helpers/ide_helper.rb index 41c7abbbabd..09ff57e2baf 100644 --- a/app/helpers/ide_helper.rb +++ b/app/helpers/ide_helper.rb @@ -19,7 +19,8 @@ module IdeHelper '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 + 'enable-environments-guidance' => enable_environments_guidance?.to_s, + 'preview-markdown-path' => @project && preview_markdown_path(@project) } end |