aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit 'mainstream/master'Pratik Naik2008-12-07107-2240/+2438
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb actionpack/lib/action_controller/base.rb actionpack/lib/action_controller/mime_type.rb railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/html/caching_with_rails.html railties/doc/guides/html/command_line.html railties/doc/guides/html/configuring.html railties/doc/guides/html/creating_plugins.html railties/doc/guides/html/finders.html railties/doc/guides/html/routing_outside_in.html railties/doc/guides/source/activerecord_validations_callbacks.txt railties/doc/guides/source/caching_with_rails.txt railties/doc/guides/source/command_line.txt railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt railties/doc/guides/source/creating_plugins/controllers.txt railties/doc/guides/source/creating_plugins/core_ext.txt railties/doc/guides/source/creating_plugins/helpers.txt railties/doc/guides/source/creating_plugins/index.txt railties/doc/guides/source/creating_plugins/migration_generator.txt railties/doc/guides/source/creating_plugins/models.txt railties/doc/guides/source/creating_plugins/odds_and_ends.txt railties/doc/guides/source/creating_plugins/routes.txt railties/doc/guides/source/finders.txt railties/doc/guides/source/routing_outside_in.txt railties/doc/guides/source/testing_rails_applications.txt
| * Added support for plugins to be installed as submodules with the application ↵Peter Cooper2008-12-061-1/+7
| | | | | | | | | | | | templater. [#1517 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Silence server backtrace in rescue templates and log files. Also remove some ↵Joshua Peek2008-12-051-2/+4
| | | | | | | | noise from missing template errors.
| * Remove config dir from the load pathJeremy Kemper2008-12-031-2/+1
| |
| * Add :env and :sudo options to TemplateRunner#rake.Pratik Naik2008-12-041-3/+6
| | | | | | | | | | | | | | Examples : rake("gems:install", :sudo => true) rake("db:migrate", :env => "production")
| * Make TemplateRunner#generate accept any number of argumentsPratik Naik2008-12-031-3/+3
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-0339-747/+855
| |\
| | * 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>
| | * 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-012-0/+12
| | | | | | | | | | | | config.middleware.use Rack::Cache
| | * handle missing dependecies in gem loadingMatt Jones2008-12-016-0/+95
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| | * 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
| | |
| | * 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
| |/
| * Load app initializers by path relative to Rails.rootJeremy Kemper2008-11-291-1/+1
| |
| * 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
| | |
| | * Revert "Super lazy load view paths in development mode (no indexing or ↵David Heinemeier Hansson2008-11-291-4/+3
| | | | | | | | | | | | | | | | | | 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.
| * | Reinstate "Super lazy load view paths in development mode (no indexing or ↵Joshua Peek2008-11-281-3/+4
| | | | | | | | | | | | 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-271-4/+3
| |/ | | | | | | | | | | 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-271-3/+4
| |\
| | * Super lazy load view paths in development mode (no indexing or caching at ↵Joshua Peek2008-11-261-3/+4
| | | | | | | | | | | | 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
| |/
| * Let all plugins not just engines have a config/routes.rb fileDavid Heinemeier Hansson2008-11-261-1/+2
| |
| * 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 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-253-13/+25
| |\
| | * Move debugger into middlewareJoshua Peek2008-11-253-12/+23
| | |
| | * don't try to require vendored rack in script/serverJoshua Peek2008-11-251-1/+2
| | |
| * | Explicitly require AS::Deprecation for the SecretKeyGenerator. Bring in ↵Jeremy Kemper2008-11-242-1/+3
| |/ | | | | | | ActiveSupport::TestCase for its tests.
| * Skip fcgi dispatcher tests if fcgi lib isn't availableJeremy Kemper2008-11-241-3/+4
| |
| * Explicitly require action_view to bring in its i18n load pathJeremy Kemper2008-11-241-0/+3
| |
| * Really remove components.Jeremy Kemper2008-11-243-7/+1
| |