diff options
| author | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-03 15:20:11 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <zegerjan@gitlab.com> | 2016-06-03 15:20:11 +0200 |
| commit | 9d491712cfe33286329524fb39dc5bf8e4c8affd (patch) | |
| tree | 0e99ae15e613d5971ba9e7c7ffcdd51e37a2f725 /app/controllers/projects/wikis_controller.rb | |
| parent | fab695461afbc4d03fbbf8cfbf9c5d90760ce752 (diff) | |
| parent | ca3c5c295ed653b483fe81c3918ffe60f46666b9 (diff) | |
| download | gitlab-ce-awardables.tar.gz | |
Merge branch 'master' into awardablesawardables
Diffstat (limited to 'app/controllers/projects/wikis_controller.rb')
| -rw-r--r-- | app/controllers/projects/wikis_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 0d6c32fabd2..4b404eb03fa 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -91,8 +91,8 @@ class Projects::WikisController < Projects::ApplicationController def markdown_preview text = params[:text] - ext = Gitlab::ReferenceExtractor.new(@project, current_user, current_user) - ext.analyze(text) + ext = Gitlab::ReferenceExtractor.new(@project, current_user) + ext.analyze(text, author: current_user) render json: { body: view_context.markdown(text, pipeline: :wiki, project_wiki: @project_wiki), |