Skip to content
This repository
  • 111 commits
  • 219 files changed
  • 43 comments
  • 38 contributors
Apr 17, 2010
Mislav Marohnić cleanup `update/reset_counters`; refactor tests ef0591e
Mislav Marohnić fix `reset_counters` to work even with complex class names
e.g. it guesses that a belongs_to association to Namespace::MyModel is
named "my_model", unlike before where it would look up an association
named "namespace::mymodel" and fail.
8be3e09
May 23, 2010
Jeremy Kemper Bump 2-3-stable to 2.3.7 55e88ee
Nathan Weizenbaum Mark all raw HTML being concatted as HTML-safe.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
48fbe7b
Nathan Weizenbaum Don't always mark the argument to #concat as HTML-safe.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e53791f
Nathan Weizenbaum Don't incompatibly monkeypatch ERB.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e3f14d1
Jeremy Kemper Fix test rendering unmarked but safe HTML ca5f5d9
Jeremy Kemper Use a non-XSS-protected output buffer for view tests ab2d7c8
Jeremy Kemper Revert "Don't always mark the argument to #concat as HTML-safe."
This reverts commit e53791f.
86f0287
Santiago Pastorino Make use of safe_concat on TextHelper concat
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
b10bf83
Jeremy Kemper rails_xss handles deprecated String html safety, when installed 3ff921a
Jeremy Kemper Move tests for deprecated String#html_safe! to plugin 60e82a3
May 24, 2010
Jeremy Kemper 2.3.7 release: fix rails_xss compatibility 326188c
Jeremy Kemper Bump 2-3-stable to 2.3.8 f97da34
Mislav Marohnić auto_link: support arbitrary URI schemes like "ftp:" and "file:"
recognizes all URI scheme allowed characters, such as colon and period.

