From 6d0f99b9c5e545c632f83d64b545cbc0eab3a8ca Mon Sep 17 00:00:00 2001
From: Callum Barratt <callum.barratt@sky.uk>
Date: Thu, 14 Apr 2016 09:21:28 +0100
Subject: [PATCH] Upgrade all mix deps

---
 mix.exs       |  4 ++--
 mix.lock      | 12 ++++++------
 web/router.ex |  4 ----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/mix.exs b/mix.exs
index 566f4d3..93a3d79 100644
--- a/mix.exs
+++ b/mix.exs
@@ -27,12 +27,12 @@ defmodule Callum.Mixfile do
   defp deps do
     [
       {:phoenix, "~> 1.1.2"},
-      {:phoenix_ecto, "~> 3.0.0-beta"},
+      {:phoenix_ecto, "~> 3.0.0-beta.2"},
       {:postgrex, "~> 0.11.1"},
       {:phoenix_html, "~> 2.3"},
       {:phoenix_live_reload, "~> 1.0", only: :dev},
       {:gettext, "~> 0.9"},
-      {:httpoison, "~> 0.8"},
+      {:httpoison, "~> 0.8.3"},
       {:timex, "~> 1.0.0"},
       {:cowboy, "~> 1.0"},
       {:ex_machina, "~> 0.6.1", only: :test}
diff --git a/mix.lock b/mix.lock
index c605170..0d76c09 100644
--- a/mix.lock
+++ b/mix.lock
@@ -3,19 +3,19 @@
   "connection": {:hex, :connection, "1.0.2"},
   "cowboy": {:hex, :cowboy, "1.0.4"},
   "cowlib": {:hex, :cowlib, "1.0.2"},
-  "db_connection": {:hex, :db_connection, "0.2.4"},
+  "db_connection": {:hex, :db_connection, "0.2.5"},
   "decimal": {:hex, :decimal, "1.1.1"},
-  "ecto": {:hex, :ecto, "2.0.0-beta.1"},
+  "ecto": {:hex, :ecto, "2.0.0-beta.2"},
   "ex_machina": {:hex, :ex_machina, "0.6.1"},
   "fs": {:hex, :fs, "0.9.2"},
-  "gettext": {:hex, :gettext, "0.10.0"},
-  "hackney": {:hex, :hackney, "1.5.7"},
-  "httpoison": {:hex, :httpoison, "0.8.2"},
+  "gettext": {:hex, :gettext, "0.11.0"},
+  "hackney": {:hex, :hackney, "1.6.0"},
+  "httpoison": {:hex, :httpoison, "0.8.3"},
   "idna": {:hex, :idna, "1.2.0"},
   "metrics": {:hex, :metrics, "1.0.1"},
   "mimerl": {:hex, :mimerl, "1.0.2"},
   "phoenix": {:hex, :phoenix, "1.1.4"},
-  "phoenix_ecto": {:hex, :phoenix_ecto, "3.0.0-beta.1"},
+  "phoenix_ecto": {:hex, :phoenix_ecto, "3.0.0-beta.2"},
   "phoenix_html": {:hex, :phoenix_html, "2.5.1"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.0.3"},
   "plug": {:hex, :plug, "1.1.3"},
diff --git a/web/router.ex b/web/router.ex
index 12bbfe4..194db24 100644
--- a/web/router.ex
+++ b/web/router.ex
@@ -9,10 +9,6 @@ defmodule Callum.Router do
     plug :put_secure_browser_headers
   end
 
-  pipeline :api do
-    plug :accepts, ["json"]
-  end
-
   scope "/", Callum do
     pipe_through :browser