Release 1.2.0

CHANGELOG.md

@@ -1,50 +1,40 @@
 # Changelog
 
 
-## 1.2.0-rc.2
-
-See these [`1.1.x` to `1.2.x` upgrade instructions](https://gist.github.com/chrismccord/29100e16d3990469c47f851e3142f766) to bring your existing apps up to speed.
-
-* Backward incompatible changes
-  * [Channel] `subscribe/1` and `unsubscribe/1` have been removed in favor of calling subscribe and unsubscribe off the endpoint directly
-
-* JavaScript client enhancements
-  * Use return value of channel onMessage callback for specialized message transformations before dispatching to the channel
-
-* JavaScript client backward incompatible changes
-  * `Presence.syncState` and `Presence.syncDiff` now return a copy of the state instead of mutating it
-
-## 1.2.0-rc.1 (2016-05-25)
+## 1.2.0 (2016-6-23)
 
 See these [`1.1.x` to `1.2.x` upgrade instructions](https://gist.github.com/chrismccord/29100e16d3990469c47f851e3142f766) to bring your existing apps up to speed.
 
 * Enhancements
+  * [CodeReloader] The `lib/` directory is now code reloaded by default along with `web/` in development
+  * [Channel] Add `subscribe/2` and `unsubscribe/2` to handle external topic subscriptions for a socket
+  * [Channel] Add `:phoenix_channel_join` instrumentation hook
+  * [View] Generate private `render_template/2` clauses for views to allow overriding `render/2` clauses before rendering templates
   * [View] Add `:path` and `:pattern` options to allow wildcard template inclusion as well as customized template directory locations
 
 * Deprecations
+  * [Endpoint] Generated `subscribe/3` and `unsubscribe/2` clauses have been deprecated in favor of `subscribe/2` and `unsubscribe/1` which uses the caller's pid
+  * [PubSub] `Phoenix.PubSub.subscribe/3` and `Phoenix.PubSub.unsubscribe/2` have been deprecated in favor of `subscribe/2` and `unsubscribe/1` which uses the caller's pid
   * [Watcher] Using the `:root` endpoint configuration for watchers is deprecated. Pass the :cd option at the end of your watcher argument list in config/dev.exs. For example:
 
       ```elixir
       watchers: [node: ["node_modules/brunch/bin/brunch", "watch", "--stdin",
                  cd: Path.expand("../", __DIR__)]]
       ```
 
-## 1.2.0-rc.0 (2016-4-28)
-
-See these [`1.1.x` to `1.2.0` upgrade instructions](https://gist.github.com/chrismccord/29100e16d3990469c47f851e3142f766) to bring your existing apps up to speed.
+* Bug Fixes
+  * [Template] Prevent infinite call stack when rendering a non-existent template from `template_not_found`
 
-* Enhancements
-  * [CodeReloader] The `lib/` directory is now code reloaded by default along with `web/` in development
-  * [Channel] Add `subscribe/2` and `unsubscribe/2` to handle external topic subscriptions for a socket
-  * [View] Generate private `render_template/2` clauses for views to allow overriding `render/2` clauses before rendering templates
-  * [Channel] Add `:phoenix_channel_join` instrumentation hook
+* Backward incompatible changes
+  * [Channel] `subscribe/1` and `unsubscribe/1` have been removed in favor of calling subscribe and unsubscribe off the endpoint directly
 
 * JavaScript client enhancements
   * Add Presence object for syncing presence state between client and server
+  * Use return value of channel onMessage callback for specialized message transformations before dispatching to the channel
+
+* JavaScript client backward incompatible changes
+  * `Presence.syncState` and `Presence.syncDiff` now return a copy of the state instead of mutating it
 
-* Deprecations
-  * [Endpoint] Generated `subscribe/3` and `unsubscribe/2` clauses have been deprecated in favor of `subscribe/2` and `unsubscribe/1` which uses the caller's pid
-  * [PubSub] `Phoenix.PubSub.subscribe/3` and `Phoenix.PubSub.unsubscribe/2` have been deprecated in favor of `subscribe/2` and `unsubscribe/1` which uses the caller's pid
 
 ## 1.1.6 (2016-6-03)
 

installer/lib/phoenix_new.ex

@@ -498,7 +498,7 @@ 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.2.0-rc"}]
+  defp phoenix_dep("deps/phoenix"), do: ~s[{:phoenix, "~> 1.2.0"}]
   # 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}]
 

installer/mix.exs

@@ -3,7 +3,7 @@ defmodule Phoenix.New.Mixfile do
 
   def project do
     [app: :phoenix_new,
-     version: "1.2.0-rc.1",
+     version: "1.2.0",
      elixir: "~> 1.2"]
   end
 

installer/templates/new/mix.exs

@@ -35,7 +35,7 @@ defmodule <%= application_module %>.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [<%= phoenix_dep %>,
-     {:phoenix_pubsub, "~> 1.0.0-rc"},<%= if ecto do %>
+     {:phoenix_pubsub, "~> 1.0"},<%= if ecto do %>
      {:phoenix_ecto, "~> 3.0"},
      {<%= inspect adapter_app %>, ">= 0.0.0"},<% end %><%= if html do %>
      {:phoenix_html, "~> 2.6"},

mix.exs

@@ -1,7 +1,7 @@
 defmodule Phoenix.Mixfile do
   use Mix.Project
 
-  @version "1.2.0-rc.1"
+  @version "1.2.0"
 
   def project do
     [app: :phoenix,
@@ -41,7 +41,7 @@ defmodule Phoenix.Mixfile do
   defp deps do
     [{:cowboy, "~> 1.0", optional: true},
      {:plug, "~> 1.1"},
-     {:phoenix_pubsub, "~> 1.0.0-rc"},
+     {:phoenix_pubsub, "~> 1.0"},
      {:poison, "~> 1.5 or ~> 2.0"},
      {:gettext, "~> 0.8", only: :test},
 

mix.lock

@@ -6,7 +6,7 @@
   "inch_ex": {:hex, :inch_ex, "0.2.3", "4e5050e973fd83afd69424f43d88dc833829d8910f4a7a2db3b2ed6f5c394a24", [:mix], [{:poison, "~> 1.2", [hex: :poison, optional: false]}]},
   "mime": {:hex, :mime, "1.0.0", "b63027733bba00b1013bad14e25dc8b6629ecb817731544a88a0fd14f2a55685", [:mix], []},
   "phoenix_html": {:hex, :phoenix_html, "2.6.0", "b9f7e091eb3d908586d9634596478fb9e577ee033d76f4ff327a745569bdd2d8", [:mix], [{:plug, "~> 0.13 or ~> 1.0", [hex: :plug, optional: false]}]},
-  "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.0.0-rc.0", "5c9453f9c7c8e4982ba48f408e4cec973ffb312bbe0da5fbe47899b9c91c48c0", [:mix], []},
+  "phoenix_pubsub": {:hex, :phoenix_pubsub, "1.0.0", "c31af4be22afeeebfaf246592778c8c840e5a1ddc7ca87610c41ccfb160c2c57", [:mix], []},
   "plug": {:hex, :plug, "1.1.6", "8927e4028433fcb859e000b9389ee9c37c80eb28378eeeea31b0273350bf668b", [:mix], [{:cowboy, "~> 1.0", [hex: :cowboy, optional: true]}]},
   "poison": {:hex, :poison, "1.5.0", "f2f4f460623a6f154683abae34352525e1d918380267cdbd949a07ba57503248", [:mix], []},
   "ranch": {:hex, :ranch, "1.2.1", "a6fb992c10f2187b46ffd17ce398ddf8a54f691b81768f9ef5f461ea7e28c762", [:make], []},

package.json

@@ -1,6 +1,6 @@
 {
   "name": "phoenix",
-  "version": "1.2.0-rc.1",
+  "version": "1.2.0",
   "description": "The official JavaScript client for the Phoenix web framework.",
   "license": "MIT",
   "main": "./priv/static/phoenix.js",