docs, synchronize CHANGELOG across branches. [ci skip]

Conflicts: guides/source/4_2_release_notes.md
rails · Dec 16, 2014 · bf1b273 · bf1b273
1 parent 154643d
commit bf1b273
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/guides/source/4_2_release_notes.md b/guides/source/4_2_release_notes.md
@@ -514,9 +514,9 @@ Please refer to the [Changelog][action-pack] for detailed changes.
     implementation and not an intentional feature, e.g.:
 
     ```ruby
-    test "list all posts" do
-      get "/posts"
-      assert_response :success 
+    test "list all posts" do
+      get "/posts"
+      assert_response :success
     end
     ```