Skip to content
This repository
  • 1,311 commits
  • 829 files changed
  • 71 comments
  • 47 contributors
This comparison is big! We're only showing the most recent 250 commits
Mar 09, 2011
Andrew White pixeltrix Filter params that return nil for to_param 8dab7e5
Mar 11, 2011
Xavier Noria 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
Xavier Noria fxn remove item in CHANGELOG that leaked in a merge c1f2d9b
Mar 12, 2011
Rolf Timmermans adds a couple of missing AS dependencies 30dd123
Santiago Pastorino spastorino require 'thread' in order to use Mutex 4a26cd0
Andrew White pixeltrix Fixed a bug when empty? was called on a grouped Relation that wasn't …
…loaded

[#5829 state:resolved]
3a22e74
Andriy Tyurnikov andriytyurnikov length validation for fixnums
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
01cb81a
Santiago Pastorino spastorino Add CHANGELOG entry 'Fix length validation for fixnums' 0d1ca43
Mar 13, 2011
Andrew White 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
Mar 16, 2011
Santiago Pastorino spastorino Refactor length validation 1cbade3
Josh Kalderimis 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
Santiago Pastorino spastorino Add number_to_human CHANGELOG entry cb2c5c5
Robert Pankowecki paneq Fix when database column name has some symbolic characters. [#5818 st…
…ate:resolved]
c75e4ae
Santiago Pastorino spastorino Add AMo CHANGELOG entry 665065c
Mar 17, 2011
Santiago Pastorino spastorino Sync attribute_methods.rb with master code, tests added
[#6580 state:committed]
691530a
Santiago Pastorino spastorino Update CHANGELOG entry 5ec7806
Mar 21, 2011
Iain Hecker iain Reapply extensions when using except and only b8ff5f0
Aaron Patterson tenderlove updating ar changelog e508d9e
Aaron Patterson tenderlove schemas set by set_table_name are respected by the mysql adapter. [#5322
state:resolved]
eb1eac9
Aaron Patterson tenderlove oops, forgot to commit this test! 66c8c6c
Aaron Patterson tenderlove escaping binary data encoding when inserting to sqlite3. Thanks Narus…
…e! [#6559 state:resolved]
7222786
Mar 22, 2011
Santiago Pastorino spastorino Do not in place modify what table_name returns 7717fc3
Santiago Pastorino spastorino Allow to read and write AR attributes with non valid identifiers 1b7b724
Santiago Pastorino spastorino use class_eval with a string when it's possible 63dca41
Mar 23, 2011
Murray Steele 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
Murray Steele 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
Adam Meehan 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
Andrew White 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
Mar 24, 2011
Josh Kalderimis joshk correction to the outputted controller name in the diagnostics error …
…template, test included

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
c6b3b89
Mar 26, 2011
Jesse Storimer jstorimer Correct docs for after_find and after_initialize 9d7ef79
Aaron Patterson tenderlove fixing whitespace errors. :bomb: 7643dfd
Aaron Patterson tenderlove adding a test for attributes after type cast. thanks nragaz. :heart: f28b08a
Aaron Patterson tenderlove refactoring tz to a variable rather than repeating it c9708ad
Aaron Patterson tenderlove cleaning up typecast test a little 004fc1c
Mar 28, 2011
Jeremy Kemper 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
Sebastian Martinez smartinez87 Un-deprecate #reorder method
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
235a414
Aaron Patterson tenderlove updating AR changelog 90e9f2c
Aaron Patterson tenderlove bumping version to 3.0.6.rc1 f13fe8f
Mar 29, 2011
Prem Sichanugrist 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
Andrew White pixeltrix Change exists? so that it doesn't instantiate records [#6127 state:re…
…solved]
827e5de
Andrew White pixeltrix Delegate any? and many? to scoped 7f098a6
Andrew White pixeltrix Quote find_in_batches ORDER BY clause [#6620 state:resolved] 3ed8a33
José Valim josevalim Pass the proper method_name instead of hardcoding to action_name. 4e2bacd
Aaron Patterson tenderlove Revert "Improve testing of cookies in functional tests:"
This reverts commit e2523ff.
ba117b2
Patrick Bacon 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
Mar 30, 2011
Santiago Pastorino spastorino Bring back i18n_key to avoid regression e413953
Santiago Pastorino spastorino Bring back i18n_key to avoid regression 05f3df3
Aaron Patterson 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
Patrick Bacon 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
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
Aaron Patterson tenderlove bumping to 3.0.6.rc2 b13be61
Apr 05, 2011
Durran Jordan 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
Josh Kalderimis 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
Aaron Patterson tenderlove do not return html safe strings from auto_link 61ee344
Aaron Patterson tenderlove updating CHANGELOG for actionpack 6bb9efe
Aaron Patterson tenderlove updating CHANGELOG 857ec16
Aaron Patterson tenderlove bumping version to 3.0.6 38df020
Aaron Patterson 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
Apr 14, 2011
André Arko 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
André Arko indirect gsub is not needed (thanks @fxn!) 45683fb
André Arko indirect files are a special case and need whitespace to be significant 3d15019
Stian Grytøyr stiang Fixes performance issue introduced in 3.0.6 (issue #6695) a3639be
Santiago Pastorino spastorino Add missing CHANGELOG entries 6bc9dd7
Santiago Pastorino spastorino Prepare for the 3.0.7.rc1 release 1787447
Emilio Tagua miloops Fix console to accept [environment] [options] as specified in docs. 7d2f472
Apr 15, 2011
Jon Leighton jonleighton Remove unnecessary code from define_read_method and add assertion to …
…make sure the underscored version is actually generated
36691ac
Jon Leighton 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
Jon Leighton jonleighton Backported 14b880f (Fix various issues with the :primary_key option i…
…n :through associations)
9f5ab9a
Jon Leighton 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
Jon Leighton jonleighton Backport test assertions from 65469a6 (the behaviour is already the s…
…ame, but we need to assertions to guard against regressions)
bd0fe87
Jon Leighton jonleighton Update CHANGELOG df6117e
Jon Leighton jonleighton Remove unnecessary code from define_read_method and add assertion to …
…make sure the underscored version is actually generated
ef95df7
Jon Leighton 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
Jon Leighton 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
Jon Leighton jonleighton Backport test assertions from 65469a6 (the behaviour is already the s…
…ame, but we need to assertions to guard against regressions)
364a5d4
Jon Leighton jonleighton Update CHANGELOG 20354b7
Andrew White pixeltrix Add missing CHANGELOG entries 612afa2
Sebastian Martinez smartinez87 Added missing CHANGELOG entries for 3.0.7
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
de42af7
Santiago Pastorino spastorino Prepare for the 3.0.7.rc2 release f96ad0d
Apr 16, 2011
Mikel Lindsaar mikel Updating mail to 2.2.16 2bd5e02
Apr 18, 2011
Arun Agrawal arunagw File should be open in read/write mode. When doing lock on a file. c6c46e1
Aaron Patterson tenderlove adding a rake task to update CHANGELOG dates ff3cff8
Aaron Patterson tenderlove bumping version for release 2c32601
Aaron Patterson 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
Aaron Patterson tenderlove adding a rake task to help generate changelog notes for release annou…
…ncements
d9bca64
Apr 19, 2011
José Valim josevalim Avoid define_method if possible. afcdf9b
Moiz Raja correct links to rack articles 1f92d13
Rohit Arondekar rohit Guides: Add test directory to load path to run individual test files. c1720fb
Apr 21, 2011
Pavel Forkert fxposter Added test case and fix for proper eager loading associations 3836dc6
Apr 23, 2011
Josh Kalderimis joshk correction to the i18n locale filter examples 030a905
Apr 26, 2011
Mikel Lindsaar mikel Update actionmailer to use Mail 2.2.19 922fb1d
José Valim josevalim Merged pull request #278 from miloops/fix_console.
Fix console to accept [environment] [options] as specified in docs.
8dcaf4d
Apr 28, 2011
Paul Kmiec pkmiec perofrmance trumps syntactical sugar 92e4cfb
Apr 29, 2011
Aaron Patterson tenderlove Merged pull request #347 from pkmiec/SyntacticalSugar30.
performance trumps syntactical sugar
1e19a05
José Valim josevalim Make postgresql faster on development (thanks to @tapajos). 69079a1
Aaron Patterson tenderlove Merged pull request #351 from vijaydev/3-0-stable.
Update the github url for the verification plugin
d657b9e
Aaron Patterson tenderlove Merged pull request #351 from vijaydev/3-0-stable.
Update the github url for the verification plugin
5663e63
Aaron Patterson tenderlove only use mysql2 0.2.x with rails 3.0.x c751d84
Casey Dreier 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
Casey Dreier 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
Apr 30, 2011
Vijay Dev vijaydev update verification.git plugin url 6bcb352
May 03, 2011
Graeme Mathieson mathie Add a couple of missing activesupport requires so AR::Migration can b…
…e used independently.
cd028aa
José Valim josevalim Merge pull request #383 from mathie/patch-1.
Extra requires for AR::Migration
957115f
May 06, 2011
José Valim josevalim Don't pluralize, camelize. 24fbc47
José Valim 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
May 09, 2011
Sven Winkler svenwin Fix Issue #342 7a79ab7
José Valim josevalim Merge pull request #465 from sven-q/3-0-stable
Issue #342: AssetTagHelper ensures that files are in the wrong directory (again)
f1d09a2
May 10, 2011
Aaron Patterson tenderlove removing splat flatten as we no longer support 1.8.6. fixes #485. Tha…
…nks @sztywny
840f0a9
Jon Leighton 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
May 13, 2011
Doug Fales 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
Aaron Patterson tenderlove RedCloth will not install on 1.9.3 ea9ef39
Aaron Patterson tenderlove use valid yaml in tests 00da7bc
Aaron Patterson tenderlove use encoding name since SJIS is Windows-31J on 1.9.3 81535fa
Aaron Patterson tenderlove test/unit in ruby trunk adds a new instance variable. YAY! 7775670
Aaron Patterson tenderlove backport skip to the AR base class e4f48b9
Aaron Patterson tenderlove supporting infinity and -infinity for timestamps in PG. fixes #544 dc2b999
May 14, 2011
Bradley Harris Fix bug with empty CDATA not being handled in Hash.from_xml
Signed-off-by: José Valim <jose.valim@gmail.com>
849007f
May 16, 2011
Aaron Patterson tenderlove simplifying buffered logger for easier and slightly more performant c…
…odes. pumpkin
a2b1be2
Aaron Patterson tenderlove make sure log file is written in binary mode. fixes #497 f2c6f04
May 17, 2011
Michael Koziarski NZKoz Make sure that 3.0.x apps generated reference a compatible mysql2 rel…
…ease.
2004fb9
Michael Koziarski 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
Aaron Patterson tenderlove bumping gem dependency for arel on 3.0.x 78f855c
May 18, 2011
Xavier Noria fxn set log encoding to BINARY, but still use text mode to output portabl…
…e newlines
a37ae63
May 23, 2011
Patrick Quinn bilts Make Rake::DSL methods available within Railtie rake_tasks block
Fixes incompatibility introduced by Rake 0.9.0
83f257f
May 24, 2011
Arun Agrawal arunagw Fixed failing test against with 3-0-stable branch. 89252c4
José Valim josevalim Merge pull request #1266 from arunagw/deprecation_warning_3_0_fix
Deprecation warning 3 0 fix
f505565
Arun Agrawal arunagw Fixed failing tests. 17c9efb
José Valim josevalim Merge pull request #1269 from arunagw/fix_load_path_test_3_0
Fix load path test 3 0
f236dbf
Joey B JoeyButler Add failing test case for issue 796 d387a59
Aaron Patterson tenderlove do not bother with assert_nothing_raised, the test will fail and we g…
…et a better trace without it
99cfdba
Aaron Patterson tenderlove adding a test for create! with invalid associations f0c09f7
Aaron Patterson tenderlove add tests surrounding behavior of save and save! for associations tha…
…t have validation errors
1c079c5
Aaron Patterson tenderlove rescue record invalid exceptions and return false from the save metho…
…d. fixes #796
79abb70
Aaron Patterson tenderlove make open_log private 2649db7
Santiago Pastorino spastorino Gem::Specification#has_rdoc= is deprecated since rubygems 1.7.0 352daff
Santiago Pastorino spastorino default_executable is deprecated since rubygems 1.7.0 79ed700
May 25, 2011
Aaron Patterson tenderlove fixing psych support in big decimal, fixing tests to support YAML 1.1 929e5c4
Aaron Patterson tenderlove prefering psych as the yaml parser if possible, fixing assertions for…
… YAML 1.1 compatibility
f55a171
Aaron Patterson tenderlove load psych by default if possible 8e6b757
Aaron Patterson tenderlove require Psych if possible, use Psych output when enabled 03f0f3c
Aaron Patterson tenderlove load and prefer psych as the YAML parser when it is available e4594f7
Aaron Patterson tenderlove use ! " " YAML string literal syntax rather than removing both quotes 5856fc5
Aaron Patterson tenderlove add Psych::SyntaxError to the list of rescued YAML exceptions cae1d46
Aaron Patterson tenderlove updating changelogs eecbc10
Aaron Patterson tenderlove bumping to 3.0.8.rc1 8b0806e
Aaron Patterson tenderlove Merge pull request #1317 from parndt/3-0-stable
This fixes rake for me in RefineryCMS.
072e1ca
May 26, 2011
Philip Arndt parndt This fixes rake for me in RefineryCMS. Otherwise, I get: undefined me…
…thod 'prerequisites' for nil:NilClass (from rspec)
9e88b87
Aaron Patterson tenderlove adding a test for #1322 579d044
Aaron Patterson tenderlove quoting id columns when doing hm:t joins. fixes #1322 179a8a4
May 27, 2011
Arun Agrawal arunagw Loading active_support/core_ext/hash/conversions fixed Undefined meth…
…od from_xml
56097c0
Arun Agrawal arunagw Using java_import instead of import. Need with rake 0.9.0 #jruby 993bd32
Arun Agrawal arunagw Loading files if PLATFORM available. #jruby 4c330d6
José Valim josevalim Merge pull request #1351 from arunagw/3-0-stable-jruby-jdom-fixes
3 0 stable jruby jdom fixes
2ca0ae9
Aaron Patterson tenderlove extend with Rake::DSL in case of rake 0.9.0. fixes #1322 57958cb
Aaron Patterson tenderlove bumping to 3.0.8.rc2 d756525
Aaron Patterson tenderlove fixing test for mysql2 c3cbd2c
Marcel Jackwerth 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
Marcel Jackwerth sirlantis added regression test 1df2286
Marcel Jackwerth sirlantis call .quote_value with column-parameter in patch #1362 d3cfb93
Aaron Patterson tenderlove Merge pull request #1369 from arunagw/3-0-stable
File From Xml is working now. #3-0-stable
3332b49
May 28, 2011
Arun Agrawal arunagw Fixing XMLMini_JDOM #3-0-stable 6431087
Arun Agrawal arunagw File From Xml is working now. #3-0-stable d8b6fcb
Aaron Patterson tenderlove Merge pull request #1362 from sirlantis/patch-1
Unquoted query generated by through-association scope
f07fd69
May 29, 2011
Marcel Jackwerth sirlantis Really fix #1322 (Rake::DSL issue) d92b22f
Aaron Patterson tenderlove Merge pull request #1397 from sirlantis/3-0-8
Really fix #1322 (Rake::DSL issue)
60a7c34
May 30, 2011
Arun Agrawal arunagw Fixed tests for #jruby fe99a81
Aaron Patterson 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
Aaron Patterson tenderlove bumping to rc3 f4073d5
Aaron Patterson tenderlove rebuilding rc because of syck. :'( ce23c6e
Aaron Patterson tenderlove Merge pull request #1400 from arunagw/query_cache_test
Query cache test
56f13a3
May 31, 2011
Andrew White pixeltrix Make MemCacheStore work with Ruby 1.9 and -Ku 91f6fba
Jun 01, 2011
Vishnu Atrai vatrai AttributeMethodTest test fix #jruby bd64cc9
Arun Agrawal arunagw Adding comment bddf9ad
Jon Leighton jonleighton Merge pull request #1430 from vatrai/jruby_test_fix
test fixes for jruby
7bd8012
Jon Leighton jonleighton Fix broken test. You know, the merge button will be the end of us... 4c0bed0
Prem Sichanugrist 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
Michael Koziarski NZKoz Merge pull request #1454 from sikachu/revert_failing_commit
Revert failing commit
9f50123
Jun 04, 2011
Jon Leighton 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
Jon Leighton 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
Jon Leighton jonleighton Bring back oracle specific crap 9675ad6
Jun 05, 2011
Jon Leighton jonleighton Fix typo 6764449
Jon Leighton jonleighton Fix adapter_test.rb to make no assumptions about the database name 6c1b7dc
Jon Leighton jonleighton load_path_test.rb is also dependent on RAILS_ENV=development 1debebc
Jun 06, 2011
Arun Agrawal arunagw framework_test.rb also dependent on RAILS_ENV=development 55b52ee
Arun Agrawal arunagw loading_test.rb with RAILS_ENV=development db9ad5e
Arun Agrawal arunagw Fix for CI server. Dependent on RAILS_ENV=development 101f0a6
José Valim josevalim Merge pull request #1506 from arunagw/3-0-stable
Cherry-picked from master to fix the build
e9b025e
Jon Leighton jonleighton Solve the RAILS_ENV problem in the railties tests in a more generic way 6512af2
Vijay Dev vijaydev fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 13c8ed3
Vijay Dev vijaydev fixes Rake::RDocTask deprecation warnings from rake 0.9.0 (cherry picked
b921679 for 3-0-stable)
91bdd36
Vijay Dev vijaydev cherry picked 24b28a2 for 3-0-stable. Original Author: amatsuda 81b01b7
Vijay Dev vijaydev cherry picked 05adf52 for 3-0-stable. Original Author: amatsuda bbfd652
Aaron Patterson tenderlove Merge pull request #1511 from vijaydev/rake_rdoc_fixes_cherry_picks_3_0
Rake rdoc fixes cherry picks for 3-0-stable
d55cf30
Jon Leighton jonleighton Fix another CIfail :zap::fire: Deleting RAILS_ENV from ENV doesn't produce the…
… 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
Jon Leighton jonleighton Fix double definition of #teardown. Thanks @mike-burns :+1: 7497d27
Jon Leighton jonleighton Make sure that the build/drop database rake tasks take account of the…
… test/config.yml config
0a4eb26
Aaron Patterson tenderlove please use ruby -I lib:test path/to/test.rb, or export RUBY_OPT 1241997
Aaron Patterson tenderlove add test to the include path 29c7258
Aaron Patterson tenderlove updating configs for oracle e6c2d54
Aaron Patterson tenderlove do not muck with the load path, that is the test task responsibility 3f3648c
Aaron Patterson tenderlove more oracle fixes f0cb0ed
Aaron Patterson tenderlove set the environment variable from the rake file f8301eb
Aaron Patterson tenderlove oops! add parens so the block is properly bound 1f02e3e
Aaron Patterson tenderlove make sure AR isolated tests set the environment variable b3b747d
Jun 07, 2011
Michael Koziarski 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
Bruno Michel nono Do not modify a safe buffer in helpers
Signed-off-by: Michael Koziarski <michael@koziarski.com>
ed37964
Aaron Patterson tenderlove bumping to 3.0.8 b341e45
Aaron Patterson 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
Aaron Patterson tenderlove Merge pull request #1541 from arunagw/3-0-stable
Fixed for SafeBuffer
bdc80dd
Aaron Patterson tenderlove Merge pull request #1545 from sikachu/30testbuffer
Fix test on 3-0-stable regarding SafeBuffer
2111509
Jun 08, 2011
Arun Agrawal arunagw Fixed mailto for SafeBuffer#gsub cdf617e
Arun Agrawal arunagw Cache helper fixed for SafeBuffer 059692a
Prem Sichanugrist 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
Raimonds Simanovskis 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
Jon Leighton jonleighton Merge pull request #1554 from rsim/assert_queries_oracle_fix_for_3_0
Assert queries oracle fix for 3 0
eff72b2
Paul Gallagher 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
José Valim josevalim Merge pull request #1558 from tardate/3-0-stable
Fix for issue 1553 - escape_javascript to support SafeBuffer strings
910b34d
Prem Sichanugrist sikachu Update CHANGELOG to mention the new SafeBuffer change 4252a35
Aaron Patterson tenderlove Merge pull request #1565 from sikachu/3-0-stable-changelog
Update CHANGELOG to mention the new SafeBuffer change
02e65ef
Prem Sichanugrist sikachu Revert "Fixed mailto for SafeBuffer#gsub"
It was fixing it in a bad way by changing test.

This reverts commit cdf617e.
f57c707
Prem Sichanugrist sikachu Add proper fix to `mail_to` helper.
* Fix the problem on manipulating on the `ActiveSupport::SafeBuffer`
4b1309e
Aaron Patterson tenderlove Merge pull request #1568 from sikachu/3-0-stable-mailto
Add proper fix to mail_to helper
1ae9b29
Aaron Patterson tenderlove bumping to 3.0.9.rc1 0c1608c
Jun 09, 2011
Prem Sichanugrist sikachu Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…
…ument is already html_safe
3d82d81
Aaron Patterson tenderlove Merge pull request #1611 from sikachu/3-0-stable-javascript
Make sure `escape_javascript` return `SafeBuffer` if the incoming argumen
b6a2157
Jacob Tjoernholm chopmo Fix issue #1598 by adding a dependency to the RDoc gem. caa9779
Jacob Tjoernholm chopmo Fix issue #1598 by adding a dependency to the RDoc gem. b002181
Prem Sichanugrist sikachu Make sure `escape_javascript` return `SafeBuffer` if the incoming arg…
…ument is already html_safe
8fcdc15
Aaron Patterson tenderlove ensuring that json_escape returns html safe strings when passed an ht…
…ml safe string
88413ef
Aaron Patterson tenderlove ensuring that json_escape returns html safe strings when passed an ht…
…ml safe string
cce7085
Aaron Patterson tenderlove bumping to 3.0.9.rc2 0e1ecb2
Aaron Patterson tenderlove bumping to rc3 since syck is not playing nicely 66ec7e8
Jun 10, 2011
Andrew White pixeltrix Ensure number helpers can handle HTML safe strings - closes #1597. 9b80f8d
Prem Sichanugrist sikachu Update CHANGELOG to mention the json_escape change c4fbb21
Prem Sichanugrist sikachu Make sure that we don't perform in-place mutation on SafeBuffer string
This will make sure `render :inline` is working.

Closes #1633
104e200
Andrew White pixeltrix Ensure number helpers can handle HTML safe strings - closes #1597. 60d4dc1
Prem Sichanugrist sikachu Update CHANGELOG to mention the json_escape change 564a655
Prem Sichanugrist sikachu Make sure that we don't perform in-place mutation on SafeBuffer string
This will make sure `render :inline` is working.

Closes #1633
fb706c7
Aaron Patterson tenderlove Merge pull request #1639 from sikachu/3-0-stable-render-inline
Render inline fix for 3-0-stable
70b4ea9
Aaron Patterson tenderlove Merge pull request #1640 from sikachu/3-0-9-render-inline
Render inline fix for 3-0-9
f169dab
Santiago Pastorino and José Ignacio Costa Revert "Make sure that we don't perform in-place mutation on SafeBuff…
…er string"

This reverts commit 104e200.
0019379
Jun 12, 2011
Andrew White pixeltrix Define ActiveSupport#to_param as to_str - closes #1663 a64b5dd
Jon Leighton jonleighton Add support for using an ARCONFIG environment variable to specify the…
… location of the config.yml file for running the tests
968816a
Aaron Patterson tenderlove Merge branch '3-0-stable' into 3-0-9
* 3-0-stable:
  Add support for using an ARCONFIG environment variable to specify the location of the config.yml file for running the tests
  Define ActiveSupport#to_param as to_str - closes #1663
  Revert "Make sure that we don't perform in-place mutation on SafeBuffer string"
  Make sure that we don't perform in-place mutation on SafeBuffer string
  Update CHANGELOG to mention the json_escape change
  Ensure number helpers can handle HTML safe strings - closes #1597.
  ensuring that json_escape returns html safe strings when passed an html safe string
  Fix issue #1598 by adding a dependency to the RDoc gem.
  Make sure `escape_javascript` return `SafeBuffer` if the incoming argument is already html_safe

Conflicts:
	actionpack/CHANGELOG
d5e28c3
Aaron Patterson tenderlove bumping to rc4 f283194
Aaron Patterson tenderlove Merge branch '3-0-9' of github.com:rails/rails into 3-0-9
* '3-0-9' of github.com:rails/rails:
  Make sure that we don't perform in-place mutation on SafeBuffer string
  Update CHANGELOG to mention the json_escape change
  Ensure number helpers can handle HTML safe strings - closes #1597.
d958428
Aaron Patterson tenderlove Preparing for 3.0.9.rc5 release 6824c5d
Jun 16, 2011
Aaron Patterson tenderlove avoid false positives caused by release candidates fad08a6
Aaron Patterson tenderlove Preparing for 3.0.9 release 15e2b58