aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Revert "Refactor of active_model/naming.rb and allow collection and element ↵Santiago Pastorino2010-05-122-59/+5
| | | | | | | | to be writable" This reverts commit f7862b2c34b5b298bf7b937c55f0637ebfe43a25. Signed-off-by: José Valim <jose.valim@gmail.com>
* Make ActiveResource serialize XML correctly when element_name is set.Santiago Pastorino2010-05-124-7/+54
| | | | | | [#4529] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Refactor of active_model/naming.rb and allow collection and element to be ↵Santiago Pastorino2010-05-122-5/+59
| | | | | | writable Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Make use of to_xml and to_json in testsSantiago Pastorino2010-05-121-2/+7
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* revises the rdoc of #average according to 5f3bd55, and realigns when clausesXavier Noria2010-05-121-5/+4
|
* type_cast_calculated_value refactor: value is never a Fixnum here. Fix test ↵Santiago Pastorino2010-05-112-3/+2
| | | | | | | | since SQLite returns Float. [#4514 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Gemfile requires sqlite3-ruby 1.3.0.beta.1Xavier Noria2010-05-121-1/+1
|
* Make sure timestamp is properly referencedBlake Smith2010-05-111-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Remove undocumented save_without_validation!Pratik Naik2010-05-112-10/+0
|
* Use arel instead of sql stringsPratik Naik2010-05-111-6/+5
|
* Succint save definitionPratik Naik2010-05-111-4/+2
|
* corrected error message in session/cookie_store [#4546 state:resolved]Josh Kalderimis2010-05-101-1/+1
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Make sure valid? preceives the context as in ActiveModel API (ht: Carlos ↵José Valim2010-05-104-26/+45
| | | | Antonio)
* Make sure schema dumper doesnt throw up when there are no index lengthsPratik Naik2010-05-091-1/+3
|
* Revert "Revert "Add index length support for MySQL [#1852 state:open]""Pratik Naik2010-05-097-3/+73
| | | | This reverts commit 6626833db13a69786f9f6cd56b9f53c4017c3e39.
* Improve code from 231d7676f72947bae765b9bd885b134aaf949921Pratik Naik2010-05-091-7/+5
|
* corrected AR find_each and find_in_batches to raise when the user uses ↵Josh Kalderimis2010-05-092-1/+22
| | | | | | select but does not specify the primary key Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge branch 'master' of github.com:rails/railsJosé Valim2010-05-097-6/+123
|\
| * Merge remote branch 'rails/master'Xavier Noria2010-05-0966-1013/+1065
| |\
| | * aliases Date#sunday to Date#end_of_week, for symmetry with existing alias ↵Xavier Noria2010-05-092-0/+3
| | | | | | | | | | | | Date#monday -> Date#beginning_of_week
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 10:40:36 +0000