aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-08-03103-600/+743
|\
| * Treat ActionMailer template_root as a view path set internally to avoid ↵Joshua Peek2008-07-311-4/+15
| | | | | | | | inheritance and dupping issues
| * Ensure mailer view path is loaded when it's assigned. Path#[] raises if it ↵Jeremy Kemper2008-07-312-1/+3
| | | | | | | | isn't loaded.
| * List available actions in UnknownAction exception messageJeremy Kemper2008-07-311-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-07-3174-51/+82
| |\
| | * Use "/usr/bin/env ruby" instead of "/usr/local/bin/ruby"Tarmo Tänav2008-07-316-16/+16
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * Fix file permissionsTarmo Tänav2008-07-3163-0/+0
| | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| | * validates_uniqueness_of uses database case sensitivity support instead of ↵Tarmo Tänav2008-07-313-27/+23
| | | | | | | | | | | | | | | | | | using ruby Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * In javascript helpers option[:type] = :synchronous should work as described ↵miloops2008-07-312-1/+7
| | | | | | | | | | | | | | | | | | in docs. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Fixed negative default integer parsing for Postgresql 8.3.3Tarmo Tänav2008-07-311-2/+2
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Turn cache_classes on by default [#645 state:resolved]Joshua Peek2008-07-312-1/+3
| | |
| | * Cast value to string in validates_uniqueness_of if the column is of text typeTarmo Tänav2008-07-311-1/+7
| | | | | | | | | | | | | | | | | | This fixes an error for postgresql where "text_column = 100" fails in version 8.3 Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Fixed test_joins_with_namespaced_model_should_use_correct_type for postgresqlTarmo Tänav2008-07-311-1/+1
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Fix HasManyThroughAssociationsTest tests. [#733 state:resolved]miloops2008-07-311-3/+6
| | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Raise UnknownAttributeError when unknown attributes are supplied via mass ↵Pratik Naik2008-07-312-1/+17
| | | | | | | | | | | | assignment
| | * Ensure dbconsole includes the -p parameter to mysql as intendedMichael Koziarski2008-07-311-0/+2
| | |
| * | load_application_classes requires files relative to the load path and ↵Jeremy Kemper2008-07-311-2/+3
| |/ | | | | | | without .rb extension, including .rb files in subdirectories
| * Performance: grouping helpers should use yield instead of block as argument. ↵miloops2008-07-301-5/+5
| | | | | | | | [#723 state:resolved]
| * Initializer requires ERB explicitly instead of assuming Action Pack loaded ↵José Valim2008-07-301-0/+1
| | | | | | | | it. [#722 state:resolved]
| * Prototype helpers should generate Element.insert instead of Insertion.new, ↵miloops2008-07-303-22/+28
| | | | | | | | which has been deprecated in Prototype 1.6.
| * Initializer skips prepare_dispatcher if Action Controller isn't in use. ↵José Valim2008-07-301-0/+1
| | | | | | | | [#721 state:resolved]
| * Reapply 'cab168ac' because it was accidentally patched over in '10d9fe4b'Joshua Peek2008-07-291-1/+1
| |
| * Updated NumberHelper: Full i18n support (except number_to_phone), ↵Clemens Kofler2008-07-294-96/+219
| | | | | | | | | | | | consolidated API (almost all methods now support :precision, :delimiter and :separator). Added deprecation notices for old API. Added tests for new options [#716 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Remove incomplete non-blocking logger functionalityMichael Koziarski2008-07-292-14/+1
| |
| * Guard the logger's internal buffer to prevent major breakage on genuinely ↵Michael Koziarski2008-07-291-6/+14
| | | | | | | | threaded environments
| * Fix that label_tag doesn't take a symbol for a name. [#719 state:resolved]Jan De Poorter2008-07-292-1/+7
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Once is enough, mmkJeremy Kemper2008-07-281-2/+2
| |
| * Don't rememoize if already frozenJeremy Kemper2008-07-281-4/+3
| |
| * Remove send! usage, relic of reverted 1.9 behaviorJeremy Kemper2008-07-281-1/+1
| |
| * MacRuby: BasicObject unavailableJeremy Kemper2008-07-281-1/+1
| |
| * Added back ActionController::Base.allow_concurrency flag and moved lock down ↵Joshua Peek2008-07-283-12/+23
| | | | | | | | to controller processing.
| * Prepare Route#generate and Route#recognize early. Also refactor segments a ↵Joshua Peek2008-07-288-298/+259
| | | | | | | | bit to try to make immutable.
| * Routing whitespace cleanupJoshua Peek2008-07-2810-89/+84
| |
* | escaped otherwise autoquoted wordsXavier Noria2008-08-031-34/+34
| |
* | say explicitily that after_* callbacks run within the save/destroy transactionXavier Noria2008-08-031-1/+1
| |
* | revised conventions, fixed an example, escaped autolinked words, and other ↵Xavier Noria2008-07-291-36/+41
| | | | | | | | assorted details in request.rb
* | escaping otherwise autolinked "resource(s)" in resource.rb and assorted ↵Xavier Noria2008-07-281-30/+30
| | | | | | | | minor touches
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 05:42:26 +0000