diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 16:10:40 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-09 16:10:40 +0300 |
| commit | f6e9078fb608144f8686dcd8a36876416815757c (patch) | |
| tree | ab188423013edf0490432ea5b1dfa3eaeb36a0e1 /config/routes.rb | |
| parent | e5a4b26932dc97fc68a6c74a14db8724493f3499 (diff) | |
| parent | 30ee4ea6659c91ac6a249d700a9fcdd266676942 (diff) | |
| download | gitlab-ce-f6e9078fb608144f8686dcd8a36876416815757c.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 417289829db..4191ec3598c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -616,7 +616,6 @@ 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 @@ -625,6 +624,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' end resource :repository, only: [:show, :create] do |