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
This comparison is big! We're only showing the most recent 250 commits
Commits on Mar 07, 2010
@tenderlove tenderlove converting inject to each and map
[#4119 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
5a806f6
Commits on Mar 09, 2010
@jeremy jeremy Disprefer JSONGem decoder since it only decodes JSON objects abb8fbd
Commits on Mar 11, 2010
@rubys rubys Add deprecation warning for overwrite_params and remove rdoc
[#4073 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
cbc0201
Commits on Mar 12, 2010
@jeremy jeremy OutputBuffer#to_yaml should return string yaml, not some custom class…
… dump
ec760a5
@jeremy jeremy Write strings to fragment cache, not outputbuffers eed8a88
@jeremy jeremy Be sure to pass through args to to_yaml 40c393c
Commits on Mar 14, 2010
@spastorino spastorino There's a Ruby issue with File.basename different versions returns di…
…fferent things, so we shouldn't test that

[#4174]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
056f957
Commits on Mar 15, 2010
@jeremy jeremy read_ and write_fragment cache preserve html safety yet cache strings…
… only
9b209e8
@basvk basvk Fixed a bug in JSON decoding with Yaml backend, where a combination o…
…f dates, escaped or unicode encoded data and arrays would make the parser fail with a ParseError exception.

[#2831]

Signed-off-by: Yehuda Katz <wycats@gmail.com>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
b99914c
@jeremy jeremy to_str works here b3d32a5
Commits on Mar 16, 2010
@spastorino spastorino object_and_class_ext_test warnings removed
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ebf300f
@spastorino spastorino Change array entries to safe doesn't worth then the array is joined a…
…s a string losing the safe property of his entries

Signed-off-by: José Valim <jose.valim@gmail.com>
374e49b
@Manfred Manfred Improve performance of Multibyte::Utils.
Replace explicit for-loops by faster enumeration methods.

[#3158]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2d3c580
@jamesgolick jamesgolick Improve performance of multibyte utils.
Switch from using String#match to using String#=~. There's no need to
generate a MatchData for each iteration since we're not using it.

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
27aa228
@spastorino spastorino translation method of TranslationHelper module returns always SafeBuf…
…fer [#4194 status:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2310aef
@spastorino spastorino scope_key_by_partial fix for Ruby 1.9 when there's virtual_path
[#4202 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
9cfa875
Commits on Mar 17, 2010
@jeremy jeremy Bundler returns a Pathname from #loaded_from; work around it f175d19
@jeremy jeremy Don't rely on Active Support being loaded here c0137f6
Commits on Mar 22, 2010
@nono nono button_to should generate an html_safe string
Signed-off-by: Michael Koziarski <michael@koziarski.com>
26f2cce
@spastorino spastorino ActionView::SafeBuffer should be there for backwards compatibility [#…
…4241 state:committed]

Signed-off-by: Michael Koziarski <michael@koziarski.com>
629afe9
Commits on Mar 25, 2010
@cwninja cwninja Fix incorrect relative paths being used when looking up templates.
The bug will manifest itself by failing to locate templates when running tests,
or when running as a daemon (from /).

It relates the the different behavior of ActionView::Template::Path#to_s and
ActionView::Template::Path#to_str when a RAILS_ROOT is defined. #to_s reports
a path relative to the root, and #to_str reports an absolute path.

Signed-off-by: José Valim <jose.valim@gmail.com>
97e07a8
@divoxx divoxx Set mailer template_root as absolute path [#2263 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
0022fa3
@miloops miloops Allow deprecation messages with or without a final period.
Signed-off-by: José Valim <jose.valim@gmail.com>
ac7b5a2
Commits on Mar 26, 2010
@josevalim josevalim Added compatibility to Ruby 1.9.2. 157c180
Commits on Mar 27, 2010
@jrafanie jrafanie Marshaling a time object added an instance variable to the object whi…
…ch affected the quoting of serialized attributes because the to_yaml of the original object did not match the to_yaml of the marshaled one. Also, Marshal.dump was modifying the source object which the client may not be aware of.

Signed-off-by: wycats <wycats@gmail.com>
c1b2200
Commits on Mar 28, 2010
@spastorino spastorino Time marshalling backported [#4286 state:committed]
Signed-off-by: wycats <wycats@gmail.com>
cf7ed7c
@spastorino spastorino flatten not needed here
Signed-off-by: wycats <wycats@gmail.com>
0f18904
@spastorino spastorino backport of inconsistency with cattr_reader and matter_reader with so…
…me tweaks

Signed-off-by: wycats <wycats@gmail.com>
bc2af91
Commits on Mar 29, 2010
@pixeltrix pixeltrix Add the ability to specify table_name_prefix on individual modules
[#4032 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
03d5d0b
@ernie ernie belongs_to associations now honor :primary_key option for joins
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
00b95eb
@joeyAghion joeyAghion use supplied primary key when eager-loading belongs_to associations r…
…ather than default primary key

[#765]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
715b34f
@dudleyf dudleyf Trivial doc update on nested attributes delete renaming
Signed-off-by: José Valim <jose.valim@gmail.com>
bf563bd
Commits on Mar 30, 2010
Joseph Wilk Fixed a bug where create_table could not be called without a block [#…
…2221 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
ea6ef76
@xuanxu xuanxu new assertion: assert_blank
Signed-off-by: Xavier Noria <fxn@hashref.com>
ccb1bee
@xuanxu xuanxu New assertion: assert_present
Signed-off-by: Xavier Noria <fxn@hashref.com>
4b08679
@spastorino spastorino Don't cache the utc_offset we are already caching the timezone [#4301]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e329eab
Commits on Mar 31, 2010
@fxn fxn avoid method redefined; discarding old empty? warning [Santiago Pasto…
…rino]
a0454dc
@lifo lifo Dont try to load the record from the db if preloading didn't find any…
…thing
0e57c70
@lifo lifo Dont use Rails 3 finder syntax in Rails 2.3.x test [#4303 state:resol…
…ved]
1f44fc9
Commits on Apr 01, 2010
@dhh dhh Added Object#presence that returns the object if it's #present? other…
…wise returns nil [DHH/Colin Kelley]
1668ad3
@jeremy jeremy HTML safety: give a deprecation warning if an array of option tags is…
… passed to select tag. Be sure to join the tag yourself and mark them .html_safe
aa48c79
Commits on Apr 02, 2010
@spastorino spastorino utc_offset is no longer required on TimeZone and if it's not supplied…
… we delegate to TZInfo
de7925d
@spastorino spastorino delegate unknown timezones to TZInfo 2c148cd
@jeremy jeremy CI: add tzinfo e2ec41a
@jeremy jeremy Adjust test in case tzinfo is not available 19161e0
@jeremy jeremy Check more carefully for vendored tzinfo a72bcdb
Commits on Apr 04, 2010
@pixeltrix pixeltrix Backport of lazy evaluation of has_many ..., :dependent => :___
[#2627 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e617af1
Kristopher Murata Parameterize should accept malformed utf8 characters [#4323 state:res…
…olved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
642d5d2
Commits on Apr 06, 2010
@Savar Savar remove_index now uses quote_table_name() [#4300 state:resolved]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
1d73682
Commits on Apr 07, 2010
@spastorino spastorino Generate routes for nested resources with nil object raise RoutingErr…
…or [#4262 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
cfb31ed
Commits on Apr 09, 2010
@dhh dhh Fixed that default locale templates should be used if the current loc…
…ale template is missing [DHH]
0653a6d
@rolfb rolfb Changed the way inflections for uncountables work for 'funky jeans'
Signed-off-by: José Valim <jose.valim@gmail.com>
fcec740
@josevalim josevalim Fix tests broken in 0653a6d f87a518
@spastorino spastorino fix stack trace lines on class_eval
Signed-off-by: José Valim <jose.valim@gmail.com>
958b0e9
@josevalim josevalim Fix a failure added on 958b0e9 4a02437
Commits on Apr 10, 2010
@jeremy jeremy CI: message for some outstanding failures 56c5290
@jeremy jeremy Refactor for readability efec9b2
@jeremy jeremy CI: show all headers for diagnosis d91d6fe
@jeremy jeremy Only set response etag if body is not blank 2cd29f4
@hypothetical hypothetical made error_message_on work by passing in the object name if there is …
…no object [#3246 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
dae2473
@yaroslav yaroslav Fix Array#to_xml to produce valid markup when working with namespaced…
… classes [#3624 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
a84e9b4
Commits on Apr 12, 2010
@anildigital anildigital Fix for plugin not getting installed on Windows environment [#4320 st…
…ate:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
c69dc1a
Commits on Apr 14, 2010
@lifo lifo Ensure not to load the entire association when bulk updating existing…
… records using nested attributes
5efb150
@fxn fxn fix dash -> edit in an example, and a few touches now that we are here b8b568e
Commits on Apr 15, 2010
@libc libc Implement find_in_batches without with_scope [#2227 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
18ba648
Commits on Apr 16, 2010
@mislav mislav ruby 1.8.7 compat: `starts/ends_with?` doesn't cast to string
`starts/ends_with?` methods shouldn't cast argument to string because
ruby 1.8.7 doesn't seem to do that. for example:

    "foobar".ends_with?(:bar)
    # => true in ActiveSupport implementation, false in ruby 1.8.7

[#3199 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c519215
@jeremy jeremy Distinguish test for 1.8.6 compat c55cdd8
Commits on Apr 17, 2010
@mislav mislav cleanup `update/reset_counters`; refactor tests ef0591e
@mislav mislav 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
@mislav mislav `String#starts/ends_with?` should return false for non-string argumen…
…t, not raise error

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
4b36daf
@jeremy jeremy Fix 1.9-specific syntax error in test 8b79c7c
@jeremy jeremy Upgrade bundled i18n from 1.3.3 to 1.3.7 fd5c6e2
Commits on Apr 19, 2010
@jeremy jeremy MemoryStore#read_multi(*keys) for dev-mode compatibility with memcach…
…e store
2401af4
Commits on Apr 21, 2010
@spastorino spastorino TimeZones lazy load
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
49943a7
@spastorino spastorino load tzinfo on initialize only
Signed-off-by: Xavier Noria <fxn@hashref.com>
d891754
Commits on Apr 22, 2010
Sam Elliott and Santiago Pastorino Is not nessesary to have @_rails_html_safe instance var when the stri…
…ng is unsafe, also it breaks to_yaml [#3535 state:committed]
c401102
Commits on Apr 24, 2010
@libc libc PostgreSQL adapter: escape_bytea, quote_string and unescape_bytea are…
…n't thread-safe in Ruby 1.8 [#3237 state:resolved]

Signed-off-by: wycats <wycats@gmail.com>
cec44f5
@jeremy jeremy PostgreSQL: use standard-conforming strings if possible c9e1570
@jeremy jeremy PostgreSQL: remove the unnecessary heuristic checking whether the val…
…ue is escaped
5c0ad82
@jeremy jeremy Remove quoted_string_prefix entirely since PostgreSQL was the only da…
…tabase adapter relying on it.
457a546
Commits on Apr 25, 2010
@jeremy jeremy Ruby 1.9: ERB template encoding using a magic comment at the top of t…
…he file
81e0607
@jeremy jeremy Ensure ERB source begins with the encoding comment 70034d8
@amatsuda amatsuda Fix pattern to match various magic comment formats 4082001
@jeremy jeremy Expect an incompatible encoding exception when a template doesn't hav…
…e a magic comment and its source encoding doesn't match the default external encoding
fb545f4
@jeremy jeremy Expect an incompatible encoding exception when a template with a magi…
…c comment renders a partial without one and its source encoding doesn't match the default external encoding
f6e71c6
@e2 e2 actionpack: added missing encoding comments [#4466 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ec7716a
@jeremy jeremy Fix unstated AS::Multibyte dependency 8716ee4
@jeremy jeremy Fix backport error: wrong exception name 9e262de
Commits on Apr 26, 2010
Joe Martinez Add ActiveResource::Base.include_root_in_json, like Active Record, to…
… serialize instances as hash of model name -> attributes hash rather than the bare attributes hash. [#2584 state:committed]

Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
aa401bd
Commits on Apr 28, 2010
@cghawthorne cghawthorne Destroy respects optimistic locking.
Now works with :dependent => :destroy and includes unit tests for that
case.  Also includes better error messages when updating/deleting stale
objects.

[#1966 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ce5af2f
Commits on Apr 29, 2010
@neerajdotname neerajdotname making rake:migrate VERSION=0 a noop called in succession. [#2137 sta…
…te:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
dcf0f97
Commits on May 01, 2010
@marius marius repair the activesupport message encryptor tests for me, do so in the…
… same way as jeremy did with message verifier

[#4517 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
0d767fd
Commits on May 04, 2010
@lifo lifo Use class_inheritable_accessor for connection_handler 04fa5af
@brianmario brianmario Allow pre-casted values (other than nil) to pass through from calcula…
…tions un-touched

[#4514 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
6dbc75f
@rubymerchant rubymerchant AR JSON Serializer now supports custom root option.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
aeff171
@lifo lifo Use primary key in conditions, not 'id' [#4395 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>

Conflicts:

	activerecord/test/cases/nested_attributes_test.rb
f194d65
@brianmario brianmario add support for mysql2 adapter to dbconsole
[#4532 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
6d1344d
Commits on May 07, 2010
@spastorino spastorino simple_format should return html_safe but not escape text, that's for…
… rails_xss plugin [#3767 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
adcfb4e
@spastorino spastorino Make find_or_create and find_or_initialize work mixing explicit param…
…eters and a hash. ht: Marc-André Lafortune

[#4457 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
f967b35
Commits on May 08, 2010
@eparreno eparreno Add index length support for MySQL [#1852 state:resolved]
Example:

  add_index(:accounts, :name, :name => 'by_name', :length => 10)
  => CREATE INDEX by_name ON accounts(name(10))

  add_index(:accounts, [:name, :surname], :name => 'by_name_surname', :length => {:name => 10, :surname => 15})
  => CREATE INDEX by_name_surname ON accounts(name(10), surname(15))

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
3616141
@spastorino spastorino The intention here was to assign to different objects ht: Radar 555801c
Carl Lerche Revert "Add index length support for MySQL [#1852 state:resolved]" (b…
…reaks the build)

This reverts commit 3616141.
eababa3
Commits on May 09, 2010
@lifo lifo Revert "Revert "Add index length support for MySQL [#1852 state:resol…
…ved]" (breaks the build)"

This reverts commit eababa3.
77adb4b
@lifo lifo Make sure schema dumper doesnt throw up when there are no index lengths 3c1bb40
Commits on May 11, 2010
@josevalim josevalim Remove i18n interpolation deprecation. It has been around since 2.2. 8e679f1
Commits on May 12, 2010
@spastorino spastorino type_cast_calculated_value refactor: value is never a Fixnum here. Fi…
…x test since SQLite returns Float.

[#4514 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ad73a3a
@jeremy jeremy Drop require removed by 8e679f1 9ab1154
@lifo lifo Use superclass_delegating_accessor for connection handlers 7cbc546
@spastorino spastorino to_json and to_xml tests added to ActiveResource
[#4529 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c4ef7bb
Commits on May 14, 2010
@josevalim josevalim Remove deprecated tests according to 8e679f1 6949d6f
Commits on May 15, 2010
@joshk joshk backported AR correction to find_each and find_in_batches to raise wh…
…en the user uses select but does not specify the primary key

Signed-off-by: José Valim <jose.valim@gmail.com>
8e7a64d
@jeffkreeftmeijer jeffkreeftmeijer partial counters with :as [#2804 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2de3646
@neerajdotname neerajdotname db:drop:all throws error when database does not exist [#2997 state:re…
…solved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
22b020d
@jeffkreeftmeijer jeffkreeftmeijer make sure `as` is set before trying to build an #{as}_counter. [#2804
…state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
5d7ad7b
@lawrencepit lawrencepit docs + test for each_error
[#3185 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
0706bdc
Commits on May 16, 2010
Elomar França Don't carry default value when changing column for a binary type on M…
…ySQL [#3234 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
ddadcc7
@jeffkreeftmeijer jeffkreeftmeijer using :time_select when the attribute type is :time in the scaffold g…
…enerator. [#2377 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
3568c5c
@neerajdotname neerajdotname Fix broken integration test in 2.x [#4565 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
3570f3e
@no6v no6v make fixture accessors private
prevent to be run fixture accessor (e.g. test_foos for TestFoo model) as a test case

Signed-off-by: José Valim <jose.valim@gmail.com>
e535b45
@matthewrudy matthewrudy when we run rake rails:freeze:edge update the value of the "REVISION"…
… file rather than creating a new file "REVISION_ce706..." each time [#1694 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
5d979de
@jeffkreeftmeijer jeffkreeftmeijer Added assert_attribute_type to clean up GeneratedAttributeTest [#2377
…state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
ec017e1
@Wijnand Wijnand Postgresql doesn't allow to change a string type column to a binary t…
…ype. Skip this test for postgresql for now.

Signed-off-by: José Valim <jose.valim@gmail.com>
5b1f4c5
@rizwanreza rizwanreza Rack dependency bumped to 1.1.0, tests passing. [#3558 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
74206ae
@jeremy jeremy CI: bump rack to 1.1 cd3d30d
Commits on May 17, 2010
@josevalim josevalim superclass_delegating_accessor does not accept options. 76608b1
@rizwanreza rizwanreza Deprecate Array#rand in favor of Array#random_element [#4555 stated:c…
…ommitted]

Signed-off-by: Xavier Noria <fxn@hashref.com>
32b0b5f
@fxn fxn method rename to fix a broken test bb2327d
Commits on May 18, 2010
@josevalim josevalim Deprecate legacy CGI options in SessionStores. 94878c6
@ianwhite ianwhite Nested records (re: autosave) are now updated even when the intermedi…
…ate parent record is unchanged [#4242]

Signed-off-by: José Valim <jose.valim@gmail.com>
a5696e3
@etiennebarrie etiennebarrie make add_index and remove_index more resilient; new rename_index meth…
…od; track database limits

[#3452 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
99bcce7
@jeremy jeremy Revert "Don't carry default value when changing column for a binary t…
…ype on MySQL"

Broke mysql tests.

This reverts commit ddadcc7.

Conflicts:

	activerecord/test/cases/migration_test.rb

[#3234 state:open]
9d99e61
@fxn fxn 1.9 compat: deprecated last_(month|year) in favor of prev_(month|year) 25ec613
Commits on May 22, 2010
@tenderlove tenderlove backporting beda2d4 for newer sqlite-ruby bindings
Signed-off-by: Xavier Noria <fxn@hashref.com>
a637b5f
Commits on May 23, 2010
@jeremy jeremy Remove miscommit from 57337cd d8f0a58
@jeremy jeremy 2.3.6 release 56bb550
@jeremy jeremy Bump 2-3-stable to 2.3.7 55e88ee
@nex3 nex3 Mark all raw HTML being concatted as HTML-safe.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
48fbe7b
@nex3 nex3 Don't always mark the argument to #concat as HTML-safe.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e53791f
@nex3 nex3 Don't incompatibly monkeypatch ERB.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e3f14d1
@jeremy jeremy Fix test rendering unmarked but safe HTML ca5f5d9
@jeremy jeremy Use a non-XSS-protected output buffer for view tests ab2d7c8
@jeremy jeremy Revert "Don't always mark the argument to #concat as HTML-safe."
This reverts commit e53791f.
86f0287
@spastorino spastorino Make use of safe_concat on TextHelper concat
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
b10bf83
Commits on May 24, 2010
@jeremy jeremy rails_xss handles deprecated String html safety, when installed 3ff921a
@jeremy jeremy Move tests for deprecated String#html_safe! to plugin 60e82a3
@jeremy jeremy 2.3.7 release: fix rails_xss compatibility 326188c
@jeremy jeremy Bump 2-3-stable to 2.3.8 f97da34
@mislav mislav 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 mislav 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
@cainlevy cainlevy Ensure auto_link does not ignore multiple trailing punctuations
[#2504 state:resolved]
9e08e19
@jeremy jeremy 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
@wycats wycats Give the ERB String the encoding of the original template 50b7c0c
@wycats wycats Needs to work on 1.8 too 8e6a044
@spastorino spastorino 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
@spastorino spastorino 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 jeremy Work around strange Ruby 1.9 autoload issue by using absolute load pa…
…ths for tests
9d3bd87
@jeremy jeremy Add global gem task e5af56a
@jeremy jeremy 2.3.7.pre1: fixes HTML escaping when *not* using rails_xss 4fef5af
@spastorino spastorino translate helper method using an array is deprecated
Signed-off-by: José Valim <jose.valim@gmail.com>
4986d5e
@josevalim josevalim Ensure translations work with symbols. 50f3754
@jeremy jeremy Work around strange Ruby 1.9 autoload issue by using absolute load pa…
…ths for tests (ditto for other components' tests)
e8ba526
@spastorino spastorino Error messages for asserts
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
a9032c8
@jeremy jeremy Work around strange Ruby 1.9 autoload issue by using absolute load pa…
…ths for tests (for Active Model too)
aa44914
Commits on May 25, 2010
@jeremy jeremy HTML safety: fix textarea with nil content 6a9e188
@jeremy jeremy i18n: t() handles single keys returning an Array, also f7e27bd
@spastorino spastorino SQLite: forward compatibility with future driver releases
[#4633]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
240f4e9
@fxn fxn get railties/README back to the home page of the API 2ed893b
@jeremy jeremy Bump 2-3-stable to 2.3.9 9da7ff8
@jeremy jeremy Shift SafeBuffer#concat responsibility over to rails_xss a815f0c
Commits on May 26, 2010
@spastorino spastorino removes an unneeded alias
Signed-off-by: José Valim <jose.valim@gmail.com>
b1a97a4
Commits on May 29, 2010
@NZKoz NZKoz Merge commit 'mislav/auto_link_2-3-stable' into 2-3-stable 5796a92
@NZKoz NZKoz Merge commit 'mislav/counter_cache_2-3-stable' into 2-3-stable b760d69
Andrew Don't rewrap system level exceptions with StatementInvalid
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#896 state:committed]
3d6ed50
Commits on Jun 05, 2010
@fxn fxn deprecates Array#random_element in favor of Array#sample, backported …
…from Ruby 1.9, thanks to Marc-Andre Lafortune
ed8cabc
Commits on Jun 08, 2010
@sikachu sikachu 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
Commits on Jun 09, 2010
@chewi chewi 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
@lifo lifo Fix AR perf script e4accde
Commits on Jun 18, 2010
@MasterLambaster MasterLambaster 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
Commits on Jun 19, 2010
Maxime RETY Fix Yajl backend discovery in ActiveSupport::JSON
[#4897]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c7e875a
@chewi chewi 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
Commits on Jun 20, 2010
@sikachu sikachu 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
@sikachu sikachu 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
Commits on Jun 22, 2010
@jstorimer jstorimer CookieStore should preserve the Set-Cookie header Array [#4743 state:…
…resolved]

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

Signed-off-by: Michael Koziarski <michael@koziarski.com>
da93d69
@NZKoz NZKoz 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
@NZKoz NZKoz 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
Paweł Kondzior STI should identify itself inside named_scope
[#1570 state:resovled]

Signed-off-by: José Valim <jose.valim@gmail.com>
687d7f5
@neerajdotname neerajdotname test for #1570
Signed-off-by: José Valim <jose.valim@gmail.com>
a9c69f3
@maxim maxim 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
@neerajdotname neerajdotname Fragment cache not generating the proper cache key in log
[#4827 state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
cc53229
@harking harking 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
kane quote scoped columns in validates_uniqueness_of [#4909 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
09a23d2
@neerajdotname neerajdotname fixes to the tests for patch #4909
Signed-off-by: José Valim <jose.valim@gmail.com>
549b2ad
@josevalim josevalim Use size for Ruby 1.8.6 compatibility. 68bfd8a
@fxn fxn deprecates load_(once_)paths in dependencies and app config in favor …
…of autolaod_(once_)paths
4a745ca
Commits on Jun 25, 2010
@sikachu sikachu 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
@mudge mudge 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
Commits on Jun 26, 2010
@chaitanyav chaitanyav Add OrderedHash#invert to preserve order in ruby 1.8
Signed-off-by: José Valim <jose.valim@gmail.com>
449cf50
@josevalim josevalim 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
Commits on Jun 27, 2010
@dolzenko dolzenko Add module_eval missing file_name and line_number args
[#4712 state:resolved]

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

Signed-off-by: José Valim <jose.valim@gmail.com>
70af7ef
@texel texel 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
Commits on Jun 29, 2010
@sikachu sikachu 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
@dtrasbo dtrasbo 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
@dtrasbo dtrasbo Deprecate ActiveRecord::Base#class_name [#379 state:committed]
Signed-off-by: José Valim <jose.valim@gmail.com>
ac42e69
@texel texel 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
@tenderlove tenderlove AssociationCollection#create_by_*, find_or_create_by_* work properly …
…now. [#1108 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
fad166c
Commits on Jun 30, 2010
@jberkel jberkel 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
@chewi chewi Don't remove scheduled destroys when loading an association.
Signed-off-by: José Valim <jose.valim@gmail.com>
526f1e5
Commits on Jul 01, 2010
@tenderlove tenderlove fisting Session::AbstractStore#clear to actually clear the session. [#…
…5030 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
67e18c5
Commits on Jul 04, 2010
@josevalim josevalim 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
Commits on Jul 08, 2010
@mislav mislav add missing require to ActiveRecord "base_test.rb"
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ba9c469
@mislav mislav test that ActiveRecord `destroy` and `destroy_all` return destroyed r…
…ecords

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2d3bc99
@gammons gammons 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
@metaskills metaskills 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
@hardbap hardbap A generated plugin's test are not run by 'rake test'
Signed-off-by: José Valim <jose.valim@gmail.com>
046c900
Commits on Jul 14, 2010
@jlewallen jlewallen Set destroyed=true in opt locking's destroy [#5058 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
8298bef
@lovitt 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
Commits on Jul 15, 2010
@tenderlove tenderlove fixing performance regression from 2.3.5 -> 2.3.8 7b6383f
Commits on Jul 16, 2010
@NZKoz NZKoz 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
@tenderlove tenderlove backporting a couple missing files. sorry folks! 4ae4828
Commits on Jul 17, 2010
@jyurek jyurek Fix for integration tests not serializing arrays in multipart forms c…
…orrectly.

Signed-off-by: wycats <wycats@gmail.com>
fb615cd
Commits on Jul 18, 2010
@tenderlove tenderlove changing fixtures back to superclass_delegating_accessor until we can…
… convert them to class_attributes
c2d13a9
@neerajdotname neerajdotname 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
@subbarao subbarao renaming test name to fix accidently override [#5076 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
dec2c4f
Commits on Jul 25, 2010
@spastorino spastorino Changes the usage of Object#returning with Object#tap
Signed-off-by: José Valim <jose.valim@gmail.com>
a5d8c95
@spastorino spastorino Deprecates Object#returning in favor of Object#tap
Signed-off-by: José Valim <jose.valim@gmail.com>
5b0f839
@spastorino spastorino Changelog update for Object#responding deprecation
Signed-off-by: José Valim <jose.valim@gmail.com>
6f38967
Commits on Jul 26, 2010
@spastorino spastorino Changes Object#returning with Object#tap on guides ae63d5c
@texel texel Override new on proxy objects so that they never wrap nil or false. a9ef2fd
@texel texel Test to ensure that falsy objects aren't wrapped by deprecation proxies 27651c1
Commits on Aug 01, 2010
@spastorino spastorino Makes form_helper use overriden model accessors backport 8141f08
Commits on Aug 03, 2010
@subbarao subbarao 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
Commits on Aug 04, 2010
@fxn fxn it is no longer true that load_paths are going to be removed in final 15cafbe
Commits on Aug 10, 2010
@NZKoz NZKoz 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
Commits on Aug 15, 2010
@spastorino spastorino Making time_zone_options_for_select return a html_safe string master …
…backport
43e2bbe
Commits on Aug 18, 2010
@Jeff-Lawson Jeff-Lawson Bug Fix -- clean up connection after stored procedure [#3151 state:re…
…solved] for 2-3-stable
7e79889
@Jeff-Lawson Jeff-Lawson Bug Fix -- clean up connection after stored procedure [#3151 state:re…
…solved] for 2-3-stable
d35a67b
Commits on Aug 20, 2010
@fxn fxn revises guides generation add3ccb
@fxn fxn restores railties/README as home page of the API 11361a9
Commits on Aug 25, 2010
@mikel mikel Make ActiveResource::InvalidRequestError more user friendly
Signed-off-by: Xavier Noria <fxn@hashref.com>
0fcb430
Commits on Aug 30, 2010
@jeremy jeremy Exclude guides from gem to keep file size small bdace5d
@jeremy jeremy Prepare for Rails 2.3.9. Release 2.3.9.pre gems. b2c9198
@mikel mikel Updating documentation on ActiveResource HTTP Mock and also adding te…
…st coverage
881712c
@mikel mikel Back porting HttpMock test from Rails 3 master 56fdfeb
@mikel mikel Adding option to ActiveResource to allow you to not reset the previou…
…sly stored requests and responses by passing false to respond_to

Backport of commit 2a1b23f851ea3d4634fc68b74fe6b1afed23d3ef on rails/master
bac12fa
Commits on Aug 31, 2010
@jeremy jeremy require 'thread' for Mutex dependency 6f17422
Commits on Sep 03, 2010
@metaskills metaskills Conversion of a two dimensional array that is ruby 1.8.6 safe. Fix pa…
…ren warnings too.

Signed-off-by: Michael Koziarski <michael@koziarski.com>
b64d1fe
Commits on Sep 04, 2010
@jeremy jeremy Rails 2.3.9 a61a39e