From cff8587b4013f7755d9c5556e8f2d71272413461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 30 May 2016 15:26:51 +0200 Subject: [PATCH] Release v1.1.8 --- CHANGELOG.md | 7 +++++++ lib/ecto/date_time.ex | 1 + mix.exs | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32203972bd..9989928775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## v1.1.8 + +### Enhancements + +* Support Elixir v1.3 calendar types +* Remove warnings on Elixir v1.3 + ## v1.1.7 ### Bug fixes diff --git a/lib/ecto/date_time.ex b/lib/ecto/date_time.ex index 5f0fc96653..5f8c2a7aee 100644 --- a/lib/ecto/date_time.ex +++ b/lib/ecto/date_time.ex @@ -11,6 +11,7 @@ defmodule Ecto.DateTime.Utils do @doc "Converts to integer if possible" def to_i(nil), do: nil + def to_i({int, _}) when is_integer(int), do: int def to_i(int) when is_integer(int), do: int def to_i(bin) when is_binary(bin) do case Integer.parse(bin) do diff --git a/mix.exs b/mix.exs index 9dfc69b21b..5f053be1a0 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Ecto.Mixfile do use Mix.Project - @version "1.1.7" + @version "1.1.8" @adapters [:pg, :mysql] @pools [:poolboy, :sojourn_timeout, :sojourn_codel]