diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-15 16:55:07 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-03-15 16:55:07 +0200 |
| commit | 71ab011a1711db9a1a9ced2c2c92c8427ae6f624 (patch) | |
| tree | 95e38662d7f022061c2c809f4b6c53067a5df468 /config | |
| parent | 4f23c30ace844cdcd2c59da1a758c8a6788ca6f3 (diff) | |
| parent | d69a37e0b7163f5a03fcc58fdb6ec0ed1eb20862 (diff) | |
| download | gitlab-ce-71ab011a1711db9a1a9ced2c2c92c8427ae6f624.tar.gz | |
Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into DanKnox-use_gollum_wikis
Conflicts:
app/views/layouts/project_resource.html.haml
app/views/wikis/edit.html.haml
app/views/wikis/pages.html.haml
app/views/wikis/show.html.haml
spec/features/gitlab_flavored_markdown_spec.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 27977ae30a9..2e6d31c23e1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -185,6 +185,8 @@ Gitlab::Application.routes.draw do resources :wikis, only: [:show, :edit, :destroy, :create] do collection do get :pages + put ':id' => 'wikis#update' + get :git_access end member do |