Merge remote-tracking branch 'upstream/pull/2207'
authorTom Hughes <tom@compton.nu>
Wed, 26 Jun 2019 13:30:30 +0000 (14:30 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 26 Jun 2019 13:30:30 +0000 (14:30 +0100)
commitcbea796ef412840af9a3ec2fd26bf08657fc4cd3
tree10604a5a4de7b6af5182af5cea0447cfcce01b66
parent899fc66a62b036adcfd59f5da80c7fc6f30cd3a8
parentc24b0e93997bcd6bcad475d9ba0adfe86fa01ea6
Merge remote-tracking branch 'upstream/pull/2207'
app/controllers/api/users_controller.rb
app/models/trace.rb
test/controllers/api/traces_controller_test.rb