summaryrefslogtreecommitdiff
path: root/app/views/matches/show.json.jbuilder
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-03-25 17:56:25 -0400
committerguntasgrewal <guntasgrewal@gmail.com>2014-03-25 17:56:25 -0400
commitd8acc6785ee41a2628cd0d59d91916b2f087290b (patch)
treebdc6343b90c3ce6015f8c81bf06a250cb9580133 /app/views/matches/show.json.jbuilder
parent53b4f8028fc987b0cf26a7a073fec7064b4b6d8a (diff)
parent433fc302fe2943e89a36657affea39d578475d20 (diff)
Adding match status after solving conflicts
Diffstat (limited to 'app/views/matches/show.json.jbuilder')
-rw-r--r--app/views/matches/show.json.jbuilder2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder
index fe14010..a3ef588 100644
--- a/app/views/matches/show.json.jbuilder
+++ b/app/views/matches/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @match, :id, :tournament_id, :name, :winner_id, :created_at, :updated_at
+json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :created_at, :updated_at