aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote branch 'docrails/master'Xavier Noria2010-07-099-85/+117
|\
| * Minor typos: 'built-in' instead of 'built in', 'built into' instead of 'built...Jaime Iniesta2010-07-095-5/+5
| * Describe recent changes in Multibyte::Chars.Norman Clarke2010-07-081-56/+81
| * copy-edits some docsXavier Noria2010-07-082-22/+25
| * Merge branch 'master' of github.com:lifo/docrailsNeeraj Singh2010-07-0883-545/+855
| |\
| | * API Docs: Fixes to the Routing docsRohit Arondekar2010-07-071-6/+4
| * | clarifying how to create non standard primary keyNeeraj Singh2010-07-081-1/+7
* | | application.rb: revises the comment for autoload_paths so that is assumes les...Xavier Noria2010-07-091-3/+3
* | | Refactor previous commits a bit.José Valim2010-07-081-7/+10
* | | Return from ActiveRecord::Base#attributes= unless value is a hash [#4070 stat...David Trasbo2010-07-082-1/+8
* | | reset_counter should work with non-traditional belongs_to and polymorphic bel...Neeraj Singh2010-07-087-6/+52
* | | Improve a bit the code in latest commits.José Valim2010-07-083-21/+18
* | | Improve bang method defs, make slice! operate in-place. [#5028 state:resolved]Norman Clarke2010-07-083-36/+33
* | | This patch changes update_attribute implementatino so:Neeraj Singh2010-07-085-20/+74
* | | consolidating updated_at and updated_onNeeraj Singh2010-07-081-9/+16
* | | Eager loading :through associations will join the :source model if there are ...Grant Ammons2010-07-083-1/+13
* | | Allow a PID file to be specified to rails server [#5031 state:resolved]Sudara2010-07-081-0/+3
* | | Fix the #using_limitable_reflections? helper to work correctly by not examini...Ken Collins2010-07-082-1/+11
* | | Tests to specify the behaviour of ActiveRecord::Migrator.get_all_versions() [...Thiago Pradi2010-07-081-0/+14
* | | Removing method before redefining it. It was causing warnings. [#5072 state:r...Łukasz Strzałkowski2010-07-081-0/+1
* | | removed an old unused method in AR which removed readonly attributesJosh Kalderimis2010-07-081-9/+0
* | | removing unused methodNeeraj Singh2010-07-081-5/+0
* | | moving parse_sqlite_config to the sqlite3_connection method (where it belongs...Aaron Patterson2010-07-082-20/+11
* | | removing useless code. [#5070 state:resolved]Aaron Patterson2010-07-081-2/+1
* | | fix ActiveRecord `destroy_all` so it returns destroyed recordsMislav Marohnić2010-07-084-13/+24
* | | Revert "Bump bundler to 1.0.0.beta.3"Jeremy Kemper2010-07-081-1/+1
* | | Bump bundler to 1.0.0.beta.3Jeremy Kemper2010-07-081-1/+1
* | | Change documentation for ActiveModel::MassAssignmentSecurity a bit and make d...José Valim2010-07-083-47/+54
* | | mass_assignment_security moved from AR to AMo, and minor test cleanupJosh Kalderimis2010-07-0815-91/+143
* | | minor changes to mass assignment security patch to bring it in line with rail...Josh Kalderimis2010-07-088-249/+234
* | | Mass assignment security refactoringEric Chapweske2010-07-0810-146/+378
* | | This test never runs and it has never run. Since the day this fileNeeraj Singh2010-07-081-4/+0
* | | Print proper "Usage:" messages for "rails plugin" commandAkira Matsuda2010-07-071-2/+10
* | | whitespaceAkira Matsuda2010-07-071-50/+47
* | | Fixed gruoped_by_title spelling [#5063 state:committed]Ben Somers2010-07-082-3/+3
* | | adding some behavioral tests for the sqlite adapter. [#5065 state:resolved]Aaron Patterson2010-07-071-0/+100
* | | Fix setting helpers_path to a string or pathnameJeremy Kemper2010-07-073-6/+7
| |/ |/|
* | Merge remote branch 'docrails/master'Xavier Noria2010-07-0710-24/+48
|\ \
| * | Add note about incompatibility of namespace and :controllerAndrew White2010-07-071-0/+6
| |/
| * Merge branch 'master' of github.com:lifo/docrailsNeeraj Singh2010-07-065-18/+20
| |\
| | * Fixed minor typo app/view to app/viewsl4u2010-07-061-1/+1
| | * Fixed typo in Rails::Generators::Base [#5051 state:resolved]Mark Hayes2010-07-061-1/+1
| | * Reword routing guide so that we talk about prefixing as a use of :as rather t...Andrew White2010-07-041-3/+3
| | * Added release notes for 3 changes to helpersJeff Dean2010-07-041-1/+3
| | * Updated routing guide to reflect the fact that :name_prefix is now :asAndrew White2010-07-031-7/+7
| | * :singular is no longer a valid option for resources [#5037 state:resolved]Andrew White2010-07-031-4/+4
| | * Changed passed argument to :validate => false in validation skipping section.Uģis Ozols2010-07-031-2/+2
| * | added more info about << operation in associationsNeeraj Singh2010-07-061-0/+4
| |/
| * clarifying the comments regarding base_class declarationNeeraj Singh2010-07-011-2/+4
| * Added documentation for usage of associative resources with form_forRizwan Reza2010-07-011-1/+11