[#3494 state:resolved]
bd9ca9a
Mislav Marohnić avoid auto_linking already linked emails; more robust detection of li…
…nked URLs

References #1523  [#1862 state:resolved]  [#3591 state:resolved]

Add test that shows how link text can contain HTML if needed:
the trick is using block form in combination with `raw`.
Let link text be automatically HTML-escaped

[#2017 state:resolved]
17b4fd2
Lance Ivy Ensure auto_link does not ignore multiple trailing punctuations
[#2504 state:resolved]
9e08e19
Jeremy Kemper Fix that captured content (e.g. with form_for or div_for) would be HT…
…ML-escaped even without the rails_xss plugin installed. Rails 2.3.7, we barely knew ya...
c66013e
Yehuda Katz Give the ERB String the encoding of the original template 50b7c0c
Yehuda Katz Needs to work on 1.8 too 8e6a044
Santiago Pastorino Revert "translation method of TranslationHelper module returns always…
… SafeBuffer [#4194 status:resolved]"

This reverts commit 2310aef.

Signed-off-by: José Valim <jose.valim@gmail.com>
d3da1a2
Santiago Pastorino translation method of TranslationHelper module returns a SafeBuffer A…
…rray backport

[#4675 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
6b0616d
Jeremy Kemper Work around strange Ruby 1.9 autoload issue by using absolute load pa…
…ths for tests
9d3bd87
Jeremy Kemper Add global gem task e5af56a
Jeremy Kemper 2.3.7.pre1: fixes HTML escaping when *not* using rails_xss 4fef5af
Santiago Pastorino translate helper method using an array is deprecated
Signed-off-by: José Valim <jose.valim@gmail.com>
4986d5e
José Valim Ensure translations work with symbols. 50f3754
Jeremy Kemper Work around strange Ruby 1.9 autoload issue by using absolute load pa…
…ths for tests (ditto for other components' tests)
e8ba526
Santiago Pastorino Error messages for asserts
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a9032c8
Jeremy Kemper Work around strange Ruby 1.9 autoload issue by using absolute load pa…
…ths for tests (for Active Model too)
aa44914
Jeremy Kemper HTML safety: fix textarea with nil content 6a9e188
Jeremy Kemper i18n: t() handles single keys returning an Array, also f7e27bd
Santiago Pastorino SQLite: forward compatibility with future driver releases
[#4633]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
240f4e9
May 25, 2010
Xavier Noria get railties/README back to the home page of the API 2ed893b
Jeremy Kemper Bump 2-3-stable to 2.3.9 9da7ff8
Jeremy Kemper Shift SafeBuffer#concat responsibility over to rails_xss a815f0c
May 26, 2010
Santiago Pastorino removes an unneeded alias
Signed-off-by: José Valim <jose.valim@gmail.com>
b1a97a4
May 29, 2010
Michael Koziarski Merge commit 'mislav/auto_link_2-3-stable' into 2-3-stable 5796a92
Michael Koziarski Merge commit 'mislav/counter_cache_2-3-stable' into 2-3-stable b760d69
Don't rewrap system level exceptions with StatementInvalid
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#896 state:committed]
3d6ed50
Jun 05, 2010
Xavier Noria deprecates Array#random_element in favor of Array#sample, backported …
…from Ruby 1.9, thanks to Marc-Andre Lafortune
ed8cabc
Jun 08, 2010
Prem Sichanugrist Make sure that rails recognized the full notation of IPv6 loopback ad…
…dress, and recognize 127.0.0.0/8 in IPv4

[#3257 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
0f44d37
Jun 09, 2010
James Le Cuirot Don't overwrite unsaved updates when loading an association but prese…
…rve the order of the loaded records. [#4642 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
b41c3ba
Jun 10, 2010
Pratik Fix AR perf script e4accde
Jun 18, 2010
Alex Fix test which prevents connection reset on failing and remove hardco…
…ded connection

[#4689 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
1ac00a6
Fix Yajl backend discovery in ActiveSupport::JSON
[#4897]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c7e875a
Jun 20, 2010
James Le Cuirot When not overwriting unsaved updates in nested attributes, allow alre…
…ady-saved records to be refreshed.

Signed-off-by: José Valim <jose.valim@gmail.com>
08302d2
Jun 21, 2010
Prem Sichanugrist Update bundled i18n gem to 0.4.1 to make sure every project will be w…
…arn about using deprecated %{..} interpolation.

This will also make sure that by changing {{..}} into %{..} won't break any Rails 2.3.x application, since it would load the vendored version if it's not satisfy the version requirement.

Signed-off-by: José Valim <jose.valim@gmail.com>
54a5088
Prem Sichanugrist Change all i18n interpolations from {{...}} to %{...}
This will silent all warning if there's a i18n version 0.4.x gem install on user's machine.

[#4913 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
5ed6a84
Jun 22, 2010
Jesse Storimer CookieStore should preserve the Set-Cookie header Array [#4743 state:…
…resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
85b6d79
Jeremy Kemper CI: add i18n gem e703fc1
Jun 23, 2010
Jeff Dean remove_column should raise an ArgumentError when no columns are passed [
#4803 state:resolved]

Signed-off-by: Michael Koziarski <michael@koziarski.com>
da93d69
Michael Koziarski make text_field and hidden_field omit the value attribute if the deve…
…loper explicitly passes in :value => nil [#4839 state:resolved]

Signed-off-by: Michael Koziarski <michael@koziarski.com>

Conflicts:

	actionpack/lib/action_view/helpers/form_helper.rb
52c922f
Michael Koziarski Revert "make text_field and hidden_field omit the value attribute if …
…the developer explicitly passes in :value => nil [#4839 state:reopened]"

This reverts commit 52c922f
cbf36cf
STI should identify itself inside named_scope
[#1570 state:resovled]

Signed-off-by: José Valim <jose.valim@gmail.com>
687d7f5
Neeraj Singh test for #1570
Signed-off-by: José Valim <jose.valim@gmail.com>
a9c69f3
Maxim Chernyak aka hakunin Fix eager loading of polymorphic has_one associations nested-included…
… under polymorphic belongs_to associations. [#3233 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
844da12
Neeraj Singh Fragment cache not generating the proper cache key in log
[#4827 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
cc53229
George Montana Harkin Fixes #2415 by creating a new instance of the Model when saving attri…
…butes to that model and the associated attributes already exist. Tests included. [#2415 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
7d2173e
quote scoped columns in validates_uniqueness_of [#4909 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
09a23d2
Neeraj Singh fixes to the tests for patch #4909
Signed-off-by: José Valim <jose.valim@gmail.com>
549b2ad
José Valim Use size for Ruby 1.8.6 compatibility. 68bfd8a
Jun 24, 2010
Xavier Noria deprecates load_(once_)paths in dependencies and app config in favor …
…of autolaod_(once_)paths
4a745ca
Jun 25, 2010
Prem Sichanugrist Make sure that Rails doesn't resent session_id cookie over and over a…
…gain if it's already there [#2485 state:resolved]

This apply to only Active Record store and Memcached store, as they both store only the session_id, which will be unchanged, in the cookie.

Signed-off-by: José Valim <jose.valim@gmail.com>
f8f3653
Paul Mucur Alias ActiveSupport::OrderedHash#update to ActiveSupport::OrderedHash…
….merge!

This ensures that an OrderedHash's keys are set up appropriately when using update.

[#4973 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
05defcd
Jun 26, 2010
NagaChaitanya Vellanki Add OrderedHash#invert to preserve order in ruby 1.8
Signed-off-by: José Valim <jose.valim@gmail.com>
449cf50
José Valim Tidy up tests in previous commit since they did not assure an Ordered…
…Hash is returned (the test would pass for an array and would pass by chance for hashes).

[#4875 state:resolved]
0e9190c
Jun 27, 2010
Evgeniy Dolzhenko Add module_eval missing file_name and line_number args
[#4712 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
56b35af
Jun 28, 2010
Santiago Pastorino Don't store incorrect values in zones_map backport
[#4942 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
70af7ef
Leigh Caplan test that unknown zones don't store mapping keys
[#4942]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Signed-off-by: José Valim <jose.valim@gmail.com>
80473e0
Jun 29, 2010
Prem Sichanugrist Fix [54a5088] where the i18n gem was wrongly updated to 0.4.1.
I've tested and confirm that `2-3-stable` will use the vendored `i18n` gem if there's no `i18n` gem with version >= 0.4.1 installed

Signed-off-by: José Valim <jose.valim@gmail.com>
69c4e4c
David Trasbo Only tell users that the Rails gem is missing if it's actually the ca…
…se [#2901 state:committed]

Signed-off-by: José Valim <jose.valim@gmail.com>
d0d10f5
David Trasbo Deprecate ActiveRecord::Base#class_name [#379 state:committed]
Signed-off-by: José Valim <jose.valim@gmail.com>
ac42e69
Leigh Caplan Rewrite the clause to pluck the existing value from zones_map before …
…performing a lookup. [#4942 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
78e4d88
Aaron Patterson AssociationCollection#create_by_*, find_or_create_by_* work properly …
…now. [#1108 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
fad166c
Jun 30, 2010
Jan Berkel Backported patch from [#4762]
URL fragments should not have safe characters escaped. Ref: Appendix A,
  http://tools.ietf.org/rfc/rfc3986.txt

Signed-off-by: José Valim <jose.valim@gmail.com>
f8f4872
Jul 01, 2010
James Le Cuirot Don't remove scheduled destroys when loading an association.
Signed-off-by: José Valim <jose.valim@gmail.com>
526f1e5
Aaron Patterson fisting Session::AbstractStore#clear to actually clear the session. [#…
…5030 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
67e18c5
Jul 04, 2010
José Valim Use bind instead of instance_exec cause it may be causing memory leak…
…s. Also, provide a simpler and sane implementation for scoped. [#5044 state:resolved]
bfbdeea
Jul 08, 2010
Mislav Marohnić add missing require to ActiveRecord "base_test.rb"
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ba9c469
Mislav Marohnić test that ActiveRecord `destroy` and `destroy_all` return destroyed r…
…ecords

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2d3bc99
Grant Ammons fixes #2362, eager loading :through associations will join the :sourc…
…e model if there are :conditions

Signed-off-by: José Valim <jose.valim@gmail.com>
0963774
Ken Collins Fix the #using_limitable_reflections? helper to work correctly by not…
… examining the length of an array which contains false/true, hence always passing.

Signed-off-by: José Valim <jose.valim@gmail.com>
504f7cf
Mike Breen A generated plugin's test are not run by 'rake test'
Signed-off-by: José Valim <jose.valim@gmail.com>
046c900
Jul 14, 2010
Jacob Lewallen Set destroyed=true in opt locking's destroy [#5058 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
8298bef
Michael Lovitt Sessions should not be created until written to and session data shou…
…ld be destroyed on reset. [#4938 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
257a29d
Jul 15, 2010
Aaron Patterson fixing performance regression from 2.3.5 -> 2.3.8 7b6383f
Jul 16, 2010
Michael Koziarski Only skip eager loading the code if dependency_loading is still enabled.
Otherwise rake tasks which depend on environment will get errors about missing constants.
f57ca87
Aaron Patterson backporting a couple missing files. sorry folks! 4ae4828
Jul 17, 2010
Jon Yurek Fix for integration tests not serializing arrays in multipart forms c…
…orrectly.

Signed-off-by: wycats <wycats@gmail.com>
fb615cd
Aaron Patterson changing fixtures back to superclass_delegating_accessor until we can…
… convert them to class_attributes
c2d13a9
Jul 18, 2010
Neeraj Singh update_attribute and updated_attributes! are now wrapped in a transac…
…tion

[#922 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
99cdea7
Subba Rao Pasupuleti renaming test name to fix accidently override [#5076 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
dec2c4f
Jul 25, 2010
Santiago Pastorino Changes the usage of Object#returning with Object#tap
Signed-off-by: José Valim <jose.valim@gmail.com>
a5d8c95
Santiago Pastorino Deprecates Object#returning in favor of Object#tap
Signed-off-by: José Valim <jose.valim@gmail.com>
5b0f839
Santiago Pastorino Changelog update for Object#responding deprecation
Signed-off-by: José Valim <jose.valim@gmail.com>
6f38967
Santiago Pastorino Changes Object#returning with Object#tap on guides ae63d5c
Jul 26, 2010
Leigh Caplan Override new on proxy objects so that they never wrap nil or false. a9ef2fd
Leigh Caplan Test to ensure that falsy objects aren't wrapped by deprecation proxies 27651c1
Aug 01, 2010
Santiago Pastorino Makes form_helper use overriden model accessors backport 8141f08
Aug 03, 2010
Subba Rao Pasupuleti In nested_attributes when association is not loaded and association r…
…ecord is saved then in memory record attributes should be saved

[#5053 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
12bbc34
Aug 05, 2010
Xavier Noria it is no longer true that load_paths are going to be removed in final 15cafbe
Aug 11, 2010
Michael Koziarski Revert "Ruby 1.9.2: explicitly raise NoMethodError for attempts at ex…
…plicit coercion"

This reverts commit 64082b3.

This change broke compatibility with 1.8.6 and was only needed for older 1.9.2 versions

Conflicts:

	activerecord/lib/active_record/attribute_methods.rb
b154b97
Aug 15, 2010
Santiago Pastorino Making time_zone_options_for_select return a html_safe string master …
…backport
43e2bbe
Aug 18, 2010
Jeff-Lawson Bug Fix -- clean up connection after stored procedure [#3151 state:re…
…solved] for 2-3-stable
7e79889
Jeff-Lawson Bug Fix -- clean up connection after stored procedure [#3151 state:re…
…solved] for 2-3-stable
d35a67b
Aug 20, 2010
Xavier Noria revises guides generation add3ccb
Xavier Noria restores railties/README as home page of the API 11361a9
Aug 25, 2010
Mikel Lindsaar Make ActiveResource::InvalidRequestError more user friendly
Signed-off-by: Xavier Noria <fxn@hashref.com>
0fcb430
Aug 29, 2010
Jeremy Kemper Exclude guides from gem to keep file size small bdace5d
Jeremy Kemper Prepare for Rails 2.3.9. Release 2.3.9.pre gems. b2c9198