aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Fix example using wrong method name"Pratik Naik2008-12-191-3/+3
| | | | This reverts commit 5745b25c9f71d86458f2d1cda65f800cbe4e6733.
* Merge commit 'mainstream/master'Pratik Naik2008-12-1955-1520/+1864
|\
| * Add repair_helper.rb file I forgot in previous commit 8a92cdPratik Naik2008-12-191-0/+50
| |
| * Add a repair_helper to repair changes to the validations inside ↵Murray Steele2008-12-192-160/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | validations_test.rb [#674 state:resolved] Many of the tests in validations_test would add a new validation to models. However, only Topic was being reset with a fairly aggressive clearing of all validations. None of the other models being used however were recieving the same treatment. Now we use repair_validations(Topic) for the whole test case because most test cases use Topic and then the block form of repair_validations(<other_models>) inside any tests that use other models. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Revert "Auto-load template handlers based on unmatched extensions [#1540 ↵Pratik Naik2008-12-192-27/+8
| | | | | | | | | | | | | | | | | | | | state:resolved]" This reverts commit e8c1915416579a3840573ca2c80822d96cb31823. Reasons : - ActionPack tests run very slow - Gem.searcher hanging for long time when extension is nil
| * Cheaper metal cascadeJeremy Kemper2008-12-182-10/+51
| |
| * Use LogTailerJeremy Kemper2008-12-181-1/+1
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-1814-22/+170
| |\
| | * Fix preloading of has_one :through associations on belongs_to [#1507 ↵Matt Jones2008-12-189-6/+52
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | * Free MySQL::Result objects after a call to execute [#1416 state:resolved]Manfred Stienstra2008-12-181-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | No freeing Result objects causes the MySQL driver to free result sets at undefined times, this can lead to erratic performance in your application. Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | * Don't include table_name twiceFrederick Cheung2008-12-181-1/+1
| | |
| | * Ensure :include checks joins when determining if it can preload [#528 ↵Frederick Cheung2008-12-182-10/+98
| | | | | | | | | | | | state:resolved]
| | * Add missing model files so tests can run isolated [#1506 state:resolved]Emilio Tagua2008-12-181-0/+3
| | | | | | | | | | | | Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
| | * Fix preloading of belongs_to with null foreign key generating useless query ↵Frederick Cheung2008-12-182-1/+3
| | | | | | | | | | | | [#1027 state:resolved]
| | * Make exceptions raise from find_by_foo! have a more helpful message [#1567 ↵Frederick Cheung2008-12-181-1/+1
| | | | | | | | | | | | state:resolved]
| * | Ensure rack.multithread is set back to original value. Accept external lock.Jeremy Kemper2008-12-181-10/+8
| | |
| * | No need to dup immutable optionsJeremy Kemper2008-12-181-1/+1
| | |
| * | Be sure to call superJeremy Kemper2008-12-181-0/+1
| | |
| * | Rename Rails::Rack::Logger -> LogTailer. Speed up log mtime checks.Jeremy Kemper2008-12-183-29/+36
| | |
| * | Cheaper log tail time comparisonJeremy Kemper2008-12-181-3/+3
| |/
| * Cleanup dispatch pathJoshua Peek2008-12-184-24/+16
| |
| * Use more generic test env flagJoshua Peek2008-12-183-3/+3
| |
| * Conditionally inject session middleware instead of using session managementJoshua Peek2008-12-185-41/+55
| |
| * Move gaint lock into middlewareJoshua Peek2008-12-186-16/+44
| |
| * Persistent session identifier support for CookieSessionStore and API compat. ↵Lourens Naude2008-12-183-15/+63
| | | | | | | | | | | | with the server side stores [#1591 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Ensure error file is sent with a 'text/html' content type [#1478 state:resolved]Brady Bouchard2008-12-171-1/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * When checking for the wrong routing method, ensure the environment is passed ↵Joshua Peek2008-12-171-1/+1
| | | | | | | | to recognize optimize [#1406 state:resolved]
| * Fix metal testsJoshua Peek2008-12-171-7/+3
| |
| * Make generated Metal bits a pure rack endpoint application (not middleware)Joshua Peek2008-12-173-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of calling super to pass the request on, return a 404. The modified app looks like this: # app/metal/poller.rb class Poller def self.call(env) if env["PATH_INFO"] =~ /^\/poller/ [200, {"Content-Type" => "text/html"}, "Hello, World!"] else [404, {"Content-Type" => "text/html"}, "Not Found"] end end end But you aren't locked in to just Rails: # app/metal/api.rb require 'sinatra' Sinatra::Application.default_options.merge!(:run => false, :env => :production) Api = Sinatra.application unless defined? Api get '/interesting/new/ideas' do 'Hello Sinatra!' end
| * Decorate responses from Rack Middleware and Rails Metal for the purposes of ↵Jesse Newland2008-12-172-10/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration testing. A test for the following Metal: class Poller < Rails::Rack::Metal def call(env) if env["PATH_INFO"] =~ /^\/poller/ [200, {"Content-Type" => "text/plain"}, "Hello World!"] else super end end end might be tested like so: class PollerTest < ActionController::IntegrationTest test "poller returns hello world" do get "/poller" assert_response 200 assert_response :success assert_response :ok assert_equal "Hello World!", response.body end end [#1588 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Remove set_cookie hack from rack response since we dont use cgi sessions anymoreJoshua Peek2008-12-162-5/+3
| |
| * Remove CGI::Session memory leak patchJoshua Peek2008-12-161-5/+0
| |
| * Session Fixation tests have been rolled into the session cookie testsJoshua Peek2008-12-161-84/+0
| |
| * Introduce Rails MetalJoshua Peek2008-12-166-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # app/metal/poller.rb class Poller < Rails::Rack::Metal def call(env) if env["PATH_INFO"] =~ /^\/poller/ [200, {"Content-Type" => "application/json"}, Message.recent.to_json] else super end end end * There is a generator to help you get started `script/generate metal poller` * Also, metal bits can be ran standalone with rackup `rackup app/metal/poller.rb`
| * Update documentation for default_scopeDaniel Luz2008-12-161-2/+2
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * normalize author names in changelogs [#1495 state:committed]Xavier Noria2008-12-166-1078/+1078
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | Merge branch 'master' of git@github.com:lifo/docrailsRyan Bigg2008-12-195-957/+525
|\ \
| * | Fix bad link in Getting Started, rebuild HTMLMike Gunderloy2008-12-175-957/+525
| | |
* | | Better documentation for options_from_collection_for_select.Ryan Bigg2008-12-191-5/+13
|/ /
* | Correct one instance of table syntax.Ryan Bigg2008-12-171-9/+9
| |
* | Fixed up syntax errors.Ryan Bigg2008-12-171-6/+7
| |
* | i18n guide: add note about #t and #l aliasesSven Fuchs2008-12-161-0/+8
| |
* | i18n guide: add screenshots and explain localize methodSven Fuchs2008-12-166-8/+39
| |
* | i18n guide: renumber footnotes (do i really need to do this manually?)Sven Fuchs2008-12-161-10/+8
| |
* | i18n guide: add link to rails-i18n wiki about "How to encode the current ↵Sven Fuchs2008-12-161-1/+1
| | | | | | | | locale in the url"
* | i18n guide: actually use footnotesSven Fuchs2008-12-161-8/+10
| |
* | add quote from wikipedia about I18n and L10nSven Fuchs2008-12-161-1/+6
| |
* | explain exceptions, exception_handler and :raise optionSven Fuchs2008-12-161-9/+38
| |
* | explain changes of pluralization featureSven Fuchs2008-12-161-2/+2
| |
* | explain purpose of interpolation featureSven Fuchs2008-12-161-1/+1
| |