aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-2581-915/+960
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-2235-294/+508
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-21114-857/+1820
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-1199-1592/+1833
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-0277-295/+439
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-12-0117-476/+545
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2520-142/+154
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2414-255/+177
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-232-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-2388-1537/+907
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-11216-1447/+1689
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-11-02447-7603/+6360
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/rails/railsJosé Valim2009-10-1642-90/+137
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | Model.scoped now returns a relation if invoked without any argumentsPratik Naik2009-12-262-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example : posts = Post.scoped posts.size # Fires "select count(*) from posts" and returns the count posts.each {|p| puts p.name } # Fires "select * from posts" and loads post objects
* | | | | | | | | | | | | | | | | | | The controller key shouldnt be part of the mapping if its not usedDavid Heinemeier Hansson2009-12-251-2/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fix testsDavid Heinemeier Hansson2009-12-251-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 19:02:09 +0000