Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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.
This comparison is big! We're only showing the most recent 250 commits
Commits on Feb 23, 2011
@tenderlove tenderlove updating to 3.0.5.rc1 ef31b87
Commits on Feb 24, 2011
@tenderlove tenderlove observers leak across tests, so rather than modify the object, we sho…
…uld just count the number of times the observer was called
77d4211
Commits on Feb 25, 2011
@sikachu sikachu Make sure that we set `env["action_dispatch.show_exceptions"]`
This has been used by `show_exception` middleware even the setting wasn't get passed to `env` hash.

(This is the backported version to 3-0-stable)
69c0bad
@sikachu sikachu Always use ActionDispatch::ShowExceptions middleware [#6462 state:res…
…olved]

This will make sure the application will raise `ActionController::RoutingError` in case "X-Cascade: pass" header was set, usually when there's no route match.

(This is a backported version to 3-0-stable)
2a67e69
Commits on Feb 27, 2011
@tenderlove tenderlove prepping for 3.0.5 release ecc6bb5
@tenderlove tenderlove Merge branch '3-0-5' into 3-0-stable
* 3-0-5:
  prepping for 3.0.5 release
ef5e817
@spastorino spastorino Bump i18n version f7e1703
@spastorino spastorino failing test for i18n key collision with namespaced models d043d20
@spastorino spastorino Revert "Properly interpolate i18n keys in modules [#5572 state:resolv…
…ed]"

This breaks #6448, you should use :"module/class" as key for namespacing
[#6448 state:committed]

This reverts commit 8d14fa8.
f80eea3
Commits on Feb 28, 2011
@svenfuchs svenfuchs Make TranslationHelper#translate use the :rescue_format option in I18…
…n 0.5.0 (backports 896e25e)

Don't catch exceptions here. Instead only declare that we want exceptions to be rescued as :html, but also let users configure reactions to exceptions in I18n.

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
1452571
@spastorino spastorino Add a test for passing :rescue_format => nil to #translate
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
ff95f85
@spastorino spastorino javascript_include_tag shouldn't raise if you register an expansion k…
…ey with nil or [] value
4c681f6
@joshk joshk updated Time, Date and DateTime current methods in AS to use Time.zon…
…e and not Time.zone_default.

[#6410 state:committed]
9ba0c7e
@joshk joshk Updated the AS guides with some information on the difference between…
… Date.today and Date.current.
7180a32
Commits on Mar 01, 2011
@tenderlove tenderlove use a subclass of AS::TZ for testing html output cdfee85
Commits on Mar 02, 2011
@chuyeow chuyeow Fix Action caching bug where an action that has a non-cacheable respo…
…nse always renders a nil response body. It now correctly renders the response body.

Note that only GET and HTTP 200 responses can be cached.

[#6480 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
beec6c8
@spastorino spastorino Add missing versions to CHANGELOGs ea026f1
@spastorino spastorino Add some CHANGELOG entries for 3.0.6 45d5663
Commits on Mar 04, 2011
@josevalim josevalim log and readme should respect --quiet eff41a2
Commits on Mar 06, 2011
@pixeltrix pixeltrix Raise ArgumentError if route name is invalid [#6517 state:resolved] 2437c78
@pixeltrix pixeltrix Improve testing of cookies in functional tests:
- cookies can be set using string or symbol keys
- cookies are preserved across calls to get, post, etc.
- cookie names and values are escaped
- cookies can be cleared using @request.cookies.clear

[#6272 state:resolved]
e2523ff
@pixeltrix pixeltrix Report the correct value of nil.id in the exception message
as different ruby implementations may have different values,
for example Rubinius returns 53 for nil.id.

[#6444 state:resolved]
824107b
Commits on Mar 09, 2011
@pixeltrix pixeltrix Filter params that return nil for to_param 8dab7e5
Commits on Mar 10, 2011
@fxn fxn Filter sensitive query string parameters in the log [#6244 state:comm…
…itted]

This provides more safety to applications that put secret information in the query string, such as API keys or SSO tokens.

Signed-off-by: Xavier Noria <fxn@hashref.com>
434e451
@fxn fxn remove item in CHANGELOG that leaked in a merge c1f2d9b
Commits on Mar 12, 2011
Rolf Timmermans adds a couple of missing AS dependencies 30dd123
@spastorino spastorino require 'thread' in order to use Mutex 4a26cd0
@pixeltrix pixeltrix Fixed a bug when empty? was called on a grouped Relation that wasn't …
…loaded

[#5829 state:resolved]
3a22e74
@andriytyurnikov andriytyurnikov length validation for fixnums
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
01cb81a
@spastorino spastorino Add CHANGELOG entry 'Fix length validation for fixnums' 0d1ca43
Commits on Mar 13, 2011
@pixeltrix pixeltrix Remove invalid test
The test fails on PostgreSQL when trying to load the records as
the comments_count field is not included in the GROUP BY clause.
c2b474a
Commits on Mar 16, 2011
@spastorino spastorino Refactor length validation 1cbade3
@joshk joshk fixes an issue with number_to_human when converting values which are …
…less than 1 but greater than -1 [#6576 state:resolved]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
7c8a5f5
@spastorino spastorino Add number_to_human CHANGELOG entry cb2c5c5
Commits on Mar 17, 2011
@paneq paneq Fix when database column name has some symbolic characters. [#5818 st…
…ate:resolved]
c75e4ae
@spastorino spastorino Add AMo CHANGELOG entry 665065c
Commits on Mar 18, 2011
@spastorino spastorino Sync attribute_methods.rb with master code, tests added
[#6580 state:committed]
691530a
@spastorino spastorino Update CHANGELOG entry 5ec7806
Commits on Mar 21, 2011
@iain iain Reapply extensions when using except and only b8ff5f0
@tenderlove tenderlove updating ar changelog e508d9e
@tenderlove tenderlove schemas set by set_table_name are respected by the mysql adapter. [#5322
 state:resolved]
eb1eac9
@tenderlove tenderlove oops, forgot to commit this test! 66c8c6c
@tenderlove tenderlove escaping binary data encoding when inserting to sqlite3. Thanks Narus…
…e! [#6559 state:resolved]
7222786
Commits on Mar 22, 2011
@spastorino spastorino Do not in place modify what table_name returns 7717fc3
@spastorino spastorino Allow to read and write AR attributes with non valid identifiers 1b7b724
@spastorino spastorino use class_eval with a string when it's possible 63dca41
Commits on Mar 23, 2011
@h-lame h-lame Failing test case to show that habtm join table contents are removed …
…when a model is destroyed but the destruction is blocked by a before_destroy.
2f30cdc
@h-lame h-lame Make clearing of HABTM join table contents happen in an after_destory…
… callback.

The old method of redefining destroy meant that clearing the HABTM join table would happen as long as the call to destroy succeeded.  Which meant if there was a before_destroy that stopped the instance being destroyed using normal means (returning false, raising ActiveRecord::Rollback) rather than exceptional means the join table would be cleared even though the instance wasn't destroyed.  Doing it in an after_destroy hook avoids this and has the advantage of happening inside the DB transaction too.
5d43977
@adzap adzap Fix before_type_cast for timezone aware attributes by caching convert…
…ed value on write. Also remove read method reload arg on timezone attributes.
0823bbd
@pixeltrix pixeltrix Fix filter :only and :except with implicit actions
The method_name argument is "default_render" for implicit actions
so use the action_name attribute to determine which callbacks to run.

[#5673 state:resolved]
35de70f
Commits on Mar 24, 2011
@joshk joshk correction to the outputted controller name in the diagnostics error …
…template, test included

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
c6b3b89
Commits on Mar 26, 2011
@jstorimer jstorimer Correct docs for after_find and after_initialize 9d7ef79
@tenderlove tenderlove fixing whitespace errors. :bomb: 7643dfd
@tenderlove tenderlove adding a test for attributes after type cast. thanks nragaz. :heart: f28b08a
Commits on Mar 27, 2011
@tenderlove tenderlove refactoring tz to a variable rather than repeating it c9708ad
@tenderlove tenderlove cleaning up typecast test a little 004fc1c
Commits on Mar 28, 2011
@jeremy jeremy Cheaper attribute reads and respond_to?. Add underscore-prefixed meth…
…od aliased to the attribute name so it can be overridden but still called internally.
86acbf1
@sikachu sikachu Do not show optional (.:format) block for wildcard route [#6605 state…
…:resolved]

This will make the output of `rake routes` to be correctly match to the behavior of the application, as the regular expression used to match the path is greedy and won't capture the format part by default

This commit is the second attempt on fixing the issue, as the regular expression on another commit on `master` was invalid.
2dc297d
@smartinez87 smartinez87 Un-deprecate #reorder method
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
235a414
@tenderlove tenderlove updating AR changelog 90e9f2c
@tenderlove tenderlove bumping version to 3.0.6.rc1 f13fe8f
Commits on Mar 29, 2011
@pixeltrix pixeltrix Change exists? so that it doesn't instantiate records [#6127 state:re…
…solved]
827e5de
@pixeltrix pixeltrix Delegate any? and many? to scoped 7f098a6
@pixeltrix pixeltrix Quote find_in_batches ORDER BY clause [#6620 state:resolved] 3ed8a33
@josevalim josevalim Pass the proper method_name instead of hardcoding to action_name. 4e2bacd
@tenderlove tenderlove Revert "Improve testing of cookies in functional tests:"
This reverts commit e2523ff.
ba117b2
Commits on Mar 30, 2011
@baconpat baconpat Added back the use of the Reflection module's cached sanitized_condit…
…ions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
03852b6
@spastorino spastorino Bring back i18n_key to avoid regression e413953
@spastorino spastorino Bring back i18n_key to avoid regression 05f3df3
@tenderlove tenderlove Merge branch 'eager_load_has_one_with_conditions_fix' of https://gith…
…ub.com/baconpat/rails into baconpat-eager_load_has_one_with_conditions_fix

* 'eager_load_has_one_with_conditions_fix' of https://github.com/baconpat/rails:
  Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
1f38cd7
@baconpat baconpat Added back the use of the Reflection module's cached sanitized_condit…
…ions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
d6dbd54
Commits on Mar 31, 2011
John Firebaugh Support both conventions for translations for namespaced models.
3.0.0 - 3.0.1 required 'namespace/model'
3.0.2 - 3.0.5 required 'namespace.model' (nested). It has the advantage of
keeping the i18n file DRY when multiple models are in the same namespace,
but can lead to translation key conflicts if models are nested within
models.

[#6448, #5572]
5b8dbb0
John Firebaugh Support both conventions for translations for namespaced models.
3.0.0 - 3.0.1 required 'namespace/model'
3.0.2 - 3.0.5 required 'namespace.model' (nested). It has the advantage of
keeping the i18n file DRY when multiple models are in the same namespace,
but can lead to translation key conflicts if models are nested within
models.

[#6448, #5572]
0307c53
@tenderlove tenderlove bumping to 3.0.6.rc2 b13be61
Commits on Apr 05, 2011
@durran durran Destroying records via nested attributes works independent of reject_if:
- When a :_destroy truthiness is provided in the attributes hash, the
  record should get destroyed regardless of the result of the proc or
    method supplied to :reject_if. (If :allow_destroy is true)

[#6006 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
30264bb
@joshk joshk remove AM delegating register_observer and register_interceptor to Ma…
…il and instead implement smarter versions allowing for string class names, also added proper Railtie support with tests

Signed-off-by: José Valim <jose.valim@gmail.com>
e6bc818
@tenderlove tenderlove do not return html safe strings from auto_link 61ee344
@tenderlove tenderlove updating CHANGELOG for actionpack 6bb9efe
@tenderlove tenderlove updating CHANGELOG 857ec16
@tenderlove tenderlove bumping version to 3.0.6 38df020
@tenderlove tenderlove Merge branch '3-0-6' into 3-0-stable
* 3-0-6:
  bumping version to 3.0.6
  updating CHANGELOG
  updating CHANGELOG for actionpack
  do not return html safe strings from auto_link
  bumping to 3.0.6.rc2
  Support both conventions for translations for namespaced models.
  Added back the use of the Reflection module's cached sanitized_conditions in an AssociationProxy. This was recently removed and when a has_one association with conditions is eager loaded the conditions would be sanitized once for every result row, causing a database hit to fetch the columns.
  Bring back i18n_key to avoid regression
  Revert "Improve testing of cookies in functional tests:"
  bumping version to 3.0.6.rc1
  updating AR changelog
3940e34
Commits on Apr 14, 2011
@indirect indirect attributes no longer disappear if a tag contains whitespace
old:
Hash.from_xml("<tag foo='bar'>\n</tag>")
=> {"tag"=>"\n"}

new:
Hash.from_xml("<tag foo='bar'>\n</tag>")
=> {"tag"=>{"foo"=>"bar", "__content__"=>"\n"}
b41d8f3
@indirect indirect gsub is not needed (thanks @fxn!) 45683fb
@indirect indirect files are a special case and need whitespace to be significant 3d15019
@stiang stiang Fixes performance issue introduced in 3.0.6 (issue #6695) a3639be
@spastorino spastorino Add missing CHANGELOG entries 6bc9dd7
@spastorino spastorino Prepare for the 3.0.7.rc1 release 1787447
Commits on Apr 15, 2011
@jonleighton jonleighton Remove unnecessary code from define_read_method and add assertion to …
…make sure the underscored version is actually generated
36691ac
@jonleighton jonleighton Return nil from read_attribute if _foo is defined, but @attributes ha…
…s no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be.
912e5ff
@jonleighton jonleighton Backported 14b880f (Fix various issues with the :primary_key option i…
…n :through associations)
9f5ab9a
@miloops miloops Fix console to accept [environment] [options] as specified in docs. 7d2f472
@jonleighton jonleighton Undo performances regressions I introduced in 36691ac and add test fo…
…r an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."
1302443
@jonleighton jonleighton Backport test assertions from 65469a6 (the behaviour is already the s…
…ame, but we need to assertions to guard against regressions)
bd0fe87
@jonleighton jonleighton Update CHANGELOG df6117e
@jonleighton jonleighton Remove unnecessary code from define_read_method and add assertion to …
…make sure the underscored version is actually generated
ef95df7
@jonleighton jonleighton Return nil from read_attribute if _foo is defined, but @attributes ha…
…s no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be.
3609642
@jonleighton jonleighton Undo performances regressions I introduced in 36691ac and add test fo…
…r an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."
ef88c0c
@jonleighton jonleighton Backport test assertions from 65469a6 (the behaviour is already the s…
…ame, but we need to assertions to guard against regressions)
364a5d4
@jonleighton jonleighton Update CHANGELOG 20354b7
@pixeltrix pixeltrix Add missing CHANGELOG entries 612afa2
@smartinez87 smartinez87 Added missing CHANGELOG entries for 3.0.7
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
de42af7
@spastorino spastorino Prepare for the 3.0.7.rc2 release f96ad0d
Commits on Apr 16, 2011
@mikel mikel Updating mail to 2.2.16 2bd5e02
Commits on Apr 18, 2011
@arunagw arunagw File should be open in read/write mode. When doing lock on a file. c6c46e1
@tenderlove tenderlove adding a rake task to update CHANGELOG dates ff3cff8
@tenderlove tenderlove bumping version for release 2c32601
@tenderlove tenderlove Merge branch '3-0-7' into 3-0-stable
* 3-0-7:
  bumping version for release
  adding a rake task to update CHANGELOG dates
  Prepare for the 3.0.7.rc2 release
  Added missing CHANGELOG entries for 3.0.7
  Add missing CHANGELOG entries
  Update CHANGELOG
  Backport test assertions from 65469a6 (the behaviour is already the same, but we need to assertions to guard against regressions)
  Undo performances regressions I introduced in 36691ac and add test for an edge case. Add comments to explain the intent of the code. Also fix the code (which previously worked differently on 1.8 and 1.9 due to Symbol#=~ being always false on 1.8)."
  Return nil from read_attribute if _foo is defined, but @attributes has no 'foo' key. Fixes breakage in test_find_only_some_columns on Ruby 1.9 which was introduced in a3639be.
  Remove unnecessary code from define_read_method and add assertion to make sure the underscored version is actually generated

Conflicts:
	activerecord/CHANGELOG
9382cb4
@tenderlove tenderlove adding a rake task to help generate changelog notes for release annou…
…ncements
d9bca64
Commits on Apr 19, 2011
@josevalim josevalim Avoid define_method if possible. afcdf9b
Moiz Raja correct links to rack articles 1f92d13
@rohit rohit Guides: Add test directory to load path to run individual test files. c1720fb
Commits on Apr 22, 2011
@fxposter fxposter Added test case and fix for proper eager loading associations 3836dc6
@joshk joshk correction to the i18n locale filter examples 030a905
Commits on Apr 26, 2011
@mikel mikel Update actionmailer to use Mail 2.2.19 922fb1d
@josevalim josevalim Merged pull request #278 from miloops/fix_console.
Fix console to accept [environment] [options] as specified in docs.
8dcaf4d
Commits on Apr 29, 2011
@pkmiec pkmiec perofrmance trumps syntactical sugar 92e4cfb
@tenderlove tenderlove Merged pull request #347 from pkmiec/SyntacticalSugar30.
performance trumps syntactical sugar
1e19a05
@josevalim josevalim Make postgresql faster on development (thanks to @tapajos). 69079a1
@vijaydev vijaydev update verification.git plugin url 6bcb352
@tenderlove tenderlove Merged pull request #351 from vijaydev/3-0-stable.
Update the github url for the verification plugin
d657b9e
@tenderlove tenderlove Merged pull request #351 from vijaydev/3-0-stable.
Update the github url for the verification plugin
5663e63
@tenderlove tenderlove only use mysql2 0.2.x with rails 3.0.x c751d84
Commits on Apr 30, 2011
@daphonz daphonz This patch ensures that an inner join performed to a polymorphic reso…
…urce joins on both the polymorphic_id and polymorphic_type fields.

Previously, the inner joins were merely joining on the polymorphic_id field.
b538e85
@daphonz daphonz This patch allows a user to join through a polymorphic has_one associ…
…ation to another has_one polymorphic association. This also includes a fix in to the Author model test to properly define two associations to taggings as a has_one and a has_many.
0525306
Commits on May 04, 2011
@mathie mathie Add a couple of missing activesupport requires so AR::Migration can b…
…e used independently.
cd028aa
@josevalim josevalim Merge pull request #383 from mathie/patch-1.
Extra requires for AR::Migration
957115f
Commits on May 06, 2011
@josevalim josevalim Don't pluralize, camelize. 24fbc47
@josevalim josevalim Revert "Pass the proper method_name instead of hardcoding to action_n…
…ame."

This commit was actually correct. The first parameter in process_action
is not necessarily the same as the action_name. Use action_name to
retrieve the action instead.

This reverts commit 4e2bacd.
9575db6
Commits on May 09, 2011
@svenwin svenwin Fix Issue #342 7a79ab7
@josevalim josevalim Merge pull request #465 from sven-q/3-0-stable
Issue #342: AssetTagHelper ensures that files are in the wrong directory (again)
f1d09a2
Commits on May 10, 2011
@tenderlove tenderlove removing splat flatten as we no longer support 1.8.6. fixes #485. Tha…
…nks @sztywny
840f0a9
@jonleighton jonleighton Merge pull request #352 from daphonz/polymorphic-join-sql-patch
Fixes for incorrect INNER JOIN through two polymorphic resources (NoMethodError: undefined method `to_sym' for nil:NilClass)
f156258
Commits on May 13, 2011
@dougfales dougfales A patch so that http status codes are still included in logs even dur…
…ing an exception [#6333 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
56b6d7d
@tenderlove tenderlove RedCloth will not install on 1.9.3 ea9ef39
@tenderlove tenderlove use valid yaml in tests 00da7bc
@tenderlove tenderlove use encoding name since SJIS is Windows-31J on 1.9.3 81535fa
@tenderlove tenderlove test/unit in ruby trunk adds a new instance variable. YAY! 7775670
@tenderlove tenderlove backport skip to the AR base class e4f48b9
@tenderlove tenderlove supporting infinity and -infinity for timestamps in PG. fixes #544 dc2b999
Bradley Harris Fix bug with empty CDATA not being handled in Hash.from_xml
Signed-off-by: José Valim <jose.valim@gmail.com>
849007f
Commits on May 16, 2011
@tenderlove tenderlove simplifying buffered logger for easier and slightly more performant c…
…odes. pumpkin
a2b1be2
@tenderlove tenderlove make sure log file is written in binary mode. fixes #497 f2c6f04
Commits on May 17, 2011
@NZKoz NZKoz Make sure that 3.0.x apps generated reference a compatible mysql2 rel…
…ease.
2004fb9
@NZKoz NZKoz Add a deprecation warning about config.action_view.debug_rjs.
Upgrading to 3.1 removes debug_rjs and upgraded apps will fail to start up.
b03da24
@tenderlove tenderlove bumping gem dependency for arel on 3.0.x 78f855c
Commits on May 18, 2011
@fxn fxn set log encoding to BINARY, but still use text mode to output portabl…
…e newlines
a37ae63
Commits on May 23, 2011
@bilts bilts Make Rake::DSL methods available within Railtie rake_tasks block
Fixes incompatibility introduced by Rake 0.9.0
83f257f
Commits on May 24, 2011
@arunagw arunagw Fixed failing test against with 3-0-stable branch. 89252c4
@josevalim josevalim Merge pull request #1266 from arunagw/deprecation_warning_3_0_fix
Deprecation warning 3 0 fix
f505565
@arunagw arunagw Fixed failing tests. 17c9efb
@josevalim josevalim Merge pull request #1269 from arunagw/fix_load_path_test_3_0
Fix load path test 3 0
f236dbf
@JoeyButler JoeyButler Add failing test case for issue 796 d387a59
@tenderlove tenderlove do not bother with assert_nothing_raised, the test will fail and we g…
…et a better trace without it
99cfdba
@tenderlove tenderlove adding a test for create! with invalid associations f0c09f7
@tenderlove tenderlove add tests surrounding behavior of save and save! for associations tha…
…t have validation errors
1c079c5
@tenderlove tenderlove rescue record invalid exceptions and return false from the save metho…
…d. fixes #796
79abb70
@tenderlove tenderlove make open_log private 2649db7
@spastorino spastorino Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0 352daff
@spastorino spastorino default_executable is deprecated since rubygems 1.7.0 79ed700
Commits on May 25, 2011
@tenderlove tenderlove fixing psych support in big decimal, fixing tests to support YAML 1.1 929e5c4
@tenderlove tenderlove prefering psych as the yaml parser if possible, fixing assertions for…
… YAML 1.1 compatibility
f55a171
@tenderlove tenderlove load psych by default if possible 8e6b757
@tenderlove tenderlove require Psych if possible, use Psych output when enabled 03f0f3c
@tenderlove tenderlove load and prefer psych as the YAML parser when it is available e4594f7
@tenderlove tenderlove use ! " " YAML string literal syntax rather than removing both quotes 5856fc5
@tenderlove tenderlove add Psych::SyntaxError to the list of rescued YAML exceptions cae1d46
@tenderlove tenderlove updating changelogs eecbc10
@tenderlove tenderlove bumping to 3.0.8.rc1 8b0806e
Commits on May 26, 2011
@parndt parndt This fixes rake for me in RefineryCMS. Otherwise, I get: undefined me…
…thod 'prerequisites' for nil:NilClass (from rspec)
9e88b87
@tenderlove tenderlove Merge pull request #1317 from parndt/3-0-stable
This fixes rake for me in RefineryCMS.
072e1ca
@tenderlove tenderlove adding a test for #1322 579d044
@tenderlove tenderlove quoting id columns when doing hm:t joins. fixes #1322 179a8a4
Commits on May 27, 2011
@arunagw arunagw Loading active_support/core_ext/hash/conversions fixed Undefined meth…
…od from_xml
56097c0
@arunagw arunagw Using java_import instead of import. Need with rake 0.9.0 #jruby 993bd32
@arunagw arunagw Loading files if PLATFORM available. #jruby 4c330d6
@josevalim josevalim Merge pull request #1351 from arunagw/3-0-stable-jruby-jdom-fixes
3 0 stable jruby jdom fixes
2ca0ae9
@tenderlove tenderlove extend with Rake::DSL in case of rake 0.9.0. fixes #1322 57958cb
@tenderlove tenderlove bumping to 3.0.8.rc2 d756525
@tenderlove tenderlove fixing test for mysql2 c3cbd2c
@sirlantis sirlantis Through-association owner's primary key wasn't quoted. Generates inva…
…lid SQL (id = ) if the record wasn't saved yet (i.e. the primary key's value is nil).
152c41d
@sirlantis sirlantis added regression test 1df2286
@sirlantis sirlantis call .quote_value with column-parameter in patch #1362 d3cfb93
Commits on May 28, 2011
@arunagw arunagw Fixing XMLMini_JDOM #3-0-stable 6431087
@arunagw arunagw File From Xml is working now. #3-0-stable d8b6fcb
@tenderlove tenderlove Merge pull request #1369 from arunagw/3-0-stable
File From Xml is working now. #3-0-stable
3332b49
Commits on May 29, 2011
@tenderlove tenderlove Merge pull request #1362 from sirlantis/patch-1
Unquoted query generated by through-association scope
f07fd69
@sirlantis sirlantis Really fix #1322 (Rake::DSL issue) d92b22f
@tenderlove tenderlove Merge pull request #1397 from sirlantis/3-0-8
Really fix #1322 (Rake::DSL issue)
60a7c34
Commits on May 30, 2011
@arunagw arunagw Fixed tests for #jruby fe99a81
@tenderlove tenderlove Merge branch '3-0-stable' into 3-0-8
* 3-0-stable:
  File From Xml is working now. #3-0-stable
  Fixing  XMLMini_JDOM #3-0-stable
  fixing test for mysql2
636124e
@tenderlove tenderlove bumping to rc3 f4073d5
Commits on May 31, 2011
@tenderlove tenderlove rebuilding rc because of syck. :'( ce23c6e
@tenderlove tenderlove Merge pull request #1400 from arunagw/query_cache_test
Query cache test
56f13a3
@vatrai vatrai AttributeMethodTest test fix #jruby bd64cc9
@pixeltrix pixeltrix Make MemCacheStore work with Ruby 1.9 and -Ku 91f6fba
Commits on Jun 01, 2011
@arunagw arunagw Adding comment bddf9ad
@jonleighton jonleighton Merge pull request #1430 from vatrai/jruby_test_fix
test fixes for jruby
7bd8012
@jonleighton jonleighton Fix broken test. You know, the merge button will be the end of us... 4c0bed0
Commits on Jun 02, 2011
@sikachu sikachu Revert "Fix broken test. You know, the merge button will be the end o…
…f us..."

The fix was intentionaly for this branch, but was applied to another
branches by mistake. This should fix the CI.

This reverts commit 4c0bed0.
4b8b16b
@NZKoz NZKoz Merge pull request #1454 from sikachu/revert_failing_commit
Revert failing commit
9f50123
Commits on Jun 04, 2011
@jonleighton jonleighton Force RAILS_ENV=development in rackup_test.rb. This fixes a problem o…
…n the CI server. For some reason the RAILS_ENV on the CI server is production, which means that the ActionDispatch::Static middleware is not used, and so the request in 'config.ru can be racked up' returns a 404 rather than a 200.
11da7d3
@jonleighton jonleighton Refactor Active Record test connection setup. Please see the RUNNING_…
…UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.
93447be
@jonleighton jonleighton Bring back oracle specific crap 9675ad6
Commits on Jun 05, 2011
@jonleighton jonleighton Fix typo 6764449
@jonleighton jonleighton Fix adapter_test.rb to make no assumptions about the database name 6c1b7dc
@jonleighton jonleighton load_path_test.rb is also dependent on RAILS_ENV=development 1debebc
Commits on Jun 06, 2011
@arunagw arunagw framework_test.rb also dependent on RAILS_ENV=development 55b52ee
@arunagw arunagw loading_test.rb with RAILS_ENV=development db9ad5e
@arunagw arunagw Fix for CI server. Dependent on RAILS_ENV=development 101f0a6
@josevalim josevalim Merge pull request #1506 from arunagw/3-0-stable
Cherry-picked from master to fix the build
e9b025e
@jonleighton jonleighton Solve the RAILS_ENV problem in the railties tests in a more generic way 6512af2
@vijaydev vijaydev fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 13c8ed3
@vijaydev vijaydev fixes Rake::RDocTask deprecation warnings from rake 0.9.0 (cherry picked
b921679 for 3-0-stable)
91bdd36
@vijaydev vijaydev cherry picked 24b28a2 for 3-0-stable. Original Author: amatsuda 81b01b7
@vijaydev vijaydev cherry picked 05adf52 for 3-0-stable. Original Author: amatsuda bbfd652
@tenderlove tenderlove Merge pull request #1511 from vijaydev/rake_rdoc_fixes_cherry_picks_3_0
Rake rdoc fixes cherry picks for 3-0-stable
d55cf30
@jonleighton jonleighton Fix another CIfail :zap: :fire: Deleting RAILS_ENV from ENV doesn't produce th…
…e desired result if RACK_ENV is still defined. And in any case it's better to be explicit here, so just set RALS_ENV=development.
5ffd03f
@jonleighton jonleighton Fix double definition of #teardown. Thanks @mike-burns :+1: 7497d27
@jonleighton jonleighton Make sure that the build/drop database rake tasks take account of the…
… test/config.yml config
0a4eb26
@tenderlove tenderlove please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT 1241997
@tenderlove tenderlove add test to the include path 29c7258
@tenderlove tenderlove updating configs for oracle e6c2d54
@tenderlove tenderlove do not muck with the load path, that is the test task responsibility 3f3648c
@tenderlove tenderlove more oracle fixes f0cb0ed
@tenderlove tenderlove set the environment variable from the rake file f8301eb
@tenderlove tenderlove oops! add parens so the block is properly bound 1f02e3e
Commits on Jun 07, 2011
@tenderlove tenderlove make sure AR isolated tests set the environment variable b3b747d
@NZKoz NZKoz Ensure that the strings returned by SafeBuffer#gsub and friends aren'…
…t considered html_safe?

Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.
53a2c0b
@nono nono Do not modify a safe buffer in helpers
Signed-off-by: Michael Koziarski <michael@koziarski.com>
ed37964
@tenderlove tenderlove bumping to 3.0.8 b341e45
@tenderlove tenderlove Merge branch '3-0-8' into 3-0-stable
* 3-0-8:
  bumping to 3.0.8
  Do not modify a safe buffer in helpers
  Ensure that the strings returned by SafeBuffer#gsub and friends aren't considered html_safe?
54d262f
Commits on Jun 08, 2011
@arunagw arunagw Fixed mailto for SafeBuffer#gsub cdf617e
@arunagw arunagw Cache helper fixed for SafeBuffer 059692a
@tenderlove tenderlove Merge pull request #1541 from arunagw/3-0-stable
Fixed for SafeBuffer
bdc80dd
@sikachu sikachu Adapt [059692a] to make sure we perform correct cloning before manipu…
…lation on `OutputBuffer`.

This has been adapted from [823aa22]. However, after the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa22] does not play nice with the String, and result in the fragment got lost.
114b5e4
@tenderlove tenderlove Merge pull request #1545 from sikachu/30testbuffer
Fix test on 3-0-stable regarding SafeBuffer
2111509
@rsim rsim Fix for Oracle adapter to count SELECT queries for assert_queries ass…
…ertion

Needed just in 3-0-stable branch, query counting is refactored in 3-1-stable and master branches and do not need this patch anymore.
d909693
@jonleighton jonleighton Merge pull request #1554 from rsim/assert_queries_oracle_fix_for_3_0
Assert queries oracle fix for 3 0
eff72b2
@tardate tardate Make escape_javascript happy to handle SafeBuffers
* see GH#1553
* allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block
75ecdfb
@josevalim josevalim Merge pull request #1558 from tardate/3-0-stable
Fix for issue 1553 - escape_javascript to support SafeBuffer strings
910b34d
@sikachu sikachu Update CHANGELOG to mention the new SafeBuffer change 4252a35
@tenderlove tenderlove Merge pull request #1565 from sikachu/3-0-stable-changelog
Update CHANGELOG to mention the new SafeBuffer change
02e65ef
@sikachu sikachu Revert "Fixed mailto for SafeBuffer#gsub"
It was fixing it in a bad way by changing test.

This reverts commit cdf617e.
f57c707
@sikachu sikachu Add proper fix to `mail_to` helper.
* Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
4b1309e
@tenderlove tenderlove Merge pull request #1568 from sikachu/3-0-stable-mailto
Add proper fix to mail_to helper
1ae9b29
@tenderlove tenderlove bumping to 3.0.9.rc1 0c1608c
Commits on Jun 09, 2011
@chopmo chopmo Fix issue #1598 by adding a dependency to the RDoc gem. b002181
@sikachu sikachu Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…
…ument is already html_safe
8fcdc15
@tenderlove tenderlove ensuring that json_escape returns html safe strings when passed an ht…
…ml safe string
cce7085
@tenderlove tenderlove bumping to 3.0.9.rc2 0e1ecb2