diff options
author | azul <azul@riseup.net> | 2016-08-19 10:40:37 +0000 |
---|---|---|
committer | azul <azul@riseup.net> | 2016-08-19 10:40:37 +0000 |
commit | 67302ca1986a66a6d278c34216ad33f4c65a018e (patch) | |
tree | d55e4c4dd3a6612e04e0fd40e736c8b6d4342762 /app/controllers/api | |
parent | 44910c0909f28791fe6725fa76301e5111ece3b4 (diff) | |
parent | fbad882075e745ab7afbe5f89c67544fb3c607c3 (diff) |
Merge branch 'bugfix/send-406-on-unsupported-format' into 'develop'
Bugfix/send 406 on unsupported format
See merge request !5
Diffstat (limited to 'app/controllers/api')
-rw-r--r-- | app/controllers/api/identities_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/api/services_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/api/sessions_controller.rb | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/api/identities_controller.rb b/app/controllers/api/identities_controller.rb index ab2ac00..de4910a 100644 --- a/app/controllers/api/identities_controller.rb +++ b/app/controllers/api/identities_controller.rb @@ -3,6 +3,8 @@ module Api before_filter :token_authenticate before_filter :require_monitor + respond_to :json + def show @identity = Identity.find_by_address(params[:id]) if @identity diff --git a/app/controllers/api/services_controller.rb b/app/controllers/api/services_controller.rb index da2774b..58e129c 100644 --- a/app/controllers/api/services_controller.rb +++ b/app/controllers/api/services_controller.rb @@ -2,6 +2,8 @@ class Api::ServicesController < ApiController before_filter :require_login, :unless => :anonymous_access_allowed? + respond_to :json + def show respond_with current_user.effective_service_level end diff --git a/app/controllers/api/sessions_controller.rb b/app/controllers/api/sessions_controller.rb index c8deb7a..178f86e 100644 --- a/app/controllers/api/sessions_controller.rb +++ b/app/controllers/api/sessions_controller.rb @@ -2,6 +2,7 @@ module Api class SessionsController < ApiController before_filter :require_login, only: :destroy + respond_to :json def new @session = Session.new |