From: Tom Hughes <tom@compton.nu>
Date: Wed, 26 Jun 2019 13:07:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2279'
X-Git-Tag: live~3546
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/899fc66a62b036adcfd59f5da80c7fc6f30cd3a8?hp=f280dcb2d798b3dfd4aad345a1ab7efa10d8bbe4

Merge remote-tracking branch 'upstream/pull/2279'
---

diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index 3180cabcc..d765b4904 100644
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -13,7 +13,7 @@ module Api
 
     def show
       if @user.visible?
-        render :action => :show, :content_type => "text/xml"
+        render :content_type => "text/xml"
       else
         head :gone
       end
@@ -33,7 +33,7 @@ module Api
 
       @users = User.visible.find(ids)
 
-      render :action => :index, :content_type => "text/xml"
+      render :content_type => "text/xml"
     end
 
     def gpx_files
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 471e9f3c5..57ac07501 100644
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -126,7 +126,7 @@ class SiteController < ApplicationController
       :style_src => %w['unsafe-inline']
     )
 
-    render "id", :layout => false
+    render :layout => false
   end
 
   private