aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/railsCarlhuda2010-02-251-1/+1
|
* WIP: Remove the global routerCarlhuda2010-02-2526-263/+342
|
* Application detection should also allow dots in the path.José Valim2010-02-261-1/+1
|
* Bump to Bundler 0.9.8. Remark on RubyGems 1.3.6 fix.Jeremy Kemper2010-02-253-5/+4
|
* Remove doubled periodJeremy Kemper2010-02-251-1/+1
|
* Update plugin tasks dirs deprecation warningJeremy Kemper2010-02-251-2/+2
|
* Bump i18n for new public I18n.normalize_keysJeremy Kemper2010-02-252-2/+2
|
* Accept array of attributes as arg also, like 2.3Jeremy Kemper2010-02-252-11/+17
|
* metaclass deprecated in 2.3.6Jeremy Kemper2010-02-253-22/+0
|
* Fix dangling klass referenceJeremy Kemper2010-02-251-1/+1
|
* Missed singleton_classJeremy Kemper2010-02-251-0/+13
|
* Fix test on 1.8.8. Broken by inherited hook now running before Class.new block.Jeremy Kemper2010-02-251-5/+6
|
* load_path is expecting a String in the application.rb generatorThomas R. Koll2010-02-251-1/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Use Object#singleton_class instead of #metaclass. Prefer Ruby's choice.Jeremy Kemper2010-02-2514-35/+44
|
* Commented metaprogramming turned out to be noisier not clearerJeremy Kemper2010-02-252-12/+12
|
* let the rails command recurse upwards looking for script/rails, and exec ↵David Heinemeier Hansson2010-02-251-9/+28
| | | | ruby on it for better portability [Xavier Noria] (Closes #4008)
* Merge branch 'master' of github.com:rails/railsDavid Heinemeier Hansson2010-02-250-0/+0
|\
| * add time_separator for minutes only if minutes aren't hiddenSantiago Pastorino2010-02-242-1/+42
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | add time_separator for minutes only if minutes aren't hiddenSantiago Pastorino2010-02-252-1/+42
|/ | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Renamed LocalizedCache to DetailsCache.José Valim2010-02-248-57/+60
|
* Use render instead render_to_body.José Valim2010-02-242-2/+2
|
* Cleanup render callstack and make render(:json => {}, :status => 401) work ↵José Valim2010-02-242-23/+24
| | | | again.
* Remove ActionController::Base.resources_path_namesCarl Lerche2010-02-243-18/+18
|
* Remove references to ActionDispatch::Routing::Routes in favor of ↵Carl Lerche2010-02-245-8/+8
| | | | Rails.appication.routes.
* Remove the renderer option from the hash.José Valim2010-02-241-1/+1
|
* Fix render :file => "#{Rails.root}/public/404.html", :status => :not_found. ↵Yehuda Katz2010-02-233-1/+11
| | | | Closes #8994
* Woops, forgot to actually add active_support/core_ext/file/path.rbCarlhuda2010-02-233-0/+7
|
* Revert "Fix test load paths for those not using bundler"Carlhuda2010-02-2322-93/+50
| | | | | | This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818. This commit broke tests. You cannot have a file called "bundler" on the load path.
* Makes send_file work again by deferring to Rack::Sendfile. Carlhuda2010-02-237-72/+80
| | | | | | | | | | * Add the Rack::Sendfile middleware * Make the header to use configurable via config.action_dispatch.x_sendfile_header (default to "X-Sendfile"). * Add Railties tests to confirm that these work * Remove the :stream, :buffer_size, and :x_senfile default options to send_file * Change the log subscriber to always say "Sent file" * Add deprecation warnings for options that are now no-ops Note that servers can configure this by setting X-Sendfile-Type. Hosting companies and those creating packages of servers specially designed for Rails applications are encouraged to specify this header so that this can work transparently.
* Make AD::Response correctly handle bodies that respond_to?(:to_path) as per ↵Carlhuda2010-02-231-0/+12
| | | | the Rack spec
* Fix streaming by having it create a File object, which can be handled by ↵Carlhuda2010-02-235-18/+22
| | | | Rack servers as appropriate
* avoid @lock_value not initialized warningSantiago Pastorino2010-02-221-1/+1
|
* avoid @transaction_joinable not initialized warningSantiago Pastorino2010-02-221-1/+1
|
* avoid active not initialized warningSantiago Pastorino2010-02-221-0/+1
|
* Rename erubis_implementation to erb_implementation.José Valim2010-02-221-3/+3
|
* Include missing modules.José Valim2010-02-223-3/+4
|
* Adding options to register observers and interceptors through ↵Mikel Lindsaar2010-02-223-1/+42
| | | | | | ActionMailer::Base.register_observer and ActionMailer::Base.register_interceptor. These hook into Mail.register_interceptor and Mail.register_observer. Also bumped Mail requirement to 2.1.3 Signed-off-by: José Valim <jose.valim@gmail.com>
* don't set @expected.date in generated mailer testDavid Chelimsky2010-02-221-1/+0
| | | | | Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com> Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix AMo isolated tests.José Valim2010-02-221-1/+1
|
* Use ActionDispatch::Routing everywhereMartin Schürrer2010-02-2124-59/+64
|
* TypoMartin Schürrer2010-02-211-1/+1
|
* Add a tests which ensures filtered_parameters does not raise an error for a ↵José Valim2010-02-211-1/+1
| | | | mixed array [#3928 status:resolved]
* Store compiled parameter filters so we don't have to compile them in each ↵José Valim2010-02-211-25/+40
| | | | request.
* Make install appear on rake -T.José Valim2010-02-211-0/+1
|
* Also check if application is a valid constant in rake rails:update.José Valim2010-02-211-5/+11
|
* Add a test for default_url_options in AM.José Valim2010-02-211-0/+11
|
* Add validators reflection so you can do 'Person.validators' and ↵Prem Sichanugrist2010-02-215-3/+73
| | | | | | 'Person.validators_on(:name)'. Signed-off-by: José Valim <jose.valim@gmail.com>
* Require persisted? in ActiveModel::Lint and remove new_record? and ↵José Valim2010-02-2120-125/+112
| | | | destroyed? methods. ActionPack does not care if the resource is new or if it was destroyed, it cares only if it's persisted somewhere or not.
* Add to_key and to_param methods to ActiveModel::Conversion.José Valim2010-02-215-27/+70
|
* AMo #key is now #to_key and CI is probably happysnusnu2010-02-208-29/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obviously #key is a too common name to be included in the AMo interface, #to_key fits better and also relates nicely to #to_param. Thx wycats, koz and josevalim for the suggestion. AR's #to_key implementation now takes customized primary keys into account and there's a testcase for that too. The #to_param AMo lint makes no assumptions on how the method behaves in the presence of composite primary keys. It leaves the decision wether to provide a default, or to raise and thus signal to the user that implementing this method will need his special attention, up to the implementers. All AMo cares about is that #to_param is implemented and returns nil in case of a new_record?. The default CompliantObject used in lint_test provides a naive default implementation that just joins all key attributes with '-'. The #to_key default implementation in lint_test's CompliantObject now returns [id] instead of [1]. This was previously causing the (wrong) tests I added for AR's #to_key implementation to pass. The #to_key tests added with this patch should be better. The CI failure was caused by my lack of knowledge about the test:isolated task. The tests for the record_identifier code in action_controller are using fake non AR models and I forgot to stub the #to_key method over there. This issue didn't come up when running the test task, only test:isolated revealed it. This patch fixes that. All tests pass isolated or not, well, apart from one previously unpended test in action_controller that is unrelated to my patch.