aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Reset quoted_table_name after set_table_name [#4568 state:resolved]Santiago Pastorino2010-05-152-1/+13
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* partial counters with :as [#2804 state:resolved]Jeff Kreeftmeijer2010-05-153-0/+11
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix for get_ids when including a belongs_to association on a has_many ↵Diego Algorta2010-05-153-1/+6
| | | | | | association [#2896 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Add tests for convenience methods #notice and #alert to flash.now [#4369 ↵Anil Wadghule2010-05-151-0/+20
| | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* added convenience methods #notice and #alert to flash.nowMartin2010-05-151-0/+10
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* fix assert_select messages to its declaration behaviourPaco Guzman2010-05-152-8/+24
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Update generators test.José Valim2010-05-151-12/+1
|
* Reorganized initializers a bit to enable better hooks for common cases ↵wycats2010-05-1511-52/+154
| | | | | | | | | | | | | | | without the need for Railtie. Specifically, the following hooks were added: * before_configuration: this hook is run immediately after the Application class comes into existence, but before the user has added any configuration. This is the appropriate place to set configuration for your plugin * before_initialize: This is run after all of the user's configuration has completed, but before any initializers have begun (in other words, it runs right after config/environments/{development,production,test}.rb) * after_initialize: This is run after all of the initializers have run. It is an appropriate place for forking in a preforking setup Each of these hooks may be used via ActiveSupport.on_load(name) { }. In all these cases, the context inside the block will be the Application object. This means that for simple cases, you can use these hooks without needing to create a Railtie.
* Remove the need for a special action_mailer.url_for initializer that loads ↵wycats2010-05-152-66/+86
| | | | before anything else
* Added Rake task rails:templates:copy to copy templates for customization ↵Jeroen van Dijk + Rodrigo Urubatan2010-05-151-0/+22
| | | | | | [#4574 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Add missing require to with_options [#4601 state:resolved]Carlos Antonio da Silva2010-05-151-0/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* STI should not ignore type condition while applying scopes from parent class ↵Neeraj Singh2010-05-152-5/+6
| | | | | | | | scopes [#4507 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Bundler deprecated options in Gemfile with application template using method ↵Adrian Sanchez2010-05-152-3/+14
| | | | | | "gem" [#4534 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Accept :alt => nil on image_tag [#4558 state:resolved]Marc-Andre Lafortune2010-05-152-2/+3
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* ActiveResource shouldn't consider modules in the pathSantiago Pastorino2010-05-153-16/+12
| | | | | | [#4529 state:committed] Signed-off-by: José Valim <jose.valim@gmail.com>
* Improve previous patch a bit [#3645 state:resolved]José Valim2010-05-153-9/+11
|
* Let label helpers accept blocks.Stephen Celis2010-05-154-21/+56
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Modified default_scope to merge with any pre-existing default_scopeDavid Chelimsky + Brian Tatnall2010-05-152-3/+34
| | | | | | | | | | | | and added AR::Base::clear_default_scope - clear_default_scope provides users who rely on the old behaviour of each call to default_scope overwriting any previous default scopes an opportunity to maintain that behaviour. [#4583 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Better code formatting and proper line numbers for stack tracesNeeraj Singh2010-05-144-19/+19
| | | | | | [#4596 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* To allow proper fisting of stack traceSantiago Pastorino2010-05-141-3/+3
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Changed encoding behaviour of mail, so updated tests in actionmailer and ↵Mikel Lindsaar2010-05-143-4/+8
| | | | | | bumped mail version to 2.2.1 Signed-off-by: José Valim <jose.valim@gmail.com>
* minor changes to instance level validations implementation based on feedback ↵Josh Kalderimis2010-05-134-38/+17
| | | | from José Valim
* validation macros can now be used within an instanceJosh Kalderimis2010-05-1313-14/+114
|
* defines prev_(month|year) in Date and Time to ease transition to 1.9, and ↵Xavier Noria2010-05-127-34/+77
| | | | deprecates last_(month|year)
* Fixes to_json and to_xml for ActiveResourceSantiago Pastorino2010-05-121-6/+15
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>