aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-10-16 07:00:09 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-10-16 07:00:09 -0700
commit49bc23f6786261427a8b7856a776afa03e3a5742 (patch)
tree21f89c5d5f96aaf4e0c5c55740060eb391cd331f
parentfee49a10492efc99409c03f7096d5bd3377b0bbc (diff)
parent2f1c9c8d60bde99cf337eca870dca60cbaf3a47a (diff)
downloadrails-49bc23f6786261427a8b7856a776afa03e3a5742.tar.gz
rails-49bc23f6786261427a8b7856a776afa03e3a5742.tar.bz2
rails-49bc23f6786261427a8b7856a776afa03e3a5742.zip
Merge pull request #12558 from lucasmazza/changelog-fixes
Fix code blocks identation on AR and AS CHANGELOGs
-rw-r--r--activerecord/CHANGELOG.md12
-rw-r--r--activesupport/CHANGELOG.md12
2 files changed, 12 insertions, 12 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 6e93477c3b..2d19e44abc 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -342,13 +342,13 @@
* Reset @column_defaults when assigning `locking_column`.
We had a potential problem. For example:
- class Post < ActiveRecord::Base
- self.column_defaults # if we call this unintentionally before setting locking_column ...
- self.locking_column = 'my_locking_column'
- end
+ class Post < ActiveRecord::Base
+ self.column_defaults # if we call this unintentionally before setting locking_column ...
+ self.locking_column = 'my_locking_column'
+ end
- Post.column_defaults["my_locking_column"]
- => nil # expected value is 0 !
+ Post.column_defaults["my_locking_column"]
+ => nil # expected value is 0 !
*kennyj*
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.