Remove unnecessary layout calls from api controllers

These were left over from the refactoring of the controllers into api and non-api versions.

diff --git a/app/controllers/api/changesets_controller.rb b/app/controllers/api/changesets_controller.rb
index 31601522877dce62e24ee81bbd91a385eededa8a..a5a37b485868f8e986053cd723b17e0b671f5710 100644 (file)
--- a/app/controllers/api/changesets_controller.rb
+++ b/app/controllers/api/changesets_controller.rb
@@ -2,7 +2,6 @@
 
 module Api
   class ChangesetsController < ApiController
 
 module Api
   class ChangesetsController < ApiController

-    layout "site"

     require "xml/libxml"
 
     before_action :authorize, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe]
     require "xml/libxml"
 
     before_action :authorize, :only => [:create, :update, :upload, :close, :subscribe, :unsubscribe]

diff --git a/app/controllers/api/notes_controller.rb b/app/controllers/api/notes_controller.rb
index a73240e5fabc4f849780cbcb9e2dd42a26c30352..cd71b437457e302f2e33c13d6faf90f9761c5e6f 100644 (file)
--- a/app/controllers/api/notes_controller.rb
+++ b/app/controllers/api/notes_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class NotesController < ApiController
 module Api
   class NotesController < ApiController

-    layout "site", :only => [:mine]
-

     before_action :check_api_readable
     before_action :setup_user_auth, :only => [:create, :comment, :show]
     before_action :authorize, :only => [:close, :reopen, :destroy, :comment]
     before_action :check_api_readable
     before_action :setup_user_auth, :only => [:create, :comment, :show]
     before_action :authorize, :only => [:close, :reopen, :destroy, :comment]

diff --git a/app/controllers/api/traces_controller.rb b/app/controllers/api/traces_controller.rb
index 0b441bef986d9aa5ba4bfd1625001a6144b7115f..6c77f9dc4bae539cb581a60402e372f49dc80d7d 100644 (file)
--- a/app/controllers/api/traces_controller.rb
+++ b/app/controllers/api/traces_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class TracesController < ApiController
 module Api
   class TracesController < ApiController

-    layout "site", :except => :georss
-

     before_action :authorize_web
     before_action :set_locale
     before_action :authorize
     before_action :authorize_web
     before_action :set_locale
     before_action :authorize

diff --git a/app/controllers/api/users_controller.rb b/app/controllers/api/users_controller.rb
index d3387bd5ffaaa1f48a0e32dff1b32d25ae3eb639..d97e8774ecd7a5641f8cc94e301c9fef0ad3386d 100644 (file)
--- a/app/controllers/api/users_controller.rb
+++ b/app/controllers/api/users_controller.rb
@@ -1,7 +1,5 @@
 module Api
   class UsersController < ApiController
 module Api
   class UsersController < ApiController

-    layout "site", :except => [:api_details]
-

     before_action :disable_terms_redirect, :only => [:details]
     before_action :authorize, :only => [:details, :gpx_files]
 
     before_action :disable_terms_redirect, :only => [:details]
     before_action :authorize, :only => [:details, :gpx_files]