diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-04-07 00:17:21 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-04-07 00:17:21 +0000 |
| commit | 730625f022b1c3b9394cf944f04968a29ac8dc36 (patch) | |
| tree | bf1dea34bd2b412bbd42102423f177859bfce2e6 /config | |
| parent | 7c6c933c9f7d52b7b78ce5f9656c65fb65d64f35 (diff) | |
| parent | 1575a95b65d4cad91f775ae260b8828cdf303462 (diff) | |
| download | gitlab-ce-730625f022b1c3b9394cf944f04968a29ac8dc36.tar.gz | |
Merge branch 'patch/fix-markdown-preview-wikis' into 'master'
Wiki preview URL converting problem [via Markdown]
Current implementation when rendering the preview, thinks relative links are for project repository files.
We are creating a new preview route that will define correct context data to render for wikis instead.
Fixes #2380, #1184
See merge request !3461
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 6bf22fb4456..e57c04595f6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -575,6 +575,7 @@ Rails.application.routes.draw do # Order matters to give priority to these matches get '/wikis/git_access', to: 'wikis#git_access' get '/wikis/pages', to: 'wikis#pages', as: 'wiki_pages' + post '/wikis/markdown_preview', to:'wikis#markdown_preview' post '/wikis', to: 'wikis#create' get '/wikis/*id/history', to: 'wikis#history', as: 'wiki_history', constraints: WIKI_SLUG_ID |