aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge pull request #2543 from htanata/unused_require_in_ar_test"Santiago Pastorino2011-08-161-0/+1
| | | | | This reverts commit 87152f2604e73b218df90befda576f0acfed0bbf, reversing changes made to 0d3615f04c79f6e90d8ab33fdfc920b8faac9cb8.
* Merge pull request #2543 from htanata/unused_require_in_ar_testSantiago Pastorino2011-08-161-1/+0
|\ | | | | Remove unused require in activerecord/test/cases/attribute_methods_test.rb
| * Remove unused require.Hendy Tanata2011-08-161-1/+0
|/
* Fix tzinfo require (it broke ↵Jon Leighton2011-08-161-6/+13
| | | | test_raises_when_an_invalid_timezone_is_defined_in_the_config in railties)
* Fix wrap_parameters initializer templateJon Leighton2011-08-161-1/+1
|
* Be more lazy about creating time zone objects. Decreases startup time by ↵Jon Leighton2011-08-161-2/+13
| | | | about 10%. (#734)
* Don't refer to ActionController::Base in the wrap_parameters initializer - ↵Jon Leighton2011-08-163-1/+10
| | | | use config object instead. Cuts about 15% off the load time. (#734)
* Bump arel dependencyJon Leighton2011-08-151-1/+1
|
* Use new SelectManager#source methodJon Leighton2011-08-152-2/+2
|
* Use new SelectManager#projections= methodJon Leighton2011-08-153-4/+4
|
* use update.key instead of update.ast.key. make better use of select manager.Jon Leighton2011-08-153-26/+18
|
* Use a SelectCore rather than a full SelectManagerJon Leighton2011-08-152-4/+6
|
* Refactor building the update managerJon Leighton2011-08-154-16/+13
|
* Support for multi-table updates with limits, offsets and ordersJon Leighton2011-08-154-2/+77
|
* Support updates with joins. Fixes #522.Jon Leighton2011-08-155-4/+34
|
* Added Array#prepend as an alias for Array#unshift and Array#append as an ↵David Heinemeier Hansson2011-08-154-0/+20
| | | | alias for Array#<< [DHH]
* Merge pull request #2539 from arunagw/delegate_explJon Leighton2011-08-153-2/+2
|\ | | | | Delegate expl
| * Requiring delegate.Arun Agrawal2011-08-162-0/+2
| |
| * Removing unnecessary require, solve 'circular require considered harmful' ↵Jon Leighton2011-08-161-2/+0
|/ | | | warning.
* Fix typoSantiago Pastorino2011-08-151-1/+1
|
* rake assets:precompile executes in production environment as default if ↵Santiago Pastorino2011-08-152-11/+23
| | | | RAILS_ENV was not provided
* Merge pull request #2536 from arunagw/unused_varSantiago Pastorino2011-08-151-4/+4
|\ | | | | Unused variable removed.
| * Unused variable removed.Arun Agrawal2011-08-151-4/+4
| |
* | Update travis config on @joshk's instructionsJon Leighton2011-08-151-1/+2
|/
* Document Object#public_sendJon Leighton2011-08-152-1/+25
|
* Add a test for delegating a method ending in '=' as this is a special case.Jon Leighton2011-08-152-0/+9
|
* Ensure empty has_many :through association preloaded via joins is marked as ↵Jon Leighton2011-08-152-3/+10
| | | | loaded. Fixes #2054.
* Merge pull request #2534 from arunagw/public_send_requireJon Leighton2011-08-151-0/+1
|\ | | | | Need to include public_send
| * Need to include public_sendArun Agrawal2011-08-151-0/+1
|/
* Split up the definitions in Module#delegate depending on :allow_nil, and ↵Jon Leighton2011-08-152-17/+34
| | | | don't use exceptions for flow control in the :allow_nil => true case.
* Fix the line number in the backtrace when Module#delegate raisesJon Leighton2011-08-152-2/+14
|
* Fix private methods which are delegated to. This previously worked because ↵Jon Leighton2011-08-152-13/+13
| | | | Module#delegate previously ignored method visibility.
* Just do the method call directly in Module#delegate, if we can (we cannot ↵Jon Leighton2011-08-153-4/+27
| | | | for method names ending in '='). Two reasons: 1) it's faster, see https://gist.github.com/1089783 and 2) more importantly, delegate should not allow you to accidentally call private or protected methods.
* Backport Object#public_send to 1.8 so that we can implement Module#delegate ↵Jon Leighton2011-08-153-0/+143
| | | | such that non-public methods raise
* Ensure changing RAILS_GROUPS will load the proper dependencies.José Valim2011-08-141-13/+16
|
* Merge pull request #2527 from cesario/fix_2511José Valim2011-08-142-3/+8
|\ | | | | Methods like status and location are interfering with redirect_to [Closes #2511]
| * Methods like status and location are interfering with redirect_to [Closes #2511]Franck Verrot2011-08-142-3/+8
|/
* Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-1324-144/+513
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: RELEASING_RAILS.rdoc actionpack/lib/sprockets/railtie.rb actionpack/test/template/sprockets_helper_test.rb activerecord/test/cases/calculations_test.rb railties/guides/source/3_1_release_notes.textile railties/guides/source/active_resource_basics.textile railties/guides/source/command_line.textile
| * "suits" is correct here, not "suites"Waynn Lue2011-08-131-1/+1
| |
| * Typo fixOge Nnadi2011-08-131-1/+1
| |
| * Some fixes on the 3_1_release_notes guide.Sebastian Martinez2011-08-131-22/+22
| |
| * update abstract_controller callbacks to document meta-programmed filtersgeemus2011-08-131-18/+102
| |
| * ActiveModel::Validations basic guideVishnu Atrai2011-08-131-0/+24
| |
| * Document exclamation point on dynamic findersFlorent Guilleux2011-08-131-0/+4
| |
| * update rails on rack guide, section 2 needs to be changed or maybe deletedEmili Parreño2011-08-131-12/+21
| |
| * Revert "update rails on rack guide, section 2 needs to be changed or maybe ↵Mr. Wolfe2011-08-131-21/+12
| | | | | | | | | | | | deleted" This reverts commit 7a4e545eccf834cb620df0f909ef3f4bec4e6608.
| * update rails on rack guide, section 2 needs to be changed or maybe deletedMr. Wolfe2011-08-131-12/+21
| |
| * comma is more appropriate hereWaynn Lue2011-08-131-2/+2
| |
| * Fixed typo (attachments method name was missing an s) in Action Mailer ↵Floris Huetink2011-08-131-1/+1
| | | | | | | | basics guide
| * Fixed typoTate Johnson2011-08-131-1/+1
| |