diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-28 18:03:03 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-28 18:03:03 +0300 |
| commit | 3a3cf07f93b6b902f9a8a3ebb6dfeb6eaf12ae18 (patch) | |
| tree | 116a816924013a0babc411ceb57ad3aa56ce6fc4 /config | |
| parent | 97633d561681a5c0f55472c1372bedca5fe3bffe (diff) | |
| parent | 61046e75d8e6f660e55f4f7b5a76238611a0f48f (diff) | |
Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 2 | ||||
| -rw-r--r-- | config/routes/snippets.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index fa92202c1ea..115ae2324b3 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -173,7 +173,7 @@ constraints(ProjectUrlConstrainer.new) do post :retry post :play post :erase - get :trace + get :trace, defaults: { format: 'json' } get :raw end diff --git a/config/routes/snippets.rb b/config/routes/snippets.rb index ce0d1314292..56534f677be 100644 --- a/config/routes/snippets.rb +++ b/config/routes/snippets.rb @@ -3,6 +3,7 @@ resources :snippets, concerns: :awardable do get 'raw' get 'download' post :mark_as_spam + post :preview_markdown end end |