Merge branch 'master' into joindep

* master:
  Rephrase ActiveRecord transaction rollback warning
  Fix code blocks identation on AR and AS CHANGELOGs
  Removing unused fake models from actionpack tests

1 files changed, 6 insertions, 6 deletions

diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index f1dd7c312d..246d94882b 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -22,14 +22,14 @@
 
     You can do this:
 
-      class JokeSubscriber < ActiveSupport::Subscriber
-        # This is much easier to read!
-        attach_to "active_record"
+        class JokeSubscriber < ActiveSupport::Subscriber
+          # This is much easier to read!
+          attach_to "active_record"
 
-        def sql(event)
-          puts "A rabbi and a priest walk into a bar..."
+          def sql(event)
+            puts "A rabbi and a priest walk into a bar..."
+          end
         end
-      end
 
     This should make it easier to read and understand these subscribers.