Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2009-12-25 | 81 | -915/+960 |
|\ | |||||
| * | This code was needed to work around ↵ | Yehuda Katz | 2009-12-24 | 1 | -4/+1 |
| | | | | | | | | http://redmine.ruby-lang.org/issues/show/2494. Since that bug is now closed in Ruby, we can remove it. | ||||
| * | Simplify and improve the performance of output_safety | Yehuda Katz | 2009-12-24 | 1 | -22/+6 |
| | | |||||
| * | Instead of marking raw text in templates as safe, and then putting them ↵ | Yehuda Katz | 2009-12-24 | 2 | -1/+3 |
| | | | | | | | | through String#<< which checks if the String is safe, use safe_concat, which uses the original (internal) String#<< and leaves the safe flag as is. Results in a significant performance improvement. | ||||
| * | Dead code | Yehuda Katz | 2009-12-24 | 1 | -15/+0 |
| | | |||||
| * | Translated strings in the view are assumed html_safe (Closes #3401) | David Heinemeier Hansson | 2009-12-24 | 1 | -1/+1 |
| | | |||||
| * | Stray carrier return | David Heinemeier Hansson | 2009-12-24 | 1 | -1/+0 |
| | | |||||
| * | The new routes shortform now also works for :as | David Heinemeier Hansson | 2009-12-24 | 1 | -1/+1 |
| | | |||||
| * | Merge | David Heinemeier Hansson | 2009-12-24 | 33 | -390/+441 |
| |\ | |||||
| | * | Fix new schema test dependency on Hash#to_xml | Jeremy Kemper | 2009-12-23 | 1 | -0/+1 |
| | | | |||||
| | * | Allow named_routes to be used with root, and with new DSL short-form. | Sam Ruby | 2009-12-23 | 2 | -8/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The real use case it to make all of the following act the same: root 'store#index', :as => 'store' match '/' => 'store#index', :as => 'store' match '/', :to => 'store#index', :as => 'store' The test case provided deviates from this in order to demonstrate all three forms in a single set of test routes. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| | * | Merge remote branch 'origin/master' | Carlhuda | 2009-12-23 | 10 | -79/+51 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application.rb | ||||
| | | * | Fix reference to Application#configuration to use #config | Jeremy Kemper | 2009-12-23 | 1 | -1/+1 |
| | | | | |||||
| | | * | Isolation tests intentionally avoid loading any state (because they're often ↵ | Carlhuda | 2009-12-23 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | testing things that have their own load path semantics that should not be polluted), so rack/test is not yet on the load path. Moving require "rack/test" into the setup means and after boot_rails means that it'll be required after the laod path has been altered to add in the Rails vendor/gems | ||||
| | | * | Routing: fix that route shorthand shouldn't ignore other options. Raise if ↵ | Jeremy Kemper | 2009-12-23 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | | :as option is given to root method since its name is always 'root' | ||||
| | | * | Fix Rack::Lock middleware condition: use *unless* we allow concurrency | Jeremy Kemper | 2009-12-23 | 1 | -1/+1 |
| | | | | |||||
| | | * | Shift more responsibility from application class to its singleton instance. ↵ | Jeremy Kemper | 2009-12-23 | 7 | -87/+56 |
| | | | | | | | | | | | | | | | | Treat instantiation and boot as separate steps. Use app.config rather than app.configuration. | ||||
| | * | | Rackup config.ru from the correct directory | Carlhuda | 2009-12-23 | 1 | -2/+4 |
| | | | | |||||
| | * | | Require active_support/all unless specifically requested to be left out. | Carlhuda | 2009-12-23 | 2 | -0/+10 |
| | | | | |||||
| | * | | Remove the ActionView::Base autoload because it creates crazy circular ↵ | Carlhuda | 2009-12-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | autoload insanity | ||||
| | * | | Finish moving config.frameworks-dependent code to the framework plugin | Carlhuda | 2009-12-23 | 7 | -126/+110 |
| | | | | |||||
| | * | | Make /rails/info/properties work again. Also, the mocked up tests were ↵ | Carlhuda | 2009-12-23 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | passing so we added a test that actually tested this functionality. | ||||
| | * | | Isolation tests intentionally avoid loading any state (because they're often ↵ | Carlhuda | 2009-12-23 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | testing things that have their own load path semantics that should not be polluted), so rack/test is not yet on the load path. Moving require "rack/test" into the setup means and after boot_rails means that it'll be required after the laod path has been altered to add in the Rails vendor/gems | ||||
| | * | | Moving out some framework specific initializers into the framework libraries. | Carlhuda | 2009-12-23 | 8 | -96/+141 |
| | | | | |||||
| | * | | Raise an exception if an initializer is defined without a block | Carlhuda | 2009-12-23 | 2 | -0/+11 |
| | | | | |||||
| | * | | tests pass with requiring the frameworks in rails.rb | Carlhuda | 2009-12-23 | 8 | -118/+123 |
| | |/ | |||||
| | * | Fix bare string Rack response bodies | Jeremy Kemper | 2009-12-23 | 1 | -2/+2 |
| | | | |||||
| | * | Fix ActiveSupport::JSON encoding of control characters [\x00-\x1f] | Dwayne Litzenberger | 2009-12-23 | 2 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to RFC 4627, only the following Unicode code points are allowed unescaped in JSON: unescaped = %x20-21 / %x23-5B / %x5D-10FFFF However, ActiveSupport::JSON did not escape the range %x00-1f. This caused parse errors when trying to decode the resulting output. [#3345 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | Extract Mapping class from monster match method | David Heinemeier Hansson | 2009-12-24 | 2 | -91/+149 |
| |/ | |||||
| * | Require rack-mount 0.3.3 | Joshua Peek | 2009-12-22 | 1 | -1/+1 |
| | | | | | | | | Fixes "Rack-mount boot time is slow as shit" [#3567 state:resolved] | ||||
| * | Merge | David Heinemeier Hansson | 2009-12-22 | 42 | -385/+354 |
| |\ | |||||
| | * | All AMo modules are safe to defer | Joshua Peek | 2009-12-22 | 2 | -23/+20 |
| | | | |||||
| | * | All ARes modules are safe to defer | Joshua Peek | 2009-12-22 | 2 | -10/+11 |
| | | | |||||
| | * | All AM modules are safe to defer | Joshua Peek | 2009-12-22 | 4 | -35/+17 |
| | | | |||||
| | * | Flip deferrable autoload convention | Joshua Peek | 2009-12-22 | 13 | -261/+290 |
| | | | |||||
| | * | All AD modules are "deferrable" | Joshua Peek | 2009-12-22 | 10 | -23/+35 |
| | | | |||||
| | * | Use Rack::Runtime middleware so the reported time includes the entire ↵ | Joshua Peek | 2009-12-22 | 2 | -1/+1 |
| | | | | | | | | | | | | middleware stack | ||||
| | * | Referer and user agent are in Rack::Request | Joshua Peek | 2009-12-22 | 1 | -1/+1 |
| | | | |||||
| | * | AD::StatusCodes support is now part of rack | Joshua Peek | 2009-12-22 | 9 | -46/+12 |
| | | | |||||
| | * | Float on rack/master in preparation for rack 1.1 gem release | Joshua Peek | 2009-12-22 | 2 | -2/+2 |
| | | | |||||
| | * | Make ActionMailer::Base inherit from AbstractController::Base | José Valim | 2009-12-22 | 8 | -81/+63 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | | Dont auto require rubygems, move dep on rack-test to Gemfile | David Heinemeier Hansson | 2009-12-22 | 2 | -3/+3 |
| | | | |||||
| * | | Dont encourage __FILE__ bullshit | David Heinemeier Hansson | 2009-12-22 | 1 | -2/+2 |
| |/ | |||||
* | | Merge branch 'master' of git://github.com/rails/rails | José Valim | 2009-12-22 | 35 | -294/+508 |
|\| | |||||
| * | Add test for root | David Heinemeier Hansson | 2009-12-21 | 1 | -0/+9 |
| | | |||||
| * | Merge branch 'master' of github.com:rails/rails | Joshua Peek | 2009-12-21 | 21 | -248/+249 |
| |\ | | | | | | | | | | | | | | | | Conflicts: railties/test/initializer/initialize_i18n_test.rb railties/test/initializer/path_test.rb | ||||
| | * | Blog -> Blog::Application. Leave the toplevel module up for grabs. | Jeremy Kemper | 2009-12-21 | 5 | -35/+37 |
| | | | |||||
| | * | Fix the documentation for root :to. It should use a fully qualified ↵ | David Heinemeier Hansson | 2009-12-21 | 1 | -1/+1 |
| | | | | | | | | | | | | controller#action syntax (Closes #3606) | ||||
| | * | Fix ActionMailer. The fact that ActionMailer::Base does not inherit from ↵ | Carlhuda | 2009-12-21 | 1 | -0/+3 |
| | | | | | | | | | | | | AbstractController::Base is either a bug or we need to re-evaluate the requirements of the mixins. | ||||
| | * | Dont need to specify password_confirmation, that happens automatically | David Heinemeier Hansson | 2009-12-21 | 1 | -1/+1 |
| | | |