summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2014-02-22 11:19:57 -0700
committermo khan <mo@mokhan.ca>2014-02-22 11:19:57 -0700
commited601666363d62ca5a334c3c2414a1215118c019 (patch)
tree3fc03945b3f07a61ef788a4ea7bdeb280ee3cf62 /app
parentef7eeb8ed18092bde97ebc30d249d32e56d5645f (diff)
remove explicit render :json.
Diffstat (limited to 'app')
-rw-r--r--app/controllers/v1/company_licenses_controller.rb1
-rw-r--r--app/views/v1/company_licenses/index.jbuilder (renamed from app/views/v1/company_licenses/index.json.jbuilder)0
2 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/v1/company_licenses_controller.rb b/app/controllers/v1/company_licenses_controller.rb
index 3b4850f..6f2f666 100644
--- a/app/controllers/v1/company_licenses_controller.rb
+++ b/app/controllers/v1/company_licenses_controller.rb
@@ -3,7 +3,6 @@ class V1::CompanyLicensesController < ApplicationController
def index
@active_licenses = @company.filter_licenses_using(search_filters)
- render json: @active_licenses
end
private
diff --git a/app/views/v1/company_licenses/index.json.jbuilder b/app/views/v1/company_licenses/index.jbuilder
index 8228f3e..8228f3e 100644
--- a/app/views/v1/company_licenses/index.json.jbuilder
+++ b/app/views/v1/company_licenses/index.jbuilder