diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-06 10:21:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-06 10:21:05 +0000 |
| commit | e640481625a0d9076572b9431052a179a606e716 (patch) | |
| tree | 225b516e27f4e0c888ae0e4cff01904384e3f525 /config/routes.rb | |
| parent | 478d6bd479bd1d25b8b7716b4badcbedacc8bcbf (diff) | |
| parent | 00cd3ecc44a6c6d29565c95cd5173c8e5de35537 (diff) | |
| download | gitlab-ce-e640481625a0d9076572b9431052a179a606e716.tar.gz | |
Merge branch 'files_in_wiki' into 'master'
Add support to show files from wiki repository on wiki pages
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 910c9ec2393..7a33686b810 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -206,7 +206,7 @@ Gitlab::Application.routes.draw do end end - resources :wikis, only: [:show, :edit, :destroy, :create], constraints: {id: /[a-zA-Z.0-9_\-]+/} do + resources :wikis, only: [:show, :edit, :destroy, :create], constraints: {id: /[a-zA-Z.0-9_\-\/]+/} do collection do get :pages put ':id' => 'wikis#update' |