Release 1.1.1

phoenixframework · Dec 26, 2015 · 33d7ffe · 33d7ffe
1 parent 5221df9
commit 33d7ffe
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 # Changelog
 
-## 1.1.1-dev
+## 1.1.1 (2015-12-26)
+
+* Bug fixes
+  * Fix `--no-html` flag on `phoenix.new` task failing to generate ErrorHelpers module
 
 ## 1.1.0 (2015-12-16)
 

diff --git a/installer/lib/phoenix_new.ex b/installer/lib/phoenix_new.ex
@@ -470,8 +470,8 @@ defmodule Mix.Tasks.Phoenix.New do
     :crypto.strong_rand_bytes(length) |> Base.encode64 |> binary_part(0, length)
   end
 
-  # defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, "~> 1.1.0"}]
-  defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, github: "phoenixframework/phoenix", override: true}]
+  defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, "~> 1.1.1"}]
+  # defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, github: "phoenixframework/phoenix", override: true}]
   defp phoenix_dep(path), do: ~s[{:phoenix, path: #{inspect path}, override: true}]
 
   defp phoenix_static_path("deps/phoenix"), do: "deps/phoenix"

diff --git a/installer/mix.exs b/installer/mix.exs
@@ -3,7 +3,7 @@ defmodule Phoenix.New.Mixfile do
 
   def project do
     [app: :phoenix_new,
-     version: "1.1.0",
+     version: "1.1.1",
      elixir: "~> 1.0-dev"]
   end
 

diff --git a/mix.exs b/mix.exs
@@ -1,7 +1,7 @@
 defmodule Phoenix.Mixfile do
   use Mix.Project
 
-  @version "1.1.1-dev"
+  @version "1.1.1"
 
   def project do
     [app: :phoenix,