Skip to content

Commit

Permalink
Release 1.3.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
chrismccord committed Mar 14, 2017
1 parent 388f3ea commit 24c0d68
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 1.3.0-rc.0 (2017-03-01)
## 1.3.0-rc.1 (2017-03-14)

See these [`1.2.x` to `1.3.x` upgrade instructions](https://gist.github.com/chrismccord/71ab10d433c98b714b75c886eff17357) to bring your existing apps up to speed.

Expand All @@ -18,6 +18,9 @@ See these [`1.2.x` to `1.3.x` upgrade instructions](https://gist.github.com/chri
* [ConnTest] Add `redirected_params/1` to return the named params matched in the router for the redirected URL
* [Digester] Add `mix phx.digest.clean` to remove old versions of compiled assets

* Big Fixes
* [Controller] Harden local redirect against arbitrary URL redirection

* Deprecations
* [Generator] All `phoenix.*` mix tasks have been deprecated in favor of new `phx.*` tasks

Expand All @@ -26,6 +29,11 @@ See these [`1.2.x` to `1.3.x` upgrade instructions](https://gist.github.com/chri
* Detect heartbeat timeouts on client to handle ungraceful connection loss for faster socket error detection
* Add support for AMD/RequireJS

## 1.2.2 (2017-3-14)

* Big Fixes
* [Controller] Harden local redirect against arbitrary URL redirection

## 1.2.1 (2016-8-11)

* Enhancements
Expand Down
2 changes: 1 addition & 1 deletion installer/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Phx.New.Mixfile do
def project do
[app: :phx_new,
start_permanent: Mix.env == :prod,
version: "1.3.0-rc.0",
version: "1.3.0-rc.1",
elixir: "~> 1.3 or ~> 1.4"]
end

Expand Down
8 changes: 3 additions & 5 deletions lib/phoenix/token.ex
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,9 @@ defmodule Phoenix.Token do
signed_at_ms = if signed_at_seconds, do: trunc(signed_at_seconds * 1000), else: now_ms()
secret = get_key_base(context) |> get_secret(salt, key_opts)

message = %{
data: data,
signed: signed_at_ms,
} |> :erlang.term_to_binary()
MessageVerifier.sign(message, secret)
%{data: data, signed: signed_at_ms}
|> :erlang.term_to_binary()
|> MessageVerifier.sign(secret)
end

@doc """
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
defmodule Phoenix.Mixfile do
use Mix.Project

@version "1.3.0-rc.0"
@version "1.3.0-rc.1"

# TODO v1.4: Update to elixir 1.4 + new application inference

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "phoenix",
"version": "1.2.1",
"version": "1.3.0-rc.1",
"description": "The official JavaScript client for the Phoenix web framework.",
"license": "MIT",
"main": "./priv/static/phoenix.js",
Expand Down

0 comments on commit 24c0d68

Please sign in to comment.