about summary refs log tree commit diff
path: root/app/controllers/api
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-03-05 12:50:59 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-03-05 12:50:59 +0100
commit3b4e04dc32eba0f5b1ac11e2db2edd7ca7351291 (patch)
tree23388ff4b32bb07b5e8d09b62ac06ed25436d6cf /app/controllers/api
parent23d08c6749eb142b24f22045f643d0591af579ff (diff)
Fixing some bugs, adding pending test examples
Diffstat (limited to 'app/controllers/api')
-rw-r--r--app/controllers/api/salmon_controller.rb2
-rw-r--r--app/controllers/api/subscriptions_controller.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/api/salmon_controller.rb b/app/controllers/api/salmon_controller.rb
index 99ec15bff..1df989700 100644
--- a/app/controllers/api/salmon_controller.rb
+++ b/app/controllers/api/salmon_controller.rb
@@ -1,4 +1,4 @@
-class Api::SalmonController < ApplicationController
+class Api::SalmonController < ApiController
   before_action :set_account
 
   def update
diff --git a/app/controllers/api/subscriptions_controller.rb b/app/controllers/api/subscriptions_controller.rb
index 56deae10c..038d6c877 100644
--- a/app/controllers/api/subscriptions_controller.rb
+++ b/app/controllers/api/subscriptions_controller.rb
@@ -1,4 +1,4 @@
-class Api::SubscriptionsController < ApplicationController
+class Api::SubscriptionsController < ApiController
   before_action :set_account
 
   def show