Skip to content
This repository

This is in regards to the config.load_paths depreciation message #6

Closed
wants to merge 780 commits into from

94 participants

Michael Christenson II Michaël Witrant Jesse Storimer Mike Boone José Valim Andrew White Joshua Peek Santiago Pastorino Tom Stuart Ralph von der Heyden Étienne Barrié Sebastian Friedrich Michael Koziarski Sharad Jain Kevin Menard Samer Buna Aaron Patterson Johannes Huning Sam Ruby Eric Hartmann Derek Perez Leigh Caplan Carlos Antonio da Silva John F. Douthat and others
Michael Christenson II

In Rails 2.3.9 I thought the wording was more vague than it should be. Previous message:

config.load_paths is deprecated and removed in Rails 3, please use autoload_paths instead

New message:

config.load_paths is deprecated and removed in Rails 3, please use config.autoload_paths instead

This request is to pull it in to 2.3.9 future updates; not master. I went ahead and updated the message for "config.load_paths=", "config.load_paths_once", and "config.load_paths_once=" as well.

jeremy and others added some commits
Jeremy Kemper jeremy Disprefer JSONGem decoder since it only decodes JSON objects abb8fbd
Sam Ruby rubys Add deprecation warning for overwrite_params and remove rdoc
[#4073 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
cbc0201
Jeremy Kemper jeremy OutputBuffer#to_yaml should return string yaml, not some custom class…
… dump
ec760a5
Jeremy Kemper jeremy Write strings to fragment cache, not outputbuffers eed8a88
Jeremy Kemper jeremy Be sure to pass through args to to_yaml 40c393c
Santiago Pastorino 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
Jeremy Kemper 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 Kemper jeremy to_str works here b3d32a5
Santiago Pastorino spastorino object_and_class_ext_test warnings removed
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ebf300f
Santiago Pastorino 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 Stienstra Manfred Improve performance of Multibyte::Utils.
Replace explicit for-loops by faster enumeration methods.

[#3158]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2d3c580
James Golick 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
Santiago Pastorino spastorino translation method of TranslationHelper module returns always SafeBuf…
…fer [#4194 status:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2310aef
Santiago Pastorino 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
Jeremy Kemper jeremy Bundler returns a Pathname from #loaded_from; work around it f175d19
Jeremy Kemper jeremy Don't rely on Active Support being loaded here c0137f6
Bruno Michel nono button_to should generate an html_safe string
Signed-off-by: Michael Koziarski <michael@koziarski.com>
26f2cce
Santiago Pastorino spastorino ActionView::SafeBuffer should be there for backwards compatibility [#…
…4241 state:committed]

Signed-off-by: Michael Koziarski <michael@koziarski.com>
629afe9
Tom Lea 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
Rodrigo Kochenburger divoxx Set mailer template_root as absolute path [#2263 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
0022fa3
Emilio Tagua miloops Allow deprecation messages with or without a final period.
Signed-off-by: José Valim <jose.valim@gmail.com>
ac7b5a2
José Valim josevalim Added compatibility to Ruby 1.9.2. 157c180
Joe Rafaniello 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
Santiago Pastorino spastorino Time marshalling backported [#4286 state:committed]
Signed-off-by: wycats <wycats@gmail.com>
cf7ed7c
Santiago Pastorino spastorino flatten not needed here
Signed-off-by: wycats <wycats@gmail.com>
0f18904
Santiago Pastorino spastorino backport of inconsistency with cattr_reader and matter_reader with so…
…me tweaks

Signed-off-by: wycats <wycats@gmail.com>
bc2af91
Andrew White 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 Miller ernie belongs_to associations now honor :primary_key option for joins
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
00b95eb
Joey Aghion 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
Dudley Flanders dudleyf Trivial doc update on nested attributes delete renaming
Signed-off-by: José Valim <jose.valim@gmail.com>
bf563bd
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
Juanjo Bazán xuanxu new assertion: assert_blank
Signed-off-by: Xavier Noria <fxn@hashref.com>
ccb1bee
Juanjo Bazán xuanxu New assertion: assert_present
Signed-off-by: Xavier Noria <fxn@hashref.com>
4b08679
Santiago Pastorino spastorino Don't cache the utc_offset we are already caching the timezone [#4301]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e329eab
Xavier Noria fxn avoid method redefined; discarding old empty? warning [Santiago Pasto…
…rino]
a0454dc
Pratik lifo Dont try to load the record from the db if preloading didn't find any…
…thing
0e57c70
Pratik lifo Dont use Rails 3 finder syntax in Rails 2.3.x test [#4303 state:resol…
…ved]
1f44fc9
David Heinemeier Hansson dhh Added Object#presence that returns the object if it's #present? other…
…wise returns nil [DHH/Colin Kelley]
1668ad3
Jeremy Kemper 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
Santiago Pastorino spastorino utc_offset is no longer required on TimeZone and if it's not supplied…
… we delegate to TZInfo
de7925d
Santiago Pastorino spastorino delegate unknown timezones to TZInfo 2c148cd
Jeremy Kemper jeremy CI: add tzinfo e2ec41a
Jeremy Kemper jeremy Adjust test in case tzinfo is not available 19161e0
Jeremy Kemper jeremy Check more carefully for vendored tzinfo a72bcdb
Andrew White 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
Simon Effenberg Savar remove_index now uses quote_table_name() [#4300 state:resolved]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
1d73682
Santiago Pastorino spastorino Generate routes for nested resources with nil object raise RoutingErr…
…or [#4262 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
cfb31ed
David Heinemeier Hansson dhh Fixed that default locale templates should be used if the current loc…
…ale template is missing [DHH]
0653a6d
Rolf Bjaanes rolfb Changed the way inflections for uncountables work for 'funky jeans'
Signed-off-by: José Valim <jose.valim@gmail.com>
fcec740
José Valim josevalim Fix tests broken in 0653a6d f87a518
Santiago Pastorino spastorino fix stack trace lines on class_eval
Signed-off-by: José Valim <jose.valim@gmail.com>
958b0e9
José Valim josevalim Fix a failure added on 958b0e9 4a02437
Jeremy Kemper jeremy CI: message for some outstanding failures 56c5290
Jeremy Kemper jeremy Refactor for readability efec9b2
Jeremy Kemper jeremy CI: show all headers for diagnosis d91d6fe
Jeremy Kemper 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 Markin 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
Anil Wadghule anildigital Fix for plugin not getting installed on Windows environment [#4320 st…
…ate:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
c69dc1a
Pratik lifo Ensure not to load the entire association when bulk updating existing…
… records using nested attributes
5efb150
Xavier Noria fxn fix dash -> edit in an example, and a few touches now that we are here b8b568e
Eugene Pimenov libc Implement find_in_batches without with_scope [#2227 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
18ba648
Mislav Marohnić 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 Kemper jeremy Distinguish test for 1.8.6 compat c55cdd8
Mislav Marohnić mislav cleanup `update/reset_counters`; refactor tests ef0591e
Mislav Marohnić 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 Marohnić

Why was this necessary? With this change, you made this test be skipped in ruby 1.8.6, which was the target version for this test in the first place.

Now these lines only run in Ruby 1.9 :/

Owner

Because the test failed on 1.8.6. Did you mean to test that !s.ends_with?(:lo) may raise NoMethodError?

It shouldn't. Looks like I didn't solve it properly. Will patch it now

Pushed to "starts_ends" branch in my fork. Please pull. They should return false for non-strings

Owner

Pulled. Thanks!

mislav and others added some commits
Mislav Marohnić 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 Kemper jeremy Fix 1.9-specific syntax error in test 8b79c7c
Jeremy Kemper jeremy Upgrade bundled i18n from 1.3.3 to 1.3.7 fd5c6e2
Jeremy Kemper jeremy MemoryStore#read_multi(*keys) for dev-mode compatibility with memcach…
…e store
2401af4
Santiago Pastorino spastorino TimeZones lazy load
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
49943a7
Santiago Pastorino spastorino load tzinfo on initialize only
Signed-off-by: Xavier Noria <fxn@hashref.com>
d891754
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
Eugene Pimenov 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 Kemper jeremy PostgreSQL: use standard-conforming strings if possible c9e1570
Jeremy Kemper jeremy PostgreSQL: remove the unnecessary heuristic checking whether the val…
…ue is escaped
5c0ad82
Jeremy Kemper jeremy Remove quoted_string_prefix entirely since PostgreSQL was the only da…
…tabase adapter relying on it.
457a546
Jeremy Kemper jeremy Ruby 1.9: ERB template encoding using a magic comment at the top of t…
…he file
81e0607
Jeremy Kemper jeremy Ensure ERB source begins with the encoding comment 70034d8
Akira Matsuda amatsuda Fix pattern to match various magic comment formats 4082001
Jeremy Kemper 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 Kemper 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
Cezary Baginski e2 actionpack: added missing encoding comments [#4466 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ec7716a
Jeremy Kemper jeremy Fix unstated AS::Multibyte dependency 8716ee4
Jeremy Kemper jeremy Fix backport error: wrong exception name 9e262de
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
Curtis Hawthorne 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
Neeraj Singh 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
Marius Nuennerich 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
Pratik lifo Use class_inheritable_accessor for connection_handler 04fa5af
Brian Lopez 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
Jatinder Singh rubymerchant AR JSON Serializer now supports custom root option.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
aeff171
Pratik 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
Brian Lopez brianmario add support for mysql2 adapter to dbconsole
[#4532 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
6d1344d
Santiago Pastorino 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
Santiago Pastorino 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
Ryan Bigg

Do you mean to do this? You're assigning the same object to two separate variables, and then merging them later on 1955 (when they're going to be the same?) Perhaps you mean to define these variables both as empty hashes? Is there something I'm missing?

Owner

Ryan, you're right in part. I didn't mean to do this but this works well because of the line 1949.
if line 1949 is executed the hashes are not the same anymore.
But if args hasn't a hash they will be the same as you said but the functionality don't fail. Why? because i merge the same hash so nothing happends and i execute attributes= twice for unprotected_attributes so it's ok.
Anyways is not the intended solution and of couse is best to do a separate assignment, i will fix this later.
Thanks.

eparreno and others added some commits
Emili Parreño 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
Santiago Pastorino 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
Pratik lifo Revert "Revert "Add index length support for MySQL [#1852 state:resol…
…ved]" (breaks the build)"

This reverts commit eababa3.
77adb4b
Pratik lifo Make sure schema dumper doesnt throw up when there are no index lengths 3c1bb40
José Valim josevalim Remove i18n interpolation deprecation. It has been around since 2.2. 8e679f1
Santiago Pastorino 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 Kemper jeremy Drop require removed by 8e679f1 9ab1154
Pratik lifo Use superclass_delegating_accessor for connection handlers 7cbc546
Santiago Pastorino spastorino to_json and to_xml tests added to ActiveResource
[#4529 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c4ef7bb
José Valim josevalim Remove deprecated tests according to 8e679f1 6949d6f
Josh Kalderimis 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
Jeff Kreeftmeijer jeffkreeftmeijer partial counters with :as [#2804 state:resolved]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2de3646
Neeraj Singh neerajdotname db:drop:all throws error when database does not exist [#2997 state:re…
…solved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
22b020d
Jeff Kreeftmeijer 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
Lawrence Pit lawrencepit docs + test for each_error
[#3185 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
0706bdc
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
Jeff Kreeftmeijer 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
Neeraj Singh neerajdotname Fix broken integration test in 2.x [#4565 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
3570f3e
Nobuhiro IMAI 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
Matthew Rudy Jacobs 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
Jeff Kreeftmeijer jeffkreeftmeijer Added assert_attribute_type to clean up GeneratedAttributeTest [#2377
…state:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>
ec017e1
Wijnand Wiersma 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
Rizwan Reza rizwanreza Rack dependency bumped to 1.1.0, tests passing. [#3558 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
74206ae
Jeremy Kemper jeremy CI: bump rack to 1.1 cd3d30d
José Valim josevalim superclass_delegating_accessor does not accept options. 76608b1
Rizwan Reza rizwanreza Deprecate Array#rand in favor of Array#random_element [#4555 stated:c…
…ommitted]

Signed-off-by: Xavier Noria <fxn@hashref.com>
32b0b5f
Xavier Noria fxn method rename to fix a broken test bb2327d
José Valim josevalim Deprecate legacy CGI options in SessionStores. 94878c6
Ian White 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
Étienne Barrié 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 Kemper 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
Xavier Noria fxn 1.9 compat: deprecated last_(month|year) in favor of prev_(month|year) 25ec613
Aaron Patterson tenderlove backporting beda2d4 for newer sqlite-ruby bindings
Signed-off-by: Xavier Noria <fxn@hashref.com>
a637b5f
Jeremy Kemper jeremy Remove miscommit from 57337cd d8f0a58
Jeremy Kemper jeremy 2.3.6 release 56bb550
Jeremy Kemper jeremy Bump 2-3-stable to 2.3.7 55e88ee
Nathan Weizenbaum nex3 Mark all raw HTML being concatted as HTML-safe.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
48fbe7b
Nathan Weizenbaum nex3 Don't always mark the argument to #concat as HTML-safe.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e53791f
Nathan Weizenbaum nex3 Don't incompatibly monkeypatch ERB.
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
e3f14d1
Jeremy Kemper jeremy Fix test rendering unmarked but safe HTML ca5f5d9
Jeremy Kemper jeremy Use a non-XSS-protected output buffer for view tests ab2d7c8
Jeremy Kemper jeremy Revert "Don't always mark the argument to #concat as HTML-safe."
This reverts commit e53791f.
86f0287
Santiago Pastorino spastorino Make use of safe_concat on TextHelper concat
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
b10bf83
Jeremy Kemper jeremy rails_xss handles deprecated String html safety, when installed 3ff921a
Jeremy Kemper jeremy Move tests for deprecated String#html_safe! to plugin 60e82a3
Jeremy Kemper jeremy 2.3.7 release: fix rails_xss compatibility 326188c
Jeremy Kemper jeremy Bump 2-3-stable to 2.3.8 f97da34
mislav and others added some commits
Mislav Marohnić 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
Mislav Marohnić 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
Lance Ivy cainlevy Ensure auto_link does not ignore multiple trailing punctuations
[#2504 state:resolved]
9e08e19
Alex Young

Now the example in the documentation doesn't work:

  
    <div></div>
  

The divs will get escaped.

nex3 replied

That's not because of this commit, although it's possible that there are more things that need to be marked as HTML safe.

I subsequently realised I got mixed up there as I followed through the changes in 2.3.7. I'm still trying to figure out why I'm getting escaped HTML though

@alex
Any fix? I have the same problem.

All my tests pass OK with 2.3.6. Someone on the blog post about 2.3.7 said you need to use the rails_xss plugin (even if you don't want it): http://weblog.rubyonrails.org/2010/5/24/ruby-on-rails-2-3-7-released

jeremy and others added some commits
Jeremy Kemper 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
Yehuda Katz wycats Give the ERB String the encoding of the original template 50b7c0c
Yehuda Katz wycats Needs to work on 1.8 too 8e6a044
Santiago Pastorino 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
Santiago Pastorino 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 Kemper jeremy Work around strange Ruby 1.9 autoload issue by using absolute load pa…
…ths for tests
9d3bd87
Nicolas Blanco

If translations is an empty string "" or "\n", it does not get wrapped in an array and html_safe_translation_keys fails with TypeError: can't convert String into Array!

All my I18n applications now fails everytime there is a translation that returns an empty string.

sorry this is maybe the fault of my i18n backend, it was returning a string instead of an array of translations when calling I18n.translate with an array in parameter.

Nicolas Blanco

Great fix! Is there a workaround for all helpers that concat strings or should we wait for 2.3.9?
Thanks.

+1 Thanks!

Santiago Pastorino spastorino removes an unneeded alias
Signed-off-by: José Valim <jose.valim@gmail.com>
b1a97a4
matchu

Should be "but" instead of "by"? Or am I just tired?

Carlos Antonio da Silva

It should also have an assert for file_scheme, shouldn't it?

You're right. Feel free to add it

Thanks, patch applied f9abbf9

TMorgan99

Hello.
Where are your test for this - I have a failing example.
I can run selenium test in rails 2.3.5, but upgrading to 2.3.8 gives error.
A git bisect search tags this as the first failing commit.
Reversing this patch in 2.3.8 restores my test.

https://rails.lighthouseapp.com/projects/8994/tickets/4714-rails-238-breaks-selenium-test

I too have the same issue but with flash notices on 2.3.8, it turns out it is to do with Authlogic. Check out my repo at http://github.com/radar/rails-test-app

I'm curious TMorgan: How would you test a change like this?

I also ran into problems with this in integration tests - my session was no longer persisting. It seemed like my session key was getting prepended with a newline on the Set-Cookie response, so the next request would send the cookie like :
"\nmyapp_session" => "BAh7BjoPc2Vzc2lvbl9pZCIlOWQ2OGU1OTE5M2NkOWZ4NjAwNmJlZmFmNjA0NWNhYTA%3D--bc5ae2eb9cde54b32ae63928f30e20b105483a1c"

I opened up a lighthouse ticket with a patch that resolved the issue for me. Please review.

https://rails.lighthouseapp.com/projects/8994/tickets/4743-session-cookie-breaks-if-used-with-custom-cookie-in-rails-238

fxn and others added some commits
Xavier Noria fxn deprecates Array#random_element in favor of Array#sample, backported …
…from Ruby 1.9, thanks to Marc-Andre Lafortune
ed8cabc
Prem Sichanugrist 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
James Le Cuirot 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
Pratik lifo Fix AR perf script e4accde
Alex 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
Maxime RETY Fix Yajl backend discovery in ActiveSupport::JSON
[#4897]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
c7e875a
James Le Cuirot 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
Prem Sichanugrist 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
Prem Sichanugrist 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
Jesse Storimer jstorimer CookieStore should preserve the Set-Cookie header Array [#4743 state:…
…resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
85b6d79
Jeremy Kemper jeremy CI: add i18n gem e703fc1
Jeff Dean zilkey 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 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
Michael Koziarski 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
Neeraj Singh neerajdotname test for #1570
Signed-off-by: José Valim <jose.valim@gmail.com>
a9c69f3
Maxim Chernyak aka hakunin 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
Neeraj Singh neerajdotname 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 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
Neeraj Singh neerajdotname fixes to the tests for patch #4909
Signed-off-by: José Valim <jose.valim@gmail.com>
549b2ad
José Valim josevalim Use size for Ruby 1.8.6 compatibility. 68bfd8a
Xavier Noria fxn deprecates load_(once_)paths in dependencies and app config in favor …
…of autolaod_(once_)paths
4a745ca
Prem Sichanugrist 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
Paul Mucur 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
NagaChaitanya Vellanki chaitanyav Add OrderedHash#invert to preserve order in ruby 1.8
Signed-off-by: José Valim <jose.valim@gmail.com>
449cf50
José Valim 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
Ev Dolzhenko dolzenko Add module_eval missing file_name and line_number args
[#4712 state:resolved]

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

Signed-off-by: José Valim <jose.valim@gmail.com>
70af7ef
Leigh Caplan 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
Leigh Caplan

This might not be what we want - it does a lookup (and creates a TimeZone object) regardless of whether one already exists in zone_map

Owner

@texel you're right please add a patch on the #4942 ticket and assign to me

Done and done. Thanks!

sikachu and others added some commits
Prem Sichanugrist 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
David Trasbo 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
David Trasbo dtrasbo Deprecate ActiveRecord::Base#class_name [#379 state:committed]
Signed-off-by: José Valim <jose.valim@gmail.com>
ac42e69
Leigh Caplan 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
Aaron Patterson tenderlove AssociationCollection#create_by_*, find_or_create_by_* work properly …
…now. [#1108 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
fad166c
Jan Berkel 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
James Le Cuirot chewi Don't remove scheduled destroys when loading an association.
Signed-off-by: José Valim <jose.valim@gmail.com>
526f1e5
Aaron Patterson tenderlove fisting Session::AbstractStore#clear to actually clear the session. [#…
…5030 state:resolved]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
67e18c5
José Valim 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
Mislav Marohnić mislav add missing require to ActiveRecord "base_test.rb"
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
ba9c469
Mislav Marohnić mislav test that ActiveRecord `destroy` and `destroy_all` return destroyed r…
…ecords

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2d3bc99
Grant Ammons 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
Ken Collins 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
Mike Breen hardbap A generated plugin's test are not run by 'rake test'
Signed-off-by: José Valim <jose.valim@gmail.com>
046c900
Derek Perez

How does this changeset effect polymorphic associations? In Rails 2.3.8, my polymorphic nested attributes don't work anymore, it tells me I don't have an initialized constant that matches MyClass::PolymorphicAssociationClassName as a NameError. PolymorphicAssociationClassName would be MyClass::Owner which does not exist as a true class, but is the name of my polymorph association.

Is this a bug? I cannot upgrade to Rails 2.3.8, things worked fine in 2.3.5!

jlewallen and others added some commits
Jacob Lewallen jlewallen Set destroyed=true in opt locking's destroy [#5058 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
8298bef
Michael 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
Aaron Patterson tenderlove fixing performance regression from 2.3.5 -> 2.3.8 7b6383f
Michael Koziarski 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
Sam Ruby

I'm getting no such file to load -- active_support/core_ext/kernel/singleton_class (LoadError).

Perhaps you meant to require 'active_support/core_ext/object/singleton_class.rb' ?

Also see http://ruby-doc.org/core/classes/Kernel.html#M005941

If the file has the extension .rb, it is loaded as a source file; [..]
Otherwise, Ruby tries adding .rb, .so, and so on to the name.

johannesh, the problem isn't the extension but the path.

$ git checkout master
Switched to branch 'master'
$ find . -name singleton_class.rb
./activesupport/lib/active_support/core_ext/kernel/singleton_class.rb
$ git checkout 2-3-stable
Switched to branch '2-3-stable'
$ find . -name singleton_class.rb
./activesupport/lib/active_support/core_ext/object/singleton_class.rb

I know. All I stated was that the extension is optional.

Eric Hartmann

This file seems to be missing from the commit active_support/core_ext/module/remove_method.rb

Aaron Patterson
Owner

Sorry about that guys. Rails was picking up files out of my installed gems when I ran the tests. I've backported those two files here: 4ae4828

Sebastian Friedrich

It's fine to add this to Rails 3, but I don't think it's a good idea to backport this to Rails 2.3. It's a major change of behavior. In the past I have taken full advantage of the fact that facade methods are not used to generate form values. This change causes breakages all over, and I have a feeling it may affect a lot of people. After all, this was not a bug -- this particular behavior has been documented in books, blog posts etc. Can you please re-consider this change for 2.3?

I agree with feldpost on this one. In addition to this, the method is called "value_BEFORE_type_cast", but it does deliver the value AFTER the type cast. This is misleading at best.

+1.
When validation errors happen on form, the form needs to display the invalid value. This code change prevents us from showing user entered invalid value. A case in point is any invalid numeric value gets turned into 0.0 (after the type cast).

Owner

This has now been reverted in 2-3-stable

Thanks, Michael.

Cool, thank you!

Why hasn't this been reverted in Rails 3 too? Is the failed-validation behaviour not a problem there?

After discussing this we agreed to revert this behavior everywhere. So i'm reverting this on Rails 3 too

subbarao and others added some commits
Subba Rao Pasupuleti 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
Xavier Noria fxn it is no longer true that load_paths are going to be removed in final 15cafbe
Michael Koziarski 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
Santiago Pastorino spastorino Making time_zone_options_for_select return a html_safe string master …
…backport
43e2bbe
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
Xavier Noria fxn revises guides generation add3ccb
Xavier Noria fxn restores railties/README as home page of the API 11361a9
Mikel Lindsaar mikel Make ActiveResource::InvalidRequestError more user friendly
Signed-off-by: Xavier Noria <fxn@hashref.com>
0fcb430
Jeremy Kemper jeremy Exclude guides from gem to keep file size small bdace5d
Jeremy Kemper jeremy Prepare for Rails 2.3.9. Release 2.3.9.pre gems. b2c9198
Mikel Lindsaar mikel Updating documentation on ActiveResource HTTP Mock and also adding te…
…st coverage
881712c
Mikel Lindsaar mikel Back porting HttpMock test from Rails 3 master 56fdfeb
Mikel Lindsaar 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 2a1b23f on rails/master
bac12fa
Jeremy Kemper jeremy require 'thread' for Mutex dependency 6f17422
Ken Collins 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
Jeremy Kemper jeremy Rails 2.3.9 a61a39e
Samer Buna

Is there a reason why was this deprecated?

Kevin Menard

Should we really be swallowing issues with the index name being too long? This seems like unexpected behavior and an exception should just be raised. Granted a warning is logged, but the console output looks like everything worked okay. I'm unaware of anyone that checks the detailed log when things look okay.

Joshua Peek
Collaborator

Header values should never be an Array. We should revert this.

Agreed, we should go the other direction and always force it to be a string. I'll write a patch.

Owner

Rather than just patch it up everywhere we should probably refactor the session code so that it goes through the CookieJar rather than writing out the session cookie directly itself. That way we're delegating the cookie handling to Rack, where it should be.

Collaborator

I noticed this upgrading an app to 2.3.9 and Rack::Lint went nuts. Most rack servers will still handle legacy Array headers fine so this isn't super critical.

@pixeltrix I extracted some helpers to Rack::Utils awhile back for this reason.

This seems super broken too. We're converting Set-Cookie to an Array on the way out. (I'm sure git blame says I wrote the code too)

Array headers are fine internally as long as we cast them to strings on the way out so other middleware doesn't have to deal with them.

Owner

@josh I saw those and now that 2-3-stable is requiring Rack 1.1 we can use them. I think there's at least three places where cookies are being built so it's ripe for refactoring. This commit needs reverting as well.

@pixeltrix that commit followed the convention that I set up with this commit. I'll have a look at using set_cookie_header! where possible instead.

Owner

@jstorimer the session stores probably shouldn't be calling set_cookie_header! directly - we should let ActionController::CookieJar do the heavy lifting.

Owner

Pixeltrix, the cookie store in Rails master already delegates to the cookie jar. All other stores are coming from Rack (where we can't have any delegation).

The response is also broken in Rails 3. I remember there is a logic to convert the Set-Cookie from an Array to a String and this definitely needs to be fixed as well.

Is there a ticket in Lighthouse where I can track this issue? Thanks.

@boone Looks like this was already taken care of in e0eb8e9

Michaël Witrant

I had an error here because session is a Hash and doesn't have a destroy method. Seems consistent with the line below where session is initialized as a Hash. Shouldn't this case be checked ? (like if session.responds_to? :destroy, or something)

This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.