diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-16 15:23:36 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-16 15:23:36 -0500 |
| commit | 30d578f6345c3807158e16eb73b28f290e416d16 (patch) | |
| tree | d699ad98ea5284771eaed67365376551980a3df4 /config | |
| parent | dc42d52a17bef5bdaa91f5d0e4f213664d23af49 (diff) | |
| parent | f7e08ad0de580e9f27ad5301542f2913c6bb2bff (diff) | |
| download | gitlab-ce-30d578f6345c3807158e16eb73b28f290e416d16.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18681-pipelines-merge-request
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 634ca35b5b4..b57d42ee846 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -528,6 +528,11 @@ Rails.application.routes.draw do put '/update/*id', to: 'blob#update', constraints: { id: /.+/ }, as: 'update_blob' post '/preview/*id', to: 'blob#preview', constraints: { id: /.+/ }, as: 'preview_blob' + # + # Templates + # + get '/templates/:template_type/:key' => 'templates#show', as: :template + scope do get( '/blob/*id/diff', |