aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | AS guide: more date calculation utilitiesXavier Noria2010-05-091-1/+59
| | |
| * | AS guide: you know, the 10th is not NovemberXavier Noria2010-05-091-1/+1
| | |
| * | AS guide: adds a catchall note about date calculations around the calendar ↵Xavier Noria2010-05-091-0/+2
| | | | | | | | | | | | reform
| * | Updates bundler information, now bundler has a homepageSantiago Pastorino2010-05-081-1/+1
| | |
| * | AS guide: documents some Date calculations (calendar reform details pending)Xavier Noria2010-05-091-2/+49
| | |
| * | migration, correct file and created a code sample out of it.Rohit Arondekar2010-05-071-1/+5
| | |
| * | Migrations, rewrote a sentence for clarity.Rohit Arondekar2010-05-061-1/+1
| | |
| * | Updated guide to inform issues with unsupported Ruby versions.Anil Wadghule2010-05-061-0/+3
| | |
| * | typo 'Provivdes' -> 'Provides'Santiago Pastorino2010-05-051-1/+1
| | |
| * | Merge remote branch 'rails/master'Xavier Noria2010-05-0461-248/+412
| |\ \
| * | | Change typo 'image' to 'audio file'Josiah Ivey2010-05-041-1/+1
| | | |
| * | | image_tag should be audio_tagJosiah Ivey2010-05-041-1/+1
| | | |
| * | | typo 'follow' -> 'following'mica eked2010-05-041-1/+1
| | | |
| * | | typo "<image />" -> "<img />"mica eked2010-05-041-1/+1
| | | |
| * | | typo. missing 'if'logylaps2010-05-041-1/+1
| | | |
| * | | textile typo 'h6(:has_many-group)' -> 'h6(#has_many-group)'logylaps2010-05-041-1/+1
| | | |
| * | | typo 'main.cs' -> 'main.css'logylaps2010-05-041-1/+1
| | | |