diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 06:06:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-23 06:06:01 +0300 |
commit | 8c7eab92cd0009f55cb999bbade43e0f969c137e (patch) | |
tree | 180cac6632448a211ddbe555191574c98e8dc385 /config/routes/wiki.rb | |
parent | dffeff5520e861dc6e7319b690c573186bbbd22e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/routes/wiki.rb')
-rw-r--r-- | config/routes/wiki.rb | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/config/routes/wiki.rb b/config/routes/wiki.rb index d439c99270e..3e71c5eb924 100644 --- a/config/routes/wiki.rb +++ b/config/routes/wiki.rb @@ -1,13 +1,21 @@ scope(controller: :wikis) do + scope(path: 'wikis/pages', as: :wiki_pages, format: false) do + get :new, to: 'wiki_pages#new' + post '/', to: 'wiki_pages#create' + end + scope(path: 'wikis', as: :wikis) do get :git_access get :pages - get :new - get '/', to: redirect('%{namespace_id}/%{project_id}/wikis/home') - post '/', to: 'wikis#create' + get '/', to: redirect('%{namespace_id}/%{project_id}/-/wiki_pages/home') + get '/*id', to: redirect('%{namespace_id}/%{project_id}/-/wiki_pages/%{id}') + end + + scope(path: '-/wiki_pages', as: :wiki_page, format: false) do + post '/', to: 'wiki_pages#create' end - scope(path: 'wikis/*id', as: :wiki, format: false) do + scope(path: '-/wiki_pages/*id', as: :wiki, format: false, controller: :wiki_pages) do get :edit get :history post :preview_markdown @@ -15,4 +23,8 @@ scope(controller: :wikis) do put '/', action: :update delete '/', action: :destroy end + + scope(path: '-/wiki_dirs/*id', as: :wiki_dir, format: false, controller: :wiki_directories) do + get '/', action: :show + end end |