Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-28 13:32:40 +0300
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-28 13:32:40 +0300
commitcde3760bb4aa4c9abe45aad301d4334936be74ba (patch)
tree4e3673ca4fcf40525d136a8d8eb3ae002488b419 /config
parentf74d0ba195079260d3b3217cd72b2fd9b0483c00 (diff)
parentef518df28adc1366d868cb990952e87f60e8b0eb (diff)
Merge branch 'master' into balsalmiq-support
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb2
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