From 42582f79b3f48d49a3cf9141f6bdddb022dda173 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Wed, 12 Oct 2016 23:18:35 +0300 Subject: [PATCH] Just return the array of conflicts --- app/views/conflicts/show.json.jbuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/conflicts/show.json.jbuilder b/app/views/conflicts/show.json.jbuilder index 281c29e..45b7b38 100644 --- a/app/views/conflicts/show.json.jbuilder +++ b/app/views/conflicts/show.json.jbuilder @@ -1 +1 @@ -json.extract! @conflicts_table, :talk_id, :conflicts +json.merge! @conflicts_table.conflicts