aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Refactor multiple parts logic and move Utils to PartContainer.José Valim2009-12-254-31/+24
|
* adv_attr_accessors in ActionMailer are not sent to the views, use the mailer ↵José Valim2009-12-256-42/+79
| | | | object if you need to access the subject, recipients, from, etc.
* Move i18n to Gemfile.José Valim2009-12-2515-1345/+5
|
* Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-2581-915/+960
|\
| * This code was needed to work around ↵Yehuda Katz2009-12-241-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_safetyYehuda Katz2009-12-241-22/+6
| |
| * Instead of marking raw text in templates as safe, and then putting them ↵Yehuda Katz2009-12-242-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 codeYehuda Katz2009-12-241-15/+0
| |
| * Translated strings in the view are assumed html_safe (Closes #3401)David Heinemeier Hansson2009-12-241-1/+1
| |
| * Stray carrier returnDavid Heinemeier Hansson2009-12-241-1/+0
| |
| * The new routes shortform now also works for :asDavid Heinemeier Hansson2009-12-241-1/+1
| |
| * MergeDavid Heinemeier Hansson2009-12-2433-390/+441
| |\
| | * Fix new schema test dependency on Hash#to_xmlJeremy Kemper2009-12-231-0/+1
| | |
| | * Allow named_routes to be used with root, and with new DSL short-form.Sam Ruby2009-12-232-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'Carlhuda2009-12-2310-79/+51
| | |\ | | | | | | | | | | | | | | | | Conflicts: railties/lib/rails/application.rb
| | | * Fix reference to Application#configuration to use #configJeremy Kemper2009-12-231-1/+1
| | | |
| | | * Isolation tests intentionally avoid loading any state (because they're often ↵Carlhuda2009-12-231-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 Kemper2009-12-232-4/+8
| | | | | | | | | | | | | | | | :as option is given to root method since its name is always 'root'
| | | * Fix Rack::Lock middleware condition: use *unless* we allow concurrencyJeremy Kemper2009-12-231-1/+1
| | | |
| | | * Shift more responsibility from application class to its singleton instance. ↵Jeremy Kemper2009-12-237-87/+56
| | | | | | | | | | | | | | | | Treat instantiation and boot as separate steps. Use app.config rather than app.configuration.
| | * | Rackup config.ru from the correct directoryCarlhuda2009-12-231-2/+4
| | | |
| | * | Require active_support/all unless specifically requested to be left out.Carlhuda2009-12-232-0/+10
| | | |
| | * | Remove the ActionView::Base autoload because it creates crazy circular ↵Carlhuda2009-12-231-1/+1
| | | | | | | | | | | | | | | | autoload insanity
| | * | Finish moving config.frameworks-dependent code to the framework pluginCarlhuda2009-12-237-126/+110
| | | |
| | * | Make /rails/info/properties work again. Also, the mocked up tests were ↵Carlhuda2009-12-232-1/+6
| | | | | | | | | | | | | | | | passing so we added a test that actually tested this functionality.
| | * | Isolation tests intentionally avoid loading any state (because they're often ↵Carlhuda2009-12-231-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.Carlhuda2009-12-238-96/+141
| | | |
| | * | Raise an exception if an initializer is defined without a blockCarlhuda2009-12-232-0/+11
| | | |
| | * | tests pass with requiring the frameworks in rails.rbCarlhuda2009-12-238-118/+123
| | |/
| | * Fix bare string Rack response bodiesJeremy Kemper2009-12-231-2/+2
| | |
| | * Fix ActiveSupport::JSON encoding of control characters [\x00-\x1f]Dwayne Litzenberger2009-12-232-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 methodDavid Heinemeier Hansson2009-12-242-91/+149
| |/
| * Require rack-mount 0.3.3Joshua Peek2009-12-221-1/+1
| | | | | | | | Fixes "Rack-mount boot time is slow as shit" [#3567 state:resolved]
| * MergeDavid Heinemeier Hansson2009-12-2242-385/+354
| |\
| | * All AMo modules are safe to deferJoshua Peek2009-12-222-23/+20
| | |
| | * All ARes modules are safe to deferJoshua Peek2009-12-222-10/+11
| | |
| | * All AM modules are safe to deferJoshua Peek2009-12-224-35/+17
| | |
| | * Flip deferrable autoload conventionJoshua Peek2009-12-2213-261/+290
| | |
| | * All AD modules are "deferrable"Joshua Peek2009-12-2210-23/+35
| | |
| | * Use Rack::Runtime middleware so the reported time includes the entire ↵Joshua Peek2009-12-222-1/+1
| | | | | | | | | | | | middleware stack
| | * Referer and user agent are in Rack::RequestJoshua Peek2009-12-221-1/+1
| | |
| | * AD::StatusCodes support is now part of rackJoshua Peek2009-12-229-46/+12
| | |
| | * Float on rack/master in preparation for rack 1.1 gem releaseJoshua Peek2009-12-222-2/+2
| | |
| | * Make ActionMailer::Base inherit from AbstractController::BaseJosé Valim2009-12-228-81/+63
| | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
| * | Dont auto require rubygems, move dep on rack-test to GemfileDavid Heinemeier Hansson2009-12-222-3/+3
| | |
| * | Dont encourage __FILE__ bullshitDavid Heinemeier Hansson2009-12-221-2/+2
| |/
* | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-2235-294/+508
|\|
| * Add test for rootDavid Heinemeier Hansson2009-12-211-0/+9
| |
| * Merge branch 'master' of github.com:rails/railsJoshua Peek2009-12-2121-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 Kemper2009-12-215-35/+37
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 17:55:45 +0000