diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
| commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
| tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/helpers/markup_helper.rb | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
| download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/helpers/markup_helper.rb')
| -rw-r--r-- | app/helpers/markup_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb index 4f66356c27e..7ab2b33de8c 100644 --- a/app/helpers/markup_helper.rb +++ b/app/helpers/markup_helper.rb @@ -129,8 +129,8 @@ module MarkupHelper context.merge!( pipeline: :wiki, project: @project, - project_wiki: @project_wiki, - repository: @project_wiki.repository, + wiki: @wiki, + repository: @wiki.repository, page_slug: wiki_page.slug, issuable_state_filter_enabled: true ) @@ -300,7 +300,7 @@ module MarkupHelper # RepositoryLinkFilter and UploadLinkFilter commit: @commit, - project_wiki: @project_wiki, + wiki: @wiki, ref: @ref, requested_path: @path ) |