Don't use into with a non-empty list as this is deprecated in 1.8.0 (#…

…121) See elixir-lang/elixir@6023568 Closes #120
phoenixframework · Feb 23, 2019 · 316fdd8 · 316fdd8
1 parent 50c1da2
commit 316fdd8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/phoenix/tracker/state.ex b/lib/phoenix/tracker/state.ex
@@ -379,10 +379,11 @@ defmodule Phoenix.Tracker.State do
 
       merged_vals = for {tag, value} <- remote_values,
                     not match?(%{^tag => _}, local_values) and not in?(local_context, local_clouds, tag),
-                    into: filtered_locals,
                     do: {tag, value}
 
-      {:ok, %State{local | clouds: clouds, values: Map.new(merged_vals), range: {new_start, new_end}}}
+      all_vals = filtered_locals ++ merged_vals
+
+      {:ok, %State{local | clouds: clouds, values: Map.new(all_vals), range: {new_start, new_end}}}
     else
       {:error, :not_contiguous}
     end