diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-08-16 22:32:41 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-19 09:23:36 +0300 |
| commit | bce14db6f977c46840597b1d22de79a789fcf39a (patch) | |
| tree | 986e19e29610338087c924e527794a0559c5525d /config | |
| parent | 78c5927031b8181e4fa3824676a552ebfaf42bab (diff) | |
Merge branch 'issue_18656' into 'master'
Load issue templates from repository
part of #18656
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4981
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 ff4b8f25cc7..66f77aee06a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -530,6 +530,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', |