diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-28 11:32:40 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-28 11:32:40 +0100 |
| commit | cde3760bb4aa4c9abe45aad301d4334936be74ba (patch) | |
| tree | 4e3673ca4fcf40525d136a8d8eb3ae002488b419 /config | |
| parent | f74d0ba195079260d3b3217cd72b2fd9b0483c00 (diff) | |
| parent | ef518df28adc1366d868cb990952e87f60e8b0eb (diff) | |
| download | gitlab-ce-cde3760bb4aa4c9abe45aad301d4334936be74ba.tar.gz | |
Merge branch 'master' into balsalmiq-support
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 2 |
1 files changed, 1 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 |