diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-11 16:06:56 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-11 16:06:56 +0000 |
| commit | 5a33bc984abfb4ee6243c00bbcc71ccd086d2266 (patch) | |
| tree | 493ae70072eb30de51a6682c9630b6604c33c8c3 /config | |
| parent | 4c29c25497c9a20a5d1f57cd287123cd41edad96 (diff) | |
| parent | ecb3f1eb6c87ab40108a5d71a3287a205ab6fefb (diff) | |
| download | gitlab-ce-5a33bc984abfb4ee6243c00bbcc71ccd086d2266.tar.gz | |
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 'config')
| -rw-r--r-- | config/routes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index 99a2cd884fe..9a98fab15a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -468,7 +468,7 @@ Rails.application.routes.draw do post :unarchive post :housekeeping post :toggle_star - post :markdown_preview + post :preview_markdown post :export post :remove_export post :generate_new_export @@ -672,7 +672,7 @@ Rails.application.routes.draw do get '/wikis/*id', to: 'wikis#show', as: 'wiki', constraints: WIKI_SLUG_ID delete '/wikis/*id', to: 'wikis#destroy', constraints: WIKI_SLUG_ID put '/wikis/*id', to: 'wikis#update', constraints: WIKI_SLUG_ID - post '/wikis/*id/markdown_preview', to: 'wikis#markdown_preview', constraints: WIKI_SLUG_ID, as: 'wiki_markdown_preview' + post '/wikis/*id/preview_markdown', to: 'wikis#preview_markdown', constraints: WIKI_SLUG_ID, as: 'wiki_preview_markdown' end resource :repository, only: [:create] do |