| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations/class_methods/join_dependency.rb
activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
activerecord/lib/active_record/associations/has_many_association.rb
activerecord/lib/active_record/associations/has_many_through_association.rb
activerecord/lib/active_record/associations/has_one_association.rb
activerecord/lib/active_record/associations/has_one_through_association.rb
activerecord/lib/active_record/associations/through_association_scope.rb
activerecord/lib/active_record/reflection.rb
activerecord/test/cases/associations/has_many_through_associations_test.rb
activerecord/test/cases/associations/has_one_through_associations_test.rb
activerecord/test/cases/reflection_test.rb
activerecord/test/cases/relations_test.rb
activerecord/test/fixtures/memberships.yml
activerecord/test/models/categorization.rb
activerecord/test/models/category.rb
activerecord/test/models/member.rb
activerecord/test/models/reference.rb
activerecord/test/models/tagging.rb
|
| |
| |
| |
| |
| |
| | |
not Time.zone_default.
[#6410 state:committed]
|
| |
| |
| |
| | |
nil value
|
| | |
|
| |
| |
| |
| | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| |
| |
| |
| | |
application code before it fires.
|
| |\ |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
[#6389 state:resolved]
|
| | |
| | |
| | |
| | | |
[#6416 state:resolved]
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | |
| | |
| | |
| | | |
corrects issues with ordering and duplicates.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
they are expanded, and removing duplicates.
When individual js assets are specified, they will override the order of the same asset specified in an expansion.
[#5938 state:resolved]
|
| | |
| | |
| | |
| | |
| | |
| | | |
nested attributes and erb
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
As per the HTML 4.01 spec:
Buttons created with the BUTTON element function just like buttons
created with the INPUT element, but they offer richer rendering
possibilities: the BUTTON element may have content. For example, a
BUTTON element that contains an image functions like and may resemble
an INPUT element whose type is set to "image", but the BUTTON element
type allows content.
Since rich content is the main purpose of the <button> element, it makes
sense for the button_tag helper to accept a block.
http://www.w3.org/TR/html401/interact/forms.html#edef-BUTTON
http://dev.w3.org/html5/spec/the-button-element.html#the-button-element
Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
"submit" is the default value of the <button> element's type attribute
according to the HTML 4.01 and the HTML5 draft specs, so if button_tag
is going to have a default, type="submit" is a more sensible choice than
type="button".
http://www.w3.org/TR/html401/interact/forms.html#adef-type-BUTTON
http://dev.w3.org/html5/spec/the-button-element.html#attr-button-type
Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
the same same. This also changes how safe_join works, if items or the separator are not html_safe they are html_escape'd, a html_safe string is always returned.
Signed-off-by: José Valim <jose.valim@gmail.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
with the same same."
Applied the wrong version.
This reverts commit 98c0c5db50a7679b3d58769ac22cb0a27a62c930.
|
| | |
| | |
| | |
| | | |
the same same.
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Unfortunately the previous method of browser detection and XHR whitelisting is unable to prevent requests issued from some Flash animations and Java applets. To ease the work required to include the CSRF token in ajax requests rails now supports providing the token in a custom http header:
X-CSRF-Token: ...
This fixes CVE-2011-0447
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
filesystems.
This fixes CVE-2011-0449
|
| | |
| | |
| | |
| | |
| | |
| | | |
inadvertently causing javascript errors.
This fixes CVE-2011-0446
|
| | |
| | |
| | |
| | |
| | |
| | | |
not render properly
[#6381 state:committed]
|
| | |
| | |
| | |
| | |
| | |
| | | |
nested attributes already persisted
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
[#6228 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
For example, page_cache_directory = Rails.root.join("public/cache")
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| |/
| |
| |
| |
| |
| |
| |
| | |
for_for and authenticity_token option. Added section to form helpers guide about forms for external resources and new authenticity_token option for form_tag and form_for helpers.
[#6228 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| |\ |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
[#6372 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
[#6369 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
To make sure it will show block contents if it is placed after 'render
:partial'
[#5557 state:resolved]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| | | |
|
| | | |
|
| |/
| |
| |
| |
| |
| | |
[#5774 state:committed]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
|
| |\ |
|
| | | |
|