From 8a925008f9fef8e32ec77175b7e5bc194ea7fbad Mon Sep 17 00:00:00 2001 From: Zanz2 Date: Mon, 10 Sep 2018 15:39:50 +0200 Subject: [PATCH] fixed hound --- app/serializers/api/v1/result_serializer.rb | 3 ++- config/routes.rb | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/serializers/api/v1/result_serializer.rb b/app/serializers/api/v1/result_serializer.rb index 23c3fca3e..e5cae0ca8 100644 --- a/app/serializers/api/v1/result_serializer.rb +++ b/app/serializers/api/v1/result_serializer.rb @@ -6,7 +6,8 @@ module Api type :results attributes :id, :name, :my_module_id, :user_id, :created_at, :updated_at, :archived, :archived_on, :last_modified_by_id, :archived_by_id, - :restored_by_id, :restored_on, :result_text, :result_table, :result_asset + :restored_by_id, :restored_on, :result_text, :result_table, + :result_asset belongs_to :my_module, serializer: MyModuleSerializer end diff --git a/config/routes.rb b/config/routes.rb index d3c3cfe9a..0b4d28779 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -598,13 +598,10 @@ Rails.application.routes.draw do end end end -<<<<<<< HEAD resources :users, only: %i(show) do resources :user_identities, only: %i(index create show update destroy) end -======= ->>>>>>> Added results endpoint end end end