aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Forget about auto scope, it's always explicit.Emilio Tagua2009-06-171-7/+6
|
* Merge commit 'rails/master'Emilio Tagua2009-06-1667-3333/+824
|\
| * Exceptions now in an exceptions moduleYehuda Katz + Carl Lerche2009-06-161-0/+58
| |
| * Remove exceptions from AbstractUnit so they work in real lifeYehuda Katz + Carl Lerche2009-06-162-58/+13
| |
| * Merge process2 into process to people's regular tests run :PYehuda Katz + Carl Lerche2009-06-163-115/+12
| |
| * More _write_layout_method removalYehuda Katz + Carl Lerche2009-06-152-14/+0
| |
| * Whoops, I guess we broke layouts ;)Yehuda Katz + Carl Lerche2009-06-156-32/+7
| |
| * rm -r controller/base!Yehuda Katz + Carl Lerche2009-06-1520-2477/+10
| |
| * Get all of rake tests to passYehuda Katz + Carl Lerche2009-06-152-1/+9
| |
| * Get the new base tests to passYehuda Katz + Carl Lerche2009-06-151-2/+1
| |
| * Get the AR integration tests to passYehuda Katz + Carl Lerche2009-06-151-3/+4
| |
| * Keep ActionMailer using the old layouts code until it gets refactored.Yehuda Katz + Carl Lerche2009-06-154-2/+13
| |
| * Fix the fixture pathYehuda Katz + Carl Lerche2009-06-151-1/+1
| |
| * Get tests to run (with failures) without old base aroundYehuda Katz + Carl Lerche2009-06-1542-1685/+1687
| |
| * Require missing file in ASYehuda Katz + Carl Lerche2009-06-151-0/+2
| |
| * Fix failing tests in new callbacksYehuda Katz + Carl Lerche2009-06-151-1/+1
| |
| * Finish making things pass with updated internal content_type semanticsYehuda Katz + Carl Lerche2009-06-157-59/+26
| |
| * Add :concat option to asset tag helpers to force concatenation.Joshua Peek2009-06-152-6/+48
| | | | | | | | | | This is useful for working around IE's stylesheet limit. stylesheet_link_tag :all, :concat => true
| * moves reopening of core classes to add generic stuff from Action Pack to ↵Xavier Noria2009-06-1310-49/+93
| | | | | | | | | | | | | | | | AS/core_ext and adds tests [#2798 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Bytes calculation speed upLuca Guidi2009-06-131-8/+15
| | | | | | | | | | | | [#2800 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * uses Object#metaclass and Object#class_eval in a few spotsXavier Noria2009-06-126-7/+11
| | | | | | | | | | | | [#2797 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Leave the quoting part to ARelEmilio Tagua2009-06-125-172/+171
|\|
| * HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation.Adam Milligan2009-06-124-167/+166
| | | | | | | | | | | | [#1642 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * HasOneAssociation inherits AssociationProxy since it shares nothing with ↵Emilio Tagua2009-06-121-5/+5
| | | | | | | | | | | | | | | | BelongsToAssociation. [#2796 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge commit 'rails/master'Emilio Tagua2009-06-129-163/+120
|\|
| * Move observing notify helper into AMoJoshua Peek2009-06-112-5/+6
| |
| * Fix observing AS dependenciesJoshua Peek2009-06-111-0/+2
| |
| * Integrate ActiveModel::Observing into ActiveRecordJoshua Peek2009-06-106-155/+93
| |
| * allow absolute paths for the asset cachesAndrew Kaspick2009-06-112-3/+19
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* | Merge commit 'rails/master'Emilio Tagua2009-06-1023-216/+547
|\|
| * Document and clean up HideActions and HttpYehuda Katz + Carl Lerche2009-06-104-29/+49
| |
| * Removed unnecessary codeYehuda Katz + Carl Lerche2009-06-102-32/+17
| |
| * Document ActionController::HelpersYehuda Katz + Carl Lerche2009-06-101-4/+71
| |
| * Cleaned up the #default_helper_module method to make better use of #helper ↵Yehuda Katz + Carl Lerche2009-06-101-9/+6
| | | | | | | | instead of duplicating code.
| * Adding "test" to the lib directory when running action pack tests on new baseYehuda Katz + Carl Lerche2009-06-101-1/+3
| |
| * Simplify helper use of ActiveSupport::Dependencies, and use super better for ↵Yehuda Katz + Carl Lerche2009-06-103-62/+53
| | | | | | | | in #helpers
| * Whitelist the methods which are called by multiparameter attribute assignment.Michael Koziarski2009-06-101-8/+8
| | | | | | | | This prevents users from causing NoMethodErrors and the like by editing the parameter names, and closes a potential exploit of CVE-2009-1904.
| * Clean up AbstractController::Logger and write documentationYehuda Katz + Carl Lerche2009-06-091-4/+12
| |
| * Cleaning up and documenting AbstractController::LayoutsYehuda Katz + Carl Lerche2009-06-095-43/+255
| |
| * Write documentation for AbstractController::HelpersYehuda Katz + Carl Lerche2009-06-094-23/+55
| |
| * Fix incorrect specification path in GemDependency#from_directory_nameMatt Jones2009-06-102-1/+8
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * enable *real* IO parsing for the libxml, nokogiri and rexml backends [#2659 ↵Brian Lopez2009-06-093-16/+26
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Arel updatedEmilio Tagua2009-06-101-5/+5
| |
* | Merge branch 'update_all'Emilio Tagua2009-06-101-10/+28
|\ \
| * | Initial update_all migrationEmilio Tagua2009-06-101-10/+28
| | |
* | | Use array of orders instead of string concatenationEmilio Tagua2009-06-101-7/+5
|/ /
* | Revert "Use ARel in SQL generation through associations"Emilio Tagua2009-06-101-28/+10
| | | | | | | | This reverts commit 7be3e3ba0547587313d87bccb788a8466a62628a.
* | Use ARel in SQL generation through associationsEmilio Tagua2009-06-101-10/+28
| |
* | Use ARel in SQL generation through associationsEmilio Tagua2009-06-102-15/+19
| |
* | Merge commit 'rails/master'Emilio Tagua2009-06-09241-881/+1118
|\|