Commit 6b61c904 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'markdown-preview-via-post' into 'master'

Don't have Markdown preview fail for long comments/wiki pages.

See https://github.com/gitlabhq/gitlabhq/issues/8611.

See merge request !1479
parents 07715ce5 639c93b4
...@@ -63,6 +63,7 @@ v 7.8.0 ...@@ -63,6 +63,7 @@ v 7.8.0
- -
- API: Add support for editing an existing project (Mika Mäenpää and Hannes Rosenögger) - API: Add support for editing an existing project (Mika Mäenpää and Hannes Rosenögger)
- -
- Don't have Markdown preview fail for long comments/wiki pages.
- -
- When test web hook - show error message instead of 500 error page if connection to hook url was reset - When test web hook - show error message instead of 500 error page if connection to hook url was reset
- Added support for firing system hooks on group create/destroy and adding/removing users to group (Boyan Tabakov) - Added support for firing system hooks on group create/destroy and adding/removing users to group (Boyan Tabakov)
......
...@@ -50,7 +50,7 @@ class @DropzoneInput ...@@ -50,7 +50,7 @@ class @DropzoneInput
preview.text "Nothing to preview." preview.text "Nothing to preview."
else else
preview.text "Loading..." preview.text "Loading..."
$.get($(this).data("url"), $.post($(this).data("url"),
md_text: mdText md_text: mdText
).success (previewData) -> ).success (previewData) ->
preview.html previewData preview.html previewData
......
...@@ -220,7 +220,7 @@ Gitlab::Application.routes.draw do ...@@ -220,7 +220,7 @@ Gitlab::Application.routes.draw do
post :unarchive post :unarchive
post :upload_image post :upload_image
post :toggle_star post :toggle_star
get :markdown_preview post :markdown_preview
get :autocomplete_sources get :autocomplete_sources
end end
......
...@@ -60,7 +60,7 @@ end ...@@ -60,7 +60,7 @@ end
# project GET /:id(.:format) projects#show # project GET /:id(.:format) projects#show
# PUT /:id(.:format) projects#update # PUT /:id(.:format) projects#update
# DELETE /:id(.:format) projects#destroy # DELETE /:id(.:format) projects#destroy
# markdown_preview_project GET /:id/markdown_preview(.:format) projects#markdown_preview # markdown_preview_project POST /:id/markdown_preview(.:format) projects#markdown_preview
describe ProjectsController, 'routing' do describe ProjectsController, 'routing' do
it 'to #create' do it 'to #create' do
post('/projects').should route_to('projects#create') post('/projects').should route_to('projects#create')
...@@ -91,7 +91,7 @@ describe ProjectsController, 'routing' do ...@@ -91,7 +91,7 @@ describe ProjectsController, 'routing' do
end end
it 'to #markdown_preview' do it 'to #markdown_preview' do
get('/gitlab/gitlabhq/markdown_preview').should( post('/gitlab/gitlabhq/markdown_preview').should(
route_to('projects#markdown_preview', id: 'gitlab/gitlabhq') route_to('projects#markdown_preview', id: 'gitlab/gitlabhq')
) )
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment