aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Extract named_helper module_eval so it's easier to overrideJeremy Kemper2008-11-291-2/+6
|
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-2922-215/+386
|\
| * Make sure #compute_public_path caching allows to return different results ↵Sven Fuchs2008-11-291-1/+1
| | | | | | | | | | | | for different given sources [#1471 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Merge branch 'master' of git@github.com:rails/railsJoshua Peek2008-11-294-8/+16
| |\
| | * Enhanced Rails.root to take parameters that'll be join with the root, like ↵David Heinemeier Hansson2008-11-293-6/+14
| | | | | | | | | | | | Rails.root('app', 'controllers') => File.join(Rails.root, 'app', 'controllers') [#1482 state:committed] (Damian Janowski)
| | * Include Rack in the server noiseDavid Heinemeier Hansson2008-11-291-2/+2
| | |
| | * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-290-0/+0
| | |\
| | * | Revert "Super lazy load view paths in development mode (no indexing or ↵David Heinemeier Hansson2008-11-2911-92/+74
| | | | | | | | | | | | | | | | | | | | | | | | caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading. This reverts commit 4d910b033379727e5e7355590c50c72fc75e56db.
| * | | fixed template recompile issue with previous commit and add some better ↵Joshua Peek2008-11-285-11/+87
| | | | | | | | | | | | | | | | tests so we can make sure it doesn't happen again
| * | | Reinstate "Super lazy load view paths in development mode (no indexing or ↵Joshua Peek2008-11-2811-74/+92
| | |/ | |/| | | | | | | caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading."
| * | Revert "Super lazy load view paths in development mode (no indexing or ↵David Heinemeier Hansson2008-11-2711-92/+74
| |/ | | | | | | | | | | caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading. This reverts commit 4d910b033379727e5e7355590c50c72fc75e56db.
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-2717-82/+135
| |\
| | * Super lazy load view paths in development mode (no indexing or caching at ↵Joshua Peek2008-11-2611-74/+92
| | | | | | | | | | | | all). Switch layout finders to use view path api to take advantage of cache.
| * | Added view path support for engines [DHH]David Heinemeier Hansson2008-11-276-133/+152
| | |
| * | Added the option to declare an asset_host as an object that responds to call ↵David Heinemeier Hansson2008-11-273-3/+53
| | | | | | | | | | | | (see http://github.com/dhh/asset-hosting-with-minimum-ssl for an example) [DHH]
* | | Turn on debugger autoevalJeremy Kemper2008-11-291-0/+1
| |/ |/|
* | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-2614-22/+129
|\|
| * Let all plugins not just engines have a config/routes.rb fileDavid Heinemeier Hansson2008-11-261-1/+2
| |
| * Fix routing test and add changelog note about draw no longer clearing the ↵David Heinemeier Hansson2008-11-262-0/+3
| | | | | | | | route set
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-266-3/+42
| |\
| * | Added that config/routes.rb files in engine plugins are automatically loaded ↵David Heinemeier Hansson2008-11-2610-6/+58
| | | | | | | | | | | | (and reloaded when they change in dev mode) [DHH]
| * | Added support for multiple routes files and made draw not clear the map so ↵David Heinemeier Hansson2008-11-262-16/+67
| | | | | | | | | | | | they can be additive
* | | Ruby 1.9 compat: no Unicode normalization support yetJeremy Kemper2008-11-263-3/+27
| | |
* | | Ruby 1.9 compat: CGI#escape_skipping_slashesJeremy Kemper2008-11-261-5/+14
| | |
* | | MiniTest::Unit#method_name alias for Test::Unit compatJeremy Kemper2008-11-261-0/+1
| | |
* | | Ensure Test::Unit::Assertions is availableJeremy Kemper2008-11-261-0/+1
| |/ |/|
* | Ensure hash conditions on referenced tables are considered when eager ↵Paul2008-11-262-2/+19
| | | | | | | | | | | | loading with limit/offset. [#1404 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Don't re-require 'rexml/document'Pratik Naik2008-11-261-1/+1
| |
* | Added ActiveSupport::OrderedHash#each_key and ↵Christoffer Sawicki2008-11-263-0/+22
|/ | | | | | ActiveSupport::OrderedHash#each_value [#1410 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Added app/[models|controllers|helpers] to the load path for plugins that has ↵David Heinemeier Hansson2008-11-265-16/+54
| | | | an app directory (go engines ;)) [DHH]
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-269-14/+95
|\
| * Added optimal formatted routes to rails, deprecating the formatted_* ↵Aaron Batalion2008-11-269-14/+95
| | | | | | | | | | | | methods, and reducing routes creation by 50% [#1359 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | No need to have #generate and #generate_extras per instanceJeremy Kemper2008-11-261-5/+10
|/
* Simpler and clearer to just explicitly require the JSON encodersJeremy Kemper2008-11-261-9/+15
|
* Autoload ActiveSupport::XmlMiniJeremy Kemper2008-11-262-1/+1
|
* Require as little of REXML as possible to apply the entity_expansion_limit fixJeremy Kemper2008-11-261-24/+29
|
* Lazy-require CGI for Object#to_queryJeremy Kemper2008-11-261-2/+1
|
* Rename use_transactional_fixtures? so it doesn't collide with the ↵Jeremy Kemper2008-11-251-4/+4
| | | | superclass_delegating_accessor's query method
* Extract XmlMini. Namespace FileLike extension.Jeremy Kemper2008-11-252-128/+125
|
* Rescue OpenSSL::Cipher::CipherError or OpenSSL::CipherError depending on ↵Jeremy Kemper2008-11-251-3/+4
| | | | which is present
* Remove XmlSimple dependenciesJeremy Kemper2008-11-251-5/+4
|
* Unbundled XmlSimpleJeremy Kemper2008-11-252-1027/+0
|
* Extract XmlMini from XmlSimple. [#1474 state:committed]Joseph Holsten2008-11-251-21/+106
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-11-2555-4244/+161
|\
| * Move debugger into middlewareJoshua Peek2008-11-253-12/+23
| |
| * Add a MessageEncryptor, just like MessageVerifier but using symmetric key ↵Michael Koziarski2008-11-254-1/+117
| | | | | | | | | | | | | | | | encryption. The use of encryption prevents people from seeing any potentially secret values you've used. It also supports and encrypt_and_sign model to prevent people from tampering with the bits and creating random junk that gets fed to A motivated coder could use this to add an :encrypt=>true option to the cookie store.
| * don't try to require vendored rack in script/serverJoshua Peek2008-11-251-1/+2
| |
| * Depend on rack 0.4.0 instead of vendoring itJoshua Peek2008-11-2543-4226/+4
| |
| * Deprecate assert_validJoshua Peek2008-11-252-2/+3
| |
| * Ensure ActionView will be available to ActionMailer if ActionController is ↵Joshua Peek2008-11-253-1/+4
| | | | | | | | not loaded