aboutsummaryrefslogtreecommitdiffstats
path: root/railties/environments
Commit message (Collapse)AuthorAgeFilesLines
* Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-131-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| * Vendored gem paths now being loaded if they exist [#2204 state:resolved]John Dzak2009-03-131-0/+1
| | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| * Port fast reloadable templates from rails-dev-boost.thedarkone2009-02-121-0/+1
| |
| * Improve view rendering performance in development mode and reinstate ↵Andrew White2009-02-091-0/+1
|/ | | | | | template recompiling in production [#1909 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Github comments are an excellent way to perform community code review -- ↵David Heinemeier Hansson2008-12-011-2/+2
| | | | keep it up!
* Even more polish of the default configration files and split off the session ↵David Heinemeier Hansson2008-11-302-29/+13
| | | | store configuration into its own file
* More organization based on priorityDavid Heinemeier Hansson2008-11-302-16/+15
|
* 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
* Another piece of markup removed from environment.rbDavid Heinemeier Hansson2008-11-191-1/+1
|
* The docs in environment.rb are not going to be rendered so it doesnt make ↵David Heinemeier Hansson2008-11-191-1/+1
| | | | sense to mark them up
* Added config.i18n settings gatherer to config/environment, auto-loading of ↵David Heinemeier Hansson2008-11-181-0/+5
| | | | all locales in config/locales/*.rb,yml, and config/locales/en.yml as a sample locale [DHH]
* Change usage of defined? to check the rubygems constant existance by a ↵Carlos Paramio2008-11-171-1/+1
| | | | | | rescue block on boot.rb for Ruby 1.9 compatibility Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Rails now requires rubygems 1.3.1 of higher.Pratik Naik2008-11-141-1/+1
|
* Merge docrailsPratik Naik2008-10-161-0/+2
|
* Merge docrailsPratik Naik2008-09-031-1/+2
|
* Inline help text was incorrectly telling user to uncomment line to use ↵Nigel Ramsay2008-09-031-1/+1
| | | | | | | default local time. User should comment the line to use default local time. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#960 state:committed]
* Added config.threadsafe! to toggle allow concurrency settings and disable ↵Joshua Peek2008-08-041-0/+3
| | | | the dependency loader
* Removed config.action_view.cache_template_loading, use config.cache_classes ↵Joshua Peek2008-07-151-1/+0
| | | | instead
* requiring rubygems version 1.1.1David Lowenfels2008-07-151-4/+4
|
* Removed suggestion for turning off partial updates.Joshua Peek2008-05-311-4/+1
|
* Merge docrails.Pratik Naik2008-05-252-5/+5
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Mention partial updates in environment.rb to make it easier for people to ↵Michael Koziarski2008-05-231-0/+3
| | | | opt-in if they know it's safe
* gems should be specified before pluginsDavid Heinemeier Hansson2008-04-011-5/+5
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9199 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added examples for config.gemDavid Heinemeier Hansson2008-04-011-0/+6
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9198 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added that gems can now be plugins if they include rails/init.rb (closes ↵David Heinemeier Hansson2008-03-271-0/+1
| | | | | | #11444) [jbarnette] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9101 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* New applications should use UTC as the default time zoneDavid Heinemeier Hansson2008-03-261-5/+5
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9097 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Correct grammar in config.time_zone description in environment.rbGeoff Buesing2008-03-221-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9078 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Added config.time_zone = 'UTC' as a commented-out option in the default ↵Geoff Buesing2008-03-221-2/+4
| | | | | | environment.rb git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9076 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Update generated comments to reflect the fact that config.frameworks works ↵Michael Koziarski2008-02-171-2/+2
| | | | | | fine with gems now. Closes #11135 [fxn] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8887 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Introduce TemplateFinder to handle view paths and lookups. Closes #10800.Jeremy Kemper2008-01-191-1/+0
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Show that a different cache store can be usedDavid Heinemeier Hansson2008-01-091-0/+3
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8612 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ruby 1.9 compatibility. References #1689.Jeremy Kemper2007-12-171-2/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8431 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Turned on ActionView::Base.cache_template_loading by default in ↵David Heinemeier Hansson2007-12-161-0/+1
| | | | | | config/environments/production.rb to prevent file system stat calls for every template loading to see if it changed (this means that you have to restart the application to see template changes in production mode) [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8416 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Ruby 1.9 compat: File.exists\? -> File.exist\? en masse. References #1689 ↵Jeremy Kemper2007-12-101-0/+1
| | | | | | [Pratik Naik] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8365 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Allow double quotes around RAILS_GEM_VERSION also. Closes #10443 [James Cox]Jeremy Kemper2007-12-101-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8358 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Cleanup documentation a bit and be more specificDavid Heinemeier Hansson2007-11-212-2/+4
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8183 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Cleanup documentation a bit and be more specificDavid Heinemeier Hansson2007-11-211-12/+12
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8182 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* RAILS_GEM_VERSION may be set to any valid gem version specifier. Closes #10057.Jeremy Kemper2007-11-171-2/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Load config/preinitializer.rb, if present, before loading the environment. ↵Jeremy Kemper2007-11-171-1/+12
| | | | | | Closes #9943. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8159 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Kill the whiny_protected_attributes setting and kill the exception raised. ↵David Heinemeier Hansson2007-11-091-3/+0
| | | | | | Instead, just log the mass-assignment misalignment as a debug warning (closes #9966) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Use instead of STDERR in boot.rb. Closes #9988 [thewoolleyman]Jeremy Kemper2007-10-261-3/+3
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8021 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Refactor and test boot.rb. Include tests from and closes #9834.Jeremy Kemper2007-10-231-26/+84
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7998 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Merge [7832] from 1-2-stable: Correct RAILS_GEM_VERSION regexp. Use =version ↵Jeremy Kemper2007-10-181-8/+11
| | | | | | gem requirement instead of ~>version so you don't get surprised by a beta gem in production. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7964 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Fix environment.rb typos. Closes #9859 [fxn, mikong]Jeremy Kemper2007-10-141-2/+2
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7871 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* config.active_record.whiny_protected_attributes. Closes #9816 [henrik]Jeremy Kemper2007-10-081-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7807 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Raise ProtectedAttributeAssignmentError in development and test environments ↵Jeremy Kemper2007-10-071-0/+3
| | | | | | when mass-assigning to an attr_protected attribute. Closes #9699. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7777 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Remind that you need a server restart for initializer defaultsDavid Heinemeier Hansson2007-09-291-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7680 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* [7668] part deux (forgot to add the railties love to the mix)Rick Olson2007-09-281-0/+3
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de