diff options
author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-04-24 12:08:31 +0100 |
---|---|---|
committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-04-24 12:08:31 +0100 |
commit | 161a70fb3e2204d59ee79d17a162512e9738c680 (patch) | |
tree | 066836ea9f9145a5e9f0b35d28bdc569b635040f | |
parent | 5ce26c890ba0795f640edf404d2d31600bbf231b (diff) | |
download | gitlab-ce-12910-personal-snippet-prep-2-jej.tar.gz |
Explicit preview_markdown action instead of markdown_context method12910-personal-snippet-prep-2-jej
-rw-r--r-- | app/controllers/concerns/markdown_actions.rb | 10 | ||||
-rw-r--r-- | app/controllers/projects/wikis_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/projects_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/snippets_controller.rb | 8 |
4 files changed, 13 insertions, 13 deletions
diff --git a/app/controllers/concerns/markdown_actions.rb b/app/controllers/concerns/markdown_actions.rb index 447931f5f71..2c65579a556 100644 --- a/app/controllers/concerns/markdown_actions.rb +++ b/app/controllers/concerns/markdown_actions.rb @@ -1,9 +1,5 @@ module MarkdownActions - extend ActiveSupport::Concern - - def preview_markdown - text = params[:text] - + def render_markdown_preview(text, markdown_context = {}) render json: { body: view_context.markdown(text, markdown_context), references: { @@ -14,10 +10,6 @@ module MarkdownActions private - def markdown_context - {} - end - def preview_referenced_users(text) extractor = Gitlab::ReferenceExtractor.new(@project, current_user) extractor.analyze(text, author: current_user) diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index a8aa6e66237..a1043c87b07 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -96,6 +96,10 @@ class Projects::WikisController < Projects::ApplicationController def git_access end + def preview_markdown + render_markdown_preview(params[:text], markdown_context) + end + private def markdown_context diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index b529bbef68c..fe500d34993 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -217,6 +217,10 @@ class ProjectsController < Projects::ApplicationController } end + def preview_markdown + render_markdown_preview(params[:text]) + end + def refs branches = BranchesFinder.new(@repository, params).execute.map(&:name) diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index f7672bd0c8f..0b743ab4334 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -81,12 +81,12 @@ class SnippetsController < ApplicationController ) end - protected - - def review_context - { skip_project_check: true } + def preview_markdown + render_markdown_preview(params[:text], skip_project_check: true) end + protected + def snippet @snippet ||= if current_user PersonalSnippet.where("author_id = ? OR visibility_level IN (?)", |