aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into savepointsHongli Lai (Phusion)2008-12-03603-17183/+13060
|\ | | | | | | | | | | Conflicts: activerecord/lib/active_record/fixtures.rb activerecord/test/cases/defaults_test.rb
| * Add Memoizable#flush_cache to clear the cache of a specific method [#1505 ↵Joshua Peek2008-12-032-16/+38
| | | | | | | | state:resolved]
| * Validate template extensions [#1187 state:resolved]Joshua Peek2008-12-032-8/+7
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-0364-768/+1027
| |\
| | * Removed deprecated register_template_extensionJoshua Peek2008-12-021-6/+0
| | |
| | * Remove docs for TemplateRunner#gem as the behaviour has been changedPratik Naik2008-12-021-13/+0
| | |
| | * Add "-m/--template" option to Rails generator to apply template to generated ↵Jeremy McAnally2008-12-029-0/+467
| | | | | | | | | | | | | | | | | | application. Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Make new_record? an alias of new? in ActiveResource to fix problem with ↵miloops2008-12-021-0/+1
| | | | | | | | | | | | | | | | | | route generation in forms. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Github comments are an excellent way to perform community code review -- ↵David Heinemeier Hansson2008-12-011-2/+2
| | | | | | | | | | | | keep it up!
| | * establish mysql connection before dropping databaseAliaksey Kandratsenka2008-12-011-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#63 state:committed]
| | * Manually load the DB config rather than firing the whole initializer [Gerrit ↵Michael Koziarski2008-12-012-4/+15
| | | | | | | | | | | | Kaiser]
| | * Add internal middleware stack to DispatcherJoshua Peek2008-12-015-0/+63
| | | | | | | | | | | | config.middleware.use Rack::Cache
| | * handle missing dependecies in gem loadingMatt Jones2008-12-016-0/+95
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * Making the IP Spoofing check in AbstractRequest#remote_ip configurable.Darren Boyd2008-12-014-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain groups of web proxies do not set these values properly. Notably, proxies for cell phones, which often do not set the remote IP information correctly (not surprisingly, since the clients do not have an IP address). Allowing this to be configurable makes it possible for developers to choose to ignore this simple spoofing check, when a significant amount of their traffic would result in false positives anyway. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1200 state:committed]
| | * Add :having option to find, to use in combination with grouped finds. Also ↵miloops2008-12-0110-7/+37
| | | | | | | | | | | | | | | | | | | | | added to has_many and has_and_belongs_to_many associations. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1028 state:committed]
| | * Removed extra 'as' in :joins clause for habtm preloadingFoliosus2008-12-011-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1405 state:committed]
| | * Ensure ActionMailer doesn't blow up when a two argument proc is set for the ↵Tekin Suleyman2008-12-013-1/+56
| | | | | | | | | | | | | | | | | | | | | asset host Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1394 state:committed]
| | * allow options to be passed to email address auto generationAndrew Kaspick2008-12-012-5/+10
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1418 state:committed]
| | * opps, inner_app is in the wrong conditionalJoshua Peek2008-12-011-1/+1
| | |
| | * Generate rackup dispatcher with rails:update:generate_dispatchersJoshua Peek2008-12-015-26/+20
| | |
| | * fix failing railties testJoshua Peek2008-12-011-2/+2
| | |
| | * Switch FCGI handler over to RackJoshua Peek2008-12-011-1/+1
| | |
| | * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-304-35/+36
| | |\
| | * | Extracted the process scripts (inspector, reaper, spawner) into the plugin ↵David Heinemeier Hansson2008-11-3010-510/+5
| | | | | | | | | | | | | | | | irs_process_scripts [DHH]
| | * | Changed Rails.root to return a Pathname object (allows for ↵David Heinemeier Hansson2008-11-303-5/+5
| | | | | | | | | | | | | | | | Rails.root.join("app", "controllers") => "#{RAILS_ROOT}/app/controllers") [#1482]
| | * | Add restart notice where missingDavid Heinemeier Hansson2008-11-302-0/+4
| | | |
| | * | Even more polish of the default configration files and split off the session ↵David Heinemeier Hansson2008-11-303-29/+26
| | | | | | | | | | | | | | | | store configuration into its own file
| | * | Cleanup the app generatorDavid Heinemeier Hansson2008-11-301-142/+196
| | | |
| | * | Say it brieflyDavid Heinemeier Hansson2008-11-301-6/+2
| | | |
| | * | More organization based on priorityDavid Heinemeier Hansson2008-11-302-16/+15
| | | |
| | * | Me loves me some whitespaceDavid Heinemeier Hansson2008-11-301-1/+6
| | | |
| | * | Cleanup other examples and wordingDavid Heinemeier Hansson2008-11-301-9/+5
| | | |
| | * | Rails::Configuration never had more details. Stop lying about itDavid Heinemeier Hansson2008-11-301-1/+0
| | | |
| | * | Its no longer common to run Rails in environments where you cant set the ↵David Heinemeier Hansson2008-11-301-4/+0
| | | | | | | | | | | | | | | | environment to be the production one. Dont need a notice telling about the ENV var that prominently any more
| * | | Require rack/utils explicitlyJeremy Kemper2008-12-031-0/+2
| | | |
| * | | Unnecessary CGI requireJeremy Kemper2008-12-031-1/+0
| | | |
| * | | Fix failsafe response path. [#1504 state:committed]Jeremy Kemper2008-12-031-1/+1
| | |/ | |/|
| * | Simplify Request#pathJeremy Kemper2008-11-301-5/+3
| | |
| * | Simplify REMOTE_ADDR parsingJeremy Kemper2008-11-301-1/+1
| | |
| * | Deprecated formatted_polymorphic_urlJeremy Kemper2008-11-303-29/+32
| |/
| * Load app initializers by path relative to Rails.rootJeremy Kemper2008-11-291-1/+1
| |
| * 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