Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Feb 15, 2012
@AntiTyping AntiTyping Bugfix circular reference while saving has_one relationship a97cf75
Commits on Feb 16, 2012
@AntiTyping AntiTyping Test for circular reference while saving has_one relationship 389d1c5
Commits on Feb 25, 2012
@noahhendrix 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
@tenderlove 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
@carlosantoniodasilva 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
@arunagw arunagw fixed test when running with latest 1.8.7-p357 and ree f8f873a
@spastorino spastorino Merge pull request #5319 from arunagw/fix_test_ree
Fix test ree 3-0-stable
61335d6
Commits on Mar 15, 2012
@tenderlove tenderlove Merge pull request #5456 from brianmario/redirect-sanitization
Strip null bytes from Location header
Conflicts:

	actionpack/test/controller/redirect_test.rb
d14319c
@tenderlove tenderlove Merge pull request #5457 from brianmario/typo-fix
Fix typo in redirect test
8645745
Commits on Mar 23, 2012
@carlosantoniodasilva 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
@carlosantoniodasilva carlosantoniodasilva Fix more failing tests related to ruby 1.8.7 p358 version change f748d36
@josevalim josevalim Merge pull request #5565 from carlosantoniodasilva/fix-build-3-0
Fix build for branch 3-0-stable
728a65d
Commits on Mar 24, 2012
@arunagw arunagw Build fix for form_options_helper_test.rb ruby-1.8.7 00726ea
Commits on Mar 26, 2012
@carlosantoniodasilva 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
@tenderlove tenderlove Merge pull request #2621 from icco/master
Issue with schema dump
3627cfa
@josevalim 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
@miloops miloops Silence warnings here, only setting Encoding.default_external for tes…
…ting.
923ba31
@miloops miloops Use helper method here. caebe85
@tenderlove tenderlove load the encoding converter to work around [ruby-core:41556] when swi…
…tching encodings
289fe76
@arunagw arunagw Fix broken encoding test 4c9dec4
@josevalim josevalim Avoid inspecting the whole route set, closes #1525 e0362f7
@tenderlove 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
@yahonda yahonda Address an error for test_has_many_through_polymorphic_has_one
with Oracle for the 3-0-stable branch
60272ae
@spastorino 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
@carlosantoniodasilva carlosantoniodasilva Fix failing ARes test due to hash keys ordering d44ffb2
@jeremy 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
@wycats wycats Merge pull request #5044 from dracco/3-0-stable
Backport Bugfix: Stack Overflow (3-0-stable)
51582fe
@pixeltrix pixeltrix Lock mocha gem to fix the build
New versions of mocha don't allow nil.stubs
e74e479
Commits on May 25, 2012
@homakov homakov auto_link final sanitize 3af3385
@tenderlove tenderlove Merge pull request #6485 from homakov/3-0-stable
auto_link sanitize output
f7cf745
Commits on May 26, 2012
@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
@rafaelfranca rafaelfranca Merge pull request #6495 from homakov/3-0-stable
auto_link shouldn't always sanitize
5989ffb
Commits on May 27, 2012
@rafaelfranca rafaelfranca Remove test for not accepted protocols to auto_link 349fce2
Commits on May 28, 2012
@tenderlove tenderlove bumping to 3.0.13.rc1 88e7f51
Something went wrong with that request. Please try again.