aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "removing the extra \"Neeraj Singh2010-06-151-1/+1
| | | | This reverts commit 51a9703b1e80caa30d699f30615f023079874623.
* Merge branch 'master' of github.com:lifo/docrailsNeeraj Singh2010-06-1534-119/+130
|\
| * Routing guide - Minor typo/consistency changesrspeicher2010-06-141-8/+8
| |
| * Active Record Basics - Separate and clarify the explanations for ↵rspeicher2010-06-141-2/+4
| | | | | | | | created_at/on and updated_at/on
| * Active Record Basics - Style and grammar editsrspeicher2010-06-141-17/+21
| | | | | | | | | | - "i.e." should be "e.g." in these cases, and include the comma - Newline consistency before/after Ruby blocks - Conform to the apparent guide standard of "Active Record" over "ActiveRecord"
| * Merge remote branch 'rails/master'Xavier Noria2010-06-141-18/+21
| |\
| | * refactors AR::Base#reset_table_nameXavier Noria2010-06-141-19/+20
| | |
| | * Documentation for #quoted_table_name methodThiago Pradi2010-06-141-0/+2
| | | | | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * | edit pass: the names of Rails components have a space, ie, "Active Record", ↵Xavier Noria2010-06-1430-48/+48
| | | | | | | | | | | | not "ActiveRecord"
| * | Fix minor typos and inconsistencies, and one minor grammar changerspeicher2010-06-141-6/+6
| | |
| * | edit pass in #define_callbacks rdocXavier Noria2010-06-141-20/+22
| | |
* | | removing the extra \Neeraj Singh2010-06-151-1/+1
|/ /
* | adding to the :kind documentation for ActiveSupport callbacksNeeraj Singh2010-06-141-0/+5
| |
* | clearer documentation of how scope applies to ActiveSupport callbacksNeeraj Singh2010-06-141-20/+32
| |
* | truncate safe method description changesNeeraj Singh2010-06-141-1/+1
| |
* | Added headings to serializers.Rizwan Reza2010-06-143-3/+7
| |
* | Revised the rest of the files from ActiveModel.Rizwan Reza2010-06-143-23/+36
| |
* | Revised and added headings.Rizwan Reza2010-06-143-1/+7
| |
* | Revised naming.rb and lint.rbRizwan Reza2010-06-142-5/+5
| |
* | Added headings and revised active_model.rb/lint.rb grammaticallyRizwan Reza2010-06-141-1/+3
| |
* | Minor changes to active_model/errors.rbRizwan Reza2010-06-141-8/+16
| |
* | Minor changes to active_model/callbacks.rb and dirty.rbRizwan Reza2010-06-142-7/+12
| |
* | Minor changes to active_model/attribute_methodsRizwan Reza2010-06-141-24/+30
| |
* | Minor changes to callbacks and conversion API docs.Rizwan Reza2010-06-142-13/+17
|/
* Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-06-1428-152/+185
|\
| * docfix (email instead of emai)David Chelimsky2010-06-131-3/+3
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * explains why AS::OrderedHash does not leverage inheritanceXavier Noria2010-06-131-0/+11
| |
| * render(:inline) in a layout before yield replaces original contentNeeraj Singh2010-06-133-1/+9
| | | | | | | | | | | | [#4777 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * removes spurious .rb in requireSantiago Pastorino2010-06-131-1/+1
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Tidy up generators based on latest change on AM.José Valim2010-06-133-4/+4
| |
| * CI changes per Chad's requestwycats2010-06-131-2/+2
| |
| * Change implementation to do it without asking each time for block_given?Santiago Pastorino2010-06-131-6/+4
| | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * revises implementation of AS::OrderedHash#merge!Xavier Noria2010-06-133-21/+24
| |
| * Revert "hash merging with a block ignores non-existing keys altogether"Xavier Noria2010-06-132-17/+18
| | | | | | | | | | | | This reverts commit 72f9fec607c4a72b2e88995d0cb32b16b96e9068. It is wrong, this feature is a little undocumented, doing some research.
| * hash merging with a block ignores non-existing keys altogetherXavier Noria2010-06-132-18/+17
| |
| * re-organized test for merge into separate testsPaul Barry2010-06-131-13/+21
| | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com>
| * Support passing a block to ActiveSupport::OrderedHash's merge and merge! ↵Paul Mucur2010-06-133-3/+22
| | | | | | | | | | | | | | | | [#4838 state:committed] For better consistency with Ruby's own Hash implementation. Signed-off-by: Xavier Noria <fxn@hashref.com>
| * Revert "Revert "Validators should at model level and not at AR:Base level ↵wycats2010-06-121-0/+10
| | | | | | | | | | | | [Closes #4804]"" This reverts commit d67549306567b219089f2355fe432d31d0ebf8a1.
| * Bump rack-mount version to 0.6.4Santiago Pastorino2010-06-121-1/+1
| |
| * require conversions to use String#ordSantiago Pastorino2010-06-121-0/+1
| |
| * Revert "Validators should at model level and not at AR:Base level [Closes ↵wycats2010-06-121-10/+0
| | | | | | | | | | | | #4804]" This reverts commit e11bb95d56ed77b10d54d9dfe5a3cc4aa48b3a61.
| * registers 4146a44 in CHANGELOGXavier Noria2010-06-121-0/+5
| |
| * removes spurious .rb in requireXavier Noria2010-06-121-1/+1
| |
| * Move ActionMailer::TC to AV::TC::BehaviorDavid Chelimsky2010-06-123-45/+55
| | | | | | | | | | | | [#4843 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
| * Change sanitize to escape in test names of text_helper_test [#4844 ↵rohit2010-06-121-9/+9
| | | | | | | | state:resolved]
| * subject is automatically looked up on I18n using mailer_name and action_name ↵José Valim2010-06-123-2/+4
| | | | | | | | as scope as in t('.subject')
| * Use load_paths on AR benchmarks so it uses the bundler setup instead of ↵José Valim2010-06-121-5/+5
| | | | | | | | system gems.
| * No need to call convert_key before except.José Valim2010-06-121-1/+0
| |
| * Simplify and optimize callbacks superclass sync.José Valim2010-06-121-54/+21
| |
| * Create mailers folder when starting a new rails appLawrence Curtis2010-06-121-0/+0
| | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>