aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Simplify cookie_store by simply relying on cookies.signed.José Valim2010-05-189-151/+138
|
* Rely on set and delete cookie logic from rack.José Valim2010-05-182-33/+6
|
* Renames Array#rand -> Array#random_elementRizwan Reza2010-05-174-17/+5
| | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* Merge remote branch 'origin/master'wycats2010-05-174-3/+38
|\
| * Added default currency values to NumberHelper and pass them to I18n.translateSantiago Pastorino2010-05-172-2/+22
| | | | | | | | | | | | [#4604 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Allow root to be given in the resources scope without need to specify :on => ↵José Valim2010-05-172-1/+16
| | | | | | | | collection.
* | Merge branch 'encodings'wycats2010-05-172-5/+9
|\ \
| * | Make sure encoding changes don't break 1.8wycats2010-05-172-5/+9
| | |
* | | Revert "Moved encoding work in progress to a feature branch."wycats2010-05-1722-89/+488
| |/ |/| | | | | This reverts commit ade756fe42423033bae8e5aea8f58782f7a6c517.
* | Valid hex strings aren't valid float column values, to match the integer ↵Jeremy Kemper2010-05-172-4/+9
| | | | | | | | restriction. [#4622 state:resolved]
* | Use assert_equal correctly in transaction callback tests (exposing some of ↵Paco Guzman2010-05-171-17/+17
| | | | | | | | | | | | | | | | them as broken) [#4612] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Ruby 1.9: helper path may be a pathname, so convert to a string before ↵Jeremy Kemper2010-05-161-1/+1
| | | | | | | | quoting for regexp
* | AR::Base#clone fixed to set dirty bits for cloned objectpleax2010-05-162-1/+57
| | | | | | | | | | | | [#2919 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | cache connection when quotingComron Sattari2010-05-161-5/+6
| | | | | | | | | | | | | | [#3642 state:committed] Signed-off-by: Marius Nuennerich <marius@nuenneri.ch> Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | a cloned object no longer mimics changed flags from creator , plus a test ↵Federico Brubacher2010-05-163-4/+15
| | | | | | | | | | | | case [#4614 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Moved encoding work in progress to a feature branch.Jeremy Kemper2010-05-1622-488/+89
|/ | | | This reverts commits af0d1a88157942c6e6398dbf73891cff1e152405 and 64d109e3539ad600f58536d3ecabd2f87b67fd1c.
* Change on Array extension from rand => random_element [#4555 state:committed]Santiago Pastorino2010-05-164-13/+27
| | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* Significantly improved internal encoding heuristics and support.wycats2010-05-1619-54/+417
| | | | | | | | | | | | | | | | | | | | | | | | | * Default Encoding.default_internal to UTF-8 * Eliminated the use of file-wide magic comments to coerce code evaluated inside the file * Read templates as BINARY, use default_external or template-wide magic comments inside the Template to set the initial encoding * This means that template handlers in Ruby 1.9 will receive Strings encoded in default_internal (UTF-8 by default) * Create a better Exception for encoding issues, and use it when the template source has bytes that are not compatible with the specified encoding * Allow template handlers to opt-into handling BINARY. If they do so, they need to do some of their own manual encoding work * Added a "Configuration Gotchas" section to the intro Rails Guide instructing users to use UTF-8 for everything * Use config.encoding= in Ruby 1.8, and raise if a value that is an invalid $KCODE value is used Also: * Fixed a few tests that were assert() rather than assert_equal() and were caught by Minitest requiring a String for the message * Fixed a test where an assert_select was misformed, also caught by Minitest being more restrictive * Fixed a test where a Rack response was returning a String rather than an Enumerable
* Initial work to improve the state of encodings for templateswycats2010-05-166-45/+81
|
* Added nokogiri dependency to Gemfile [#4617 state:resolved]Priit Tamboom2010-05-161-0/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* prevent to run fixture accessor (e.g. test_foos for TestFoo model) as a test ↵Nobuhiro IMAI2010-05-162-0/+6
| | | | | | | case [#2992 state:resolved] Signed-off-by: Wijnand Wiersma <wijnand@videre.net> Signed-off-by: José Valim <jose.valim@gmail.com>
* Gemfile requires sqlite3-ruby = 1.3.0.beta.2Santiago Pastorino2010-05-161-1/+1
| | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
* Tests for new reserved words [#4602 state:resolved]Simon Jefford2010-05-161-2/+7
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Added rails command aliases (s g c db) to reserved words in app generator ↵Aleksandr Koss2010-05-161-1/+1
| | | | | | [#4602 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* I have updated the documentation according to ticket #4263 about fixtures ↵Franck Verrot2010-05-161-1/+9
| | | | | | and set_fixture_class Signed-off-by: José Valim <jose.valim@gmail.com>
* Take out stale tasks from Actionpack's Rakefile [#4619 state:resolved]Rizwan Reza2010-05-161-19/+0
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Takes out stale methods relating to edge_rails_versionRizwan Reza2010-05-162-54/+0
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Added missing require, we are using bind method defined on ↵Santiago Pastorino2010-05-161-0/+1
| | | | | | | | active_support/core_ext/proc [#4610 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* Make use of assert_equal to test equallity between object assert expects and ↵Santiago Pastorino2010-05-167-12/+12
| | | | | | | | object and a message of error [#4611 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* Postgresql doesn't allow to change a string type column to a binary type. ↵Wijnand Wiersma2010-05-161-7/+9
| | | | | | Skip this test for postgresql for now. [#4616 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Check blocks are not incorrectly detected when compiling erubis templates ↵Simon Jefford2010-05-163-1/+7
| | | | | | [#4575 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Fixed 1 failure in ActionPack testsuite [#4613 state:resolved]Hussein Morsy2010-05-161-2/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Add some comments related to Hash method check.José Valim2010-05-161-0/+3
|
* added support for html attributes in options_for_select [#2165]pleax2010-05-162-2/+81
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Fixed 1 failure and 2 errors in ActionPack testsuite [#4613 state:commited]rohit2010-05-163-6/+6
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix Hash#index deprecated warning in 1.9.x [#4600 state:resolved]Aleksandr Koss2010-05-161-1/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Rename assert_attribute_type to asser_field_type.José Valim2010-05-162-10/+10
|
* Added assert_attribute_type to clean up GeneratedAttributeTest [#2377 ↵Jeff Kreeftmeijer2010-05-162-0/+52
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Move AD::Cascade to the bottom of the middleware stack.José Valim2010-05-163-34/+34
|
* using :time_select when the attribute type is :time in the scaffold ↵Jeff Kreeftmeijer2010-05-161-6/+7
| | | | | | generator. [#2377 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Fixed two failing tests in railties on 1.9.2-head [#4609 state:commited]rohit2010-05-161-2/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Don't carry default value when changing column for a binary type on MySQL ↵Elomar França2010-05-162-1/+15
| | | | | | [#3234 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Expose remaining hooks to minimize the need for a Railtie based on feedback ↵José Valim2010-05-164-6/+36
| | | | from plugin developers.
* Ensure that eager_load actually takes place just after the middleware stack ↵José Valim2010-05-154-15/+49
| | | | | | is built by using another pattern. Also create a engine_blank_point initializer to ensure any :before or :after hooks defined inside engines won't move the configuration initializers to other places.
* Sending :id => nil to form helpers now properly omits the "id" html element ↵Jeff Dean2010-05-152-5/+118
| | | | | | [#4559 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Revert "Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an ↵José Valim2010-05-1515-139/+111
| | | | | | | | options hash and make various Validators pass their (filtered) options." Having a huge array to whitelist options is not the proper way to handle this case. This means that the ActiveModel::Errors object should know about the options given in *all* validators and break the extensibility added by the validators itself. If the intent is to whitelist options before sending them to I18n, each validator should clean its respective options instead of throwing the responsibility to the Errors object. This reverts commit bc1c8d58ec45593acba614d1d0fecb49adef08ff.
* Optimize the code added in fa99de0bd054576336c9José Valim2010-05-151-9/+19
|
* Ruby 1.9: fix invalid rack response in testJeremy Kemper2010-05-151-1/+1
|
* make sure `as` is set before trying to build an #{as}_counter. [#2804 ↵Jeff Kreeftmeijer2010-05-151-1/+1
| | | | | | state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Make ActiveModel::Errors#add_on_blank and #add_on_empty accept an options ↵Jeroen van Dijk2010-05-1515-111/+139
| | | | | | | | | | | | | | | | | | | | hash and make various Validators pass their (filtered) options. This makes it possible to pass additional options through Validators to message generation. E.g. plugin authors want to add validates_presence_of :foo, :format => "some format". Also, cleanup the :default vs :message options confusion in ActiveModel validation message generation. Also, deprecate ActiveModel::Errors#add_on_blank(attributes, custom_message) in favor of ActiveModel::Errors#add_on_blank(attributes, options). Original patch by Sven Fuchs, some minor changes and has been changed to be applicable to master again [#4057 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>