Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: rails/rails
...
head fork: rails/rails
Commits on Feb 15, 2012
Andy Pliszka AntiTyping Bugfix circular reference while saving has_one relationship a97cf75
Commits on Feb 16, 2012
Andy Pliszka AntiTyping Test for circular reference while saving has_one relationship 389d1c5
Commits on Feb 25, 2012
Noah Hendrix noahhendrix Fixed typo in composed_of example with Money#<=>, was comparing amoun…
…t itself instead of other_money.amount
c4f9264
Commits on Mar 01, 2012
Aaron Patterson tenderlove Merge branch '3-0-12' into 3-0-stable
* 3-0-12:
  bumping to 3.0.12
  Ensure [] respects the status of the buffer.
  updating RAILS_VERSION
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
eeb715a
Commits on Mar 02, 2012
Carlos Antonio da Silva carlosantoniodasilva Stop SafeBuffer#clone_empty from issuing warnings
Logic in clone_empty method was dealing with old @dirty variable, which
has changed by @html_safe in this commit:
139963c

This was issuing a "not initialized variable" warning - related to:
#5237

The logic applied by this method is already handled by the [] override,
so there is no need to reset the variable here.
f1c6037
Commits on Mar 07, 2012
Arun Agrawal arunagw fixed test when running with latest 1.8.7-p357 and ree f8f873a
Santiago Pastorino spastorino Merge pull request #5319 from arunagw/fix_test_ree
Fix test ree 3-0-stable
61335d6
Commits on Mar 15, 2012
Aaron Patterson tenderlove Merge pull request #5456 from brianmario/redirect-sanitization
Strip null bytes from Location header
Conflicts:

	actionpack/test/controller/redirect_test.rb
d14319c
Aaron Patterson tenderlove Merge pull request #5457 from brianmario/typo-fix
Fix typo in redirect test
8645745
Commits on Mar 23, 2012
Carlos Antonio da Silva carlosantoniodasilva Add order to tests that rely on db ordering, to fix failing tests on pg
Also skip persistente tests related to UPDATE + ORDER BY for postgresql

PostgreSQL does not support updates with order by, and these tests are
failing randomly depending on the fixture loading order now.

Conflicts:

	activerecord/test/cases/associations/join_model_test.rb
	activerecord/test/cases/associations/nested_through_associations_test.rb
	activerecord/test/cases/clone_test.rb
	activerecord/test/cases/dup_test.rb
	activerecord/test/cases/relations_test.rb
	activerecord/test/cases/yaml_serialization_test.rb
a9fdefd
Carlos Antonio da Silva carlosantoniodasilva Fix more failing tests related to ruby 1.8.7 p358 version change f748d36
José Valim josevalim Merge pull request #5565 from carlosantoniodasilva/fix-build-3-0
Fix build for branch 3-0-stable
728a65d
Commits on Mar 24, 2012
Arun Agrawal arunagw Build fix for form_options_helper_test.rb ruby-1.8.7 00726ea
Commits on Mar 26, 2012
Carlos Antonio da Silva carlosantoniodasilva Fix AV::FixtureResolver and rjs tests with random order errors
Due to the hash ordering changes on Ruby 1.8.7-p358.
9698312
Commits on Mar 27, 2012
Aaron Patterson tenderlove Merge pull request #2621 from icco/master
Issue with schema dump
3627cfa
José Valim josevalim Merge pull request #5600 from carlosantoniodasilva/fix-build-3-0
Fix build for branch 3-0-stable - failing in ruby 1.8.8-p358
5790269
Emilio Tagua miloops Silence warnings here, only setting Encoding.default_external for tes…
…ting.
923ba31
Emilio Tagua miloops Use helper method here. caebe85
Aaron Patterson tenderlove load the encoding converter to work around [ruby-core:41556] when swi…
…tching encodings
289fe76
Arun Agrawal arunagw Fix broken encoding test 4c9dec4
José Valim josevalim Avoid inspecting the whole route set, closes #1525 e0362f7
Aaron Patterson tenderlove Merge pull request #5613 from carlosantoniodasilva/fix-build-3-0-193
Fix build for branch 3-0-stable - Ruby 1.9.3
29320dc
Commits on Mar 29, 2012
Yasuo Honda yahonda Address an error for test_has_many_through_polymorphic_has_one
with Oracle for the 3-0-stable branch
60272ae
Santiago Pastorino spastorino Merge pull request #5655 from yahonda/address_ora_00918_with_oracle_f…
…or_3_0

Address an error for test_has_many_through_polymorphic_has_one with Oracle
72dc7ae
Carlos Antonio da Silva carlosantoniodasilva Fix failing ARes test due to hash keys ordering d44ffb2
Jeremy Kemper jeremy Merge pull request #5659 from carlosantoniodasilva/fix-build-3-0
Fix build for branch 3-0-stable - ARes and ordered hash keys
f47a303
Commits on Apr 30, 2012
Yehuda Katz wycats Merge pull request #5044 from dracco/3-0-stable
Backport Bugfix: Stack Overflow (3-0-stable)
51582fe
Andrew White pixeltrix Lock mocha gem to fix the build
New versions of mocha don't allow nil.stubs
e74e479
Commits on May 25, 2012
Egor Homakov homakov auto_link final sanitize 3af3385
Aaron Patterson tenderlove Merge pull request #6485 from homakov/3-0-stable
auto_link sanitize output
f7cf745
Commits on May 26, 2012
Egor Homakov homakov do not force sanitize and whitelist protocols for auto_link
sanitize is not always required so we cannot make it. let's just
whitelist protocols
f35c93f
Rafael Mendonça França rafaelfranca Merge pull request #6495 from homakov/3-0-stable
auto_link shouldn't always sanitize
5989ffb
Commits on May 27, 2012
Rafael Mendonça França rafaelfranca Remove test for not accepted protocols to auto_link 349fce2
Commits on May 28, 2012
Aaron Patterson tenderlove bumping to 3.0.13.rc1 88e7f51
Commits on May 30, 2012
Aaron Patterson tenderlove predicate builder should not recurse for determining where columns.
Thanks to Ben Murphy for reporting this

CVE-2012-2661
99f0309
Aaron Patterson tenderlove Strip [nil] from parameters hash.
Thanks to Ben Murphy for reporting this!

CVE-2012-2660

Conflicts:

	actionpack/lib/action_dispatch/http/request.rb
c202638
Commits on May 31, 2012
Aaron Patterson tenderlove Merge branch '3-0-stable-sec' into 3-0-rel
* 3-0-stable-sec:
  Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
  predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
c8af45e
Aaron Patterson tenderlove updating CHANGELOGs 86c97e1
Aaron Patterson tenderlove bumping to 3.0.13 7102fe8
Something went wrong with that request. Please try again.