Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-08-11 19:06:56 +0300
committerRobert Speicher <robert@gitlab.com>2016-08-11 19:06:56 +0300
commit5a33bc984abfb4ee6243c00bbcc71ccd086d2266 (patch)
tree493ae70072eb30de51a6682c9630b6604c33c8c3 /app/controllers/projects/wikis_controller.rb
parent4c29c25497c9a20a5d1f57cd287123cd41edad96 (diff)
parentecb3f1eb6c87ab40108a5d71a3287a205ab6fefb (diff)
Merge branch '15000-rename-markdown-preview' into 'master'
Rename `markdown_preview` routes to `preview_markdown` _Originally opened at !3700 by @cbartz._ Closes #15000. See merge request !5774
Diffstat (limited to 'app/controllers/projects/wikis_controller.rb')
-rw-r--r--app/controllers/projects/wikis_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb
index 607fe9c7fed..177ccf5eec9 100644
--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -91,7 +91,7 @@ class Projects::WikisController < Projects::ApplicationController
)
end
- def markdown_preview
+ def preview_markdown
text = params[:text]
ext = Gitlab::ReferenceExtractor.new(@project, current_user)