aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* escaping otherwise autolinked "scopes" in named_scope.rb (we can now assume ↵Xavier Noria2008-07-281-9/+9
| | | | rdoc is v2.1)
* convention revision and typosXavier Noria2008-07-281-6/+6
|
* The :conditions for calculations are not explained in the intro, there is no ↵Evan Farrar2008-07-281-2/+2
| | | | intro. This must have been copy/pasted from active_record/base.rb so link there instead.
* Merge commit 'mainstream/master'Pratik Naik2008-07-2814-42/+42
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/response.rb actionpack/lib/action_controller/test_case.rb actionpack/lib/action_controller/url_rewriter.rb activerecord/lib/active_record/associations.rb activesupport/lib/active_support/core_ext/time/conversions.rb railties/doc/guides/creating_plugins/acts_as_yaffle.txt railties/doc/guides/creating_plugins/creating_plugins.txt railties/doc/guides/creating_plugins/migration_generator.txt railties/doc/guides/creating_plugins/odds_and_ends.txt railties/doc/guides/creating_plugins/preparation.txt railties/doc/guides/creating_plugins/string_to_squawk.txt railties/doc/guides/creating_plugins/view_helper.txt railties/doc/guides/securing_rails_applications/creating_records_directly_from_form_parameters.txt railties/doc/guides/testing_rails_applications/testing_rails_applications.txt
| * Merge docrails changesPratik Naik2008-07-2852-179/+3179
| |
* | Merge commit 'mainstream/master'Pratik Naik2008-07-28196-2929/+8845
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/cookies.rb actionpack/lib/action_controller/streaming.rb actionpack/lib/action_controller/test_case.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/helpers/date_helper.rb actionpack/lib/action_view/helpers/debug_helper.rb actionpack/lib/action_view/helpers/form_options_helper.rb actionpack/lib/action_view/helpers/javascript_helper.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/validations.rb activeresource/README activesupport/lib/active_support/core_ext/hash/reverse_merge.rb activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/data_timezone_info.rb activesupport/lib/active_support/vendor/tzinfo-0.3.9/tzinfo/timezone.rb railties/doc/guides/actionview/helpers.markdown railties/doc/guides/actionview/partials.markdown railties/doc/guides/activerecord/basics.markdown
| * Refactored TextHelper#truncate, highlight, excerpt, word_wrap and auto_link ↵Clemens Kofler2008-07-273-68/+191
| | | | | | | | | | | | to accept options hash [#705 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * error_message_on takes an options hash instead of ordered parameters [#704 ↵Clemens Kofler2008-07-273-40/+58
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Revert "Ensure adapater specific code is loaded on ↵Joshua Peek2008-07-271-1/+0
| | | | | | | | | | | | ActiveRecord::Base.establish_connection" This reverts commit 8b858782fa693e89a47fc3dd5ae38d842ede6d04.
| * Make observers define #after_find in the model only if needed.George Ogata2008-07-262-2/+33
| | | | | | | | | | [#676 state:resolved] Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * ActionController::Base.relative_url_root falls back to ↵Joshua Peek2008-07-241-1/+6
| | | | | | | | ENV['RAILS_RELATIVE_URL_ROOT']
| * Check for ActionMailer and ActionController before attempting to eager load ↵Sam Granieri2008-07-242-3/+22
| | | | | | | | | | | | their view paths Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * AbstractRequest.relative_url_root is no longer automatically configured by a ↵Joshua Peek2008-07-2411-219/+161
| | | | | | | | HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root
| * Added config.dependency_loading to enable or disable the dependency loader ↵Joshua Peek2008-07-243-22/+95
| | | | | | | | after initialization
| * Fixed bc5896e, and added test case for the caching bug it originally introduced.Joshua Peek2008-07-234-6/+13
| |
| * Revert 'bc5896e'Joshua Peek2008-07-232-8/+4
| |
| * Load view path cache after plugins and gems.Joshua Peek2008-07-232-6/+25
| |
| * Just file?Joshua Peek2008-07-231-1/+1
| |
| * Ensure NamedScope#any? uses COUNT query wherever possible. [#680 state:resolved]Jan De Poorter2008-07-232-1/+31
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Extract ActiveSupport::TypedArray class to ensure an array is all of the ↵Joshua Peek2008-07-225-33/+91
| | | | | | | | same type [#673 state:resolved]
| * Memoize ActionView::Base pick_template and find_partial_path for rendering ↵Joshua Peek2008-07-225-17/+26
| | | | | | | | duration
| * Improved Memoizable test coverage and added support for multiple argumentsJoshua Peek2008-07-223-61/+165
| |
| * Ensure adapater specific code is loaded on ↵Joshua Peek2008-07-211-0/+1
| | | | | | | | ActiveRecord::Base.establish_connection
| * Make script/plugin work with svn+ssh urls. [#662 state:resolved]Miles Georgi2008-07-221-1/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Use klass.sti_name to make sure associations take store_full_sti_class into ↵Daniel Guettler2008-07-223-2/+27
| | | | | | | | | | | | account. [#671 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Added configurable eager load paths. Defaults to app/models, ↵Joshua Peek2008-07-212-4/+23
| | | | | | | | app/controllers, and app/helpers
| * Preload application classes. Uses same strategy as phusion passenger.Joshua Peek2008-07-211-0/+11
| |
| * Refactored NumberHelper API to accept arguments as an options hash [#666 ↵Clemens Kofler2008-07-212-33/+93
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Refactor DateHelper and improve test coverage [#665 state:resolved]Clemens Kofler2008-07-212-204/+238
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * If it doesn't overflow, it won't have a .start method. So don't run the ↵Michael Koziarski2008-07-201-1/+1
| | | | | | | | second assertion either
| * Handle the case where 64bit time_t won't overflow.Michael Koziarski2008-07-201-1/+6
| |
| * Refactor ActiveSupport::Dependencies injector so it would be possible to ↵Joshua Peek2008-07-191-104/+114
| | | | | | | | disable it
| * Fixed spelling mistake in deprecation warning [#381 state:resolved]Joshua Peek2008-07-191-4/+6
| |
| * Ensure ActionView::PathSet::Path is not initialized with a precompiled pathJoshua Peek2008-07-192-1/+4
| |
| * Fixed index and auto index for nested fields_for [#327 state:resolved]Kevin Glowacz2008-07-192-10/+136
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Update Prototype to 1.6.0.2 (Patrick Joyce) [#599 status:committed]David Heinemeier Hansson2008-07-193-308/+302
| |
| * Removed handling of string parameter in link_to to have all URL generation ↵Clemens Kofler2008-07-192-44/+60
| | | | | | | | | | | | done by url_for Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Removed unused option from FormHelper#fields_for [#641 state:resolved]Clemens Kofler2008-07-191-4/+0
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Only create a path for ActionMailer template root instead of a path set. ↵Joshua Peek2008-07-192-5/+5
| | | | | | | | Better fix than 7461227
| * Ruby 1.9: Call join on template_root instead of to_sJoshua Peek2008-07-191-3/+2
| |
| * Prefer Mongrel over Thin [#658 state:resolved]Joshua Peek2008-07-191-3/+3
| |
| * Stub out timestamped_migrations in generator testsJoshua Peek2008-07-191-1/+2
| |
| * Dropped SQLite 2 from default test runnerJoshua Peek2008-07-191-1/+1
| |
| * Update uses_mocha in ActionMailer and ActiveResourceJoshua Peek2008-07-192-14/+26
| |
| * Fix some warnings in i18n libJoshua Peek2008-07-192-5/+5
| |
| * Undefine old run methodJoshua Peek2008-07-191-0/+3
| |
| * Ensure checked value is a string when validating case-sensitive uniqueness ↵Tom Ward2008-07-192-1/+10
| | | | | | | | | | | | [#361 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Ruby 1.9: Fixed regexp warning by replacing nested repeat operator + and ? ↵Joshua Peek2008-07-191-1/+1
| | | | | | | | with '*'
| * Ruby 1.9: Strip encoding from ERB source since you can not change character ↵Joshua Peek2008-07-191-2/+5
| | | | | | | | encoding during a method
| * Ruby 1.9: Ensure Memoizable#freeze is only overriden once to avoid an ↵Joshua Peek2008-07-181-14/+12
| | | | | | | | endless loop