Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'rails/master' | Emilio Tagua | 2009-06-16 | 67 | -3333/+824 |
|\ | |||||
| * | Exceptions now in an exceptions module | Yehuda Katz + Carl Lerche | 2009-06-16 | 1 | -0/+58 |
| | | |||||
| * | Remove exceptions from AbstractUnit so they work in real life | Yehuda Katz + Carl Lerche | 2009-06-16 | 2 | -58/+13 |
| | | |||||
| * | Merge process2 into process to people's regular tests run :P | Yehuda Katz + Carl Lerche | 2009-06-16 | 3 | -115/+12 |
| | | |||||
| * | More _write_layout_method removal | Yehuda Katz + Carl Lerche | 2009-06-15 | 2 | -14/+0 |
| | | |||||
| * | Whoops, I guess we broke layouts ;) | Yehuda Katz + Carl Lerche | 2009-06-15 | 6 | -32/+7 |
| | | |||||
| * | rm -r controller/base! | Yehuda Katz + Carl Lerche | 2009-06-15 | 20 | -2477/+10 |
| | | |||||
| * | Get all of rake tests to pass | Yehuda Katz + Carl Lerche | 2009-06-15 | 2 | -1/+9 |
| | | |||||
| * | Get the new base tests to pass | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -2/+1 |
| | | |||||
| * | Get the AR integration tests to pass | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -3/+4 |
| | | |||||
| * | Keep ActionMailer using the old layouts code until it gets refactored. | Yehuda Katz + Carl Lerche | 2009-06-15 | 4 | -2/+13 |
| | | |||||
| * | Fix the fixture path | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -1/+1 |
| | | |||||
| * | Get tests to run (with failures) without old base around | Yehuda Katz + Carl Lerche | 2009-06-15 | 42 | -1685/+1687 |
| | | |||||
| * | Require missing file in AS | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -0/+2 |
| | | |||||
| * | Fix failing tests in new callbacks | Yehuda Katz + Carl Lerche | 2009-06-15 | 1 | -1/+1 |
| | | |||||
| * | Finish making things pass with updated internal content_type semantics | Yehuda Katz + Carl Lerche | 2009-06-15 | 7 | -59/+26 |
| | | |||||
| * | Add :concat option to asset tag helpers to force concatenation. | Joshua Peek | 2009-06-15 | 2 | -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 Noria | 2009-06-13 | 10 | -49/+93 |
| | | | | | | | | | | | | | | | | AS/core_ext and adds tests [#2798 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Bytes calculation speed up | Luca Guidi | 2009-06-13 | 1 | -8/+15 |
| | | | | | | | | | | | | [#2800 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | uses Object#metaclass and Object#class_eval in a few spots | Xavier Noria | 2009-06-12 | 6 | -7/+11 |
| | | | | | | | | | | | | [#2797 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Leave the quoting part to ARel | Emilio Tagua | 2009-06-12 | 5 | -172/+171 |
|\| | |||||
| * | HasOneThroughAssociation still shouldn't derive from HasManyThroughAssociation. | Adam Milligan | 2009-06-12 | 4 | -167/+166 |
| | | | | | | | | | | | | [#1642 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | HasOneAssociation inherits AssociationProxy since it shares nothing with ↵ | Emilio Tagua | 2009-06-12 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | BelongsToAssociation. [#2796 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-12 | 9 | -163/+120 |
|\| | |||||
| * | Move observing notify helper into AMo | Joshua Peek | 2009-06-11 | 2 | -5/+6 |
| | | |||||
| * | Fix observing AS dependencies | Joshua Peek | 2009-06-11 | 1 | -0/+2 |
| | | |||||
| * | Integrate ActiveModel::Observing into ActiveRecord | Joshua Peek | 2009-06-10 | 6 | -155/+93 |
| | | |||||
| * | allow absolute paths for the asset caches | Andrew Kaspick | 2009-06-11 | 2 | -3/+19 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-10 | 23 | -216/+547 |
|\| | |||||
| * | Document and clean up HideActions and Http | Yehuda Katz + Carl Lerche | 2009-06-10 | 4 | -29/+49 |
| | | |||||
| * | Removed unnecessary code | Yehuda Katz + Carl Lerche | 2009-06-10 | 2 | -32/+17 |
| | | |||||
| * | Document ActionController::Helpers | Yehuda Katz + Carl Lerche | 2009-06-10 | 1 | -4/+71 |
| | | |||||
| * | Cleaned up the #default_helper_module method to make better use of #helper ↵ | Yehuda Katz + Carl Lerche | 2009-06-10 | 1 | -9/+6 |
| | | | | | | | | instead of duplicating code. | ||||
| * | Adding "test" to the lib directory when running action pack tests on new base | Yehuda Katz + Carl Lerche | 2009-06-10 | 1 | -1/+3 |
| | | |||||
| * | Simplify helper use of ActiveSupport::Dependencies, and use super better for ↵ | Yehuda Katz + Carl Lerche | 2009-06-10 | 3 | -62/+53 |
| | | | | | | | | in #helpers | ||||
| * | Whitelist the methods which are called by multiparameter attribute assignment. | Michael Koziarski | 2009-06-10 | 1 | -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 documentation | Yehuda Katz + Carl Lerche | 2009-06-09 | 1 | -4/+12 |
| | | |||||
| * | Cleaning up and documenting AbstractController::Layouts | Yehuda Katz + Carl Lerche | 2009-06-09 | 5 | -43/+255 |
| | | |||||
| * | Write documentation for AbstractController::Helpers | Yehuda Katz + Carl Lerche | 2009-06-09 | 4 | -23/+55 |
| | | |||||
| * | Fix incorrect specification path in GemDependency#from_directory_name | Matt Jones | 2009-06-10 | 2 | -1/+8 |
| | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | enable *real* IO parsing for the libxml, nokogiri and rexml backends [#2659 ↵ | Brian Lopez | 2009-06-09 | 3 | -16/+26 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Arel updated | Emilio Tagua | 2009-06-10 | 1 | -5/+5 |
| | | |||||
* | | Merge branch 'update_all' | Emilio Tagua | 2009-06-10 | 1 | -10/+28 |
|\ \ | |||||
| * | | Initial update_all migration | Emilio Tagua | 2009-06-10 | 1 | -10/+28 |
| | | | |||||
* | | | Use array of orders instead of string concatenation | Emilio Tagua | 2009-06-10 | 1 | -7/+5 |
|/ / | |||||
* | | Revert "Use ARel in SQL generation through associations" | Emilio Tagua | 2009-06-10 | 1 | -28/+10 |
| | | | | | | | | This reverts commit 7be3e3ba0547587313d87bccb788a8466a62628a. | ||||
* | | Use ARel in SQL generation through associations | Emilio Tagua | 2009-06-10 | 1 | -10/+28 |
| | | |||||
* | | Use ARel in SQL generation through associations | Emilio Tagua | 2009-06-10 | 2 | -15/+19 |
| | | |||||
* | | Merge commit 'rails/master' | Emilio Tagua | 2009-06-09 | 241 | -881/+1118 |
|\| | |||||
| * | Sanitized the id generated by text_area_tag helper method. ↵ | Stephen Anderson | 2009-06-09 | 2 | -1/+6 |
| | | | | | | | | | | | | text_area_tag('item[description]') should return: <textarea id="item_description" name="item[description]"></textarea> instead of: <textarea id="item[description]" name="item[description]"></textarea> The old id was causing HTML validation failures. Signed-off-by: Michael Koziarski <michael@koziarski.com> |