diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-04 00:08:17 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-04 00:08:17 +0000 |
| commit | 340fd2966e6565a549f8e611b25d2525fc6929d1 (patch) | |
| tree | bfe8876fe6f2a7c78b9e49feec0bf80d8d45bd52 /app/helpers/markup_helper.rb | |
| parent | fc92738a0245f1be88250448bebd9c20e9849444 (diff) | |
| download | gitlab-ce-340fd2966e6565a549f8e611b25d2525fc6929d1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
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 1a1daa297c6..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, - 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 ) |