Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #13436 from robin850/patch-11

Add missing changelog entries and fix few typos
  • Loading branch information...
commit 82053bee366c68a0eb87386bbb62378d53a58174 2 parents b9c9766 + b894b7b
@guilleiguaran guilleiguaran authored
View
8 actionview/CHANGELOG.md
@@ -1,3 +1,11 @@
+* The `video_tag` helper accepts a number as `:size`
+
+ The `:size` option of the `video_tag` helper now can be specified
+ with a stringified number. The `width` and `height` attributes of
+ the generated tag will be the same.
+
+ *Kuldeep Aggarwal*
+
* A Cycle object should accept an array and cycle through it as it would with a set of
comma-separated objects.
View
2  activemodel/lib/active_model/callbacks.rb
@@ -30,7 +30,7 @@ module ActiveModel
# end
#
# Then in your class, you can use the +before_create+, +after_create+ and
- # +around_create+ methods, just as you would in an Active Record module.
+ # +around_create+ methods, just as you would in an Active Record model.
#
# before_create :action_before_create
#
View
2  activesupport/lib/active_support/callbacks.rb
@@ -577,7 +577,7 @@ def __update_callbacks(name) #:nodoc:
# The callback can be specified as a symbol naming an instance method; as a
# proc, lambda, or block; as a string to be instance evaluated; or as an
# object that responds to a certain method determined by the <tt>:scope</tt>
- # argument to +define_callback+.
+ # argument to +define_callbacks+.
#
# If a proc, lambda, or block is given, its body is evaluated in the context
# of the current object. It can also optionally accept the current object as
View
8 railties/CHANGELOG.md
@@ -1,3 +1,11 @@
+* `config.assets.raise_runtime_errors` is set to true by default
+
+ This option has been introduced in
+ [sprockets-rails#100][https://github.com/rails/sprockets-rails/pull/100]
+ and defaults to true in new applications in development.
+
+ *Richard Schneeman*
+
* Generates `html` and `text` templates for mailers by default.
*Kassio Borges*
Please sign in to comment.
Something went wrong with that request. Please try again.