github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,473 Commits 34 Branches 105 Tags
810d0ade2bb04464fbbd5497b4cc092ed80fc53a
Commit Graph

1055 Commits

Author SHA1 Message Date
David Heinemeier Hansson
014fdde93a Attempt at fixing the preparation_callbacks, nzkoz will double check 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5794 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-27 00:43:27 +00:00
Michael Koziarski
c6d47806bf Allow config.to_prepare to work, make the dispatcher safe to 're require'. [Koz, Nicholas Seckar] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5792 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-26 23:56:00 +00:00
Rick Olson
29ec023add Fix scaffold_resource generator so it respects the --pretend argument when creating the routes file. Closes #6852 [fearoffish] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5790 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-26 19:39:30 +00:00
Rick Olson
c6b4c8d240 Fix Webrick Daemon dispatching bug regarding a bad current working directory. Closes #4899 [Rick Olson] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5784 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-25 09:01:41 +00:00
Michael Koziarski
507445862e Reapply plugin load path changes from [5720] 
Closes #6842
Closes #6851


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5738 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-18 20:27:05 +00:00
Michael Koziarski
23c2768421 Revert [5720] 
Reopens #6581
Reopens #6842


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5722 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-16 02:22:23 +00:00
Michael Koziarski
39686e5370 Make config.plugins affect $LOAD_PATH and remove duplication from $LOAD_PATH [James Adam] 
Closes #6581
Closes #6842



git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5720 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-15 23:41:58 +00:00
Jeremy Kemper
a50fc11583 Rewrap scaffold_resource USAGE so it displays nicely on most terminals. Closes #6801 [Paul Smith] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5707 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-08 22:47:46 +00:00
Jeremy Kemper
4c9000d51d Changelog for bungled commit. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5692 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-06 22:10:09 +00:00
Jeremy Kemper
ee384b8981 Missed commit from [5686]. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5691 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-06 22:08:59 +00:00
David Heinemeier Hansson
56267474da Fixed script/process/spawner to work properly with Mongrel including in -r (daemonize mode) [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5672 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-04 03:50:57 +00:00
David Heinemeier Hansson
2794f4164f Dropped the idea of automatically routing :format for the vanilla routes -- that will be a treat for map.resources. Deprecated the name route root as it'll be used as a shortcut for map.connect '' in Rails 2.0 (Rails 1.2). Added map.root as an alias for map.connect '' (Rails 2.0) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5671 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-04 00:12:00 +00:00
David Heinemeier Hansson
db459370f8 Documentation for generators (closes #6671) [topfunky] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-03 16:53:16 +00:00
David Heinemeier Hansson
1ac4470da5 Wups 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5662 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-01 23:02:48 +00:00
David Heinemeier Hansson
2e2bf2d149 If only life was that simple (it didnt help) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5658 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-01 05:56:51 +00:00
David Heinemeier Hansson
e8eb743ba6 Replace the elaborate reloading connection checking scheme, just fix the Ruby-based MySQL adapter, ye? 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5656 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-01 05:37:56 +00:00
David Heinemeier Hansson
9040f40682 Added one-letter aliases for the three default environments to script/console, so script/console p will load the production environment (t for test, d for development) [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5655 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-01 00:08:33 +00:00
David Heinemeier Hansson
cd2be89b7c Refactored to use same option setup 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5654 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-30 22:22:02 +00:00
David Heinemeier Hansson
8dca6586de Fixed that script/server running against Mongrel should tail the proper log regardless of the environment [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5652 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-30 21:45:31 +00:00
Michael Koziarski
02dfb239fa merge 5639 to trunk 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5640 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-27 05:19:15 +00:00
David Heinemeier Hansson
0a86122a24 Only reload connections in development mode that supports (and requires that) -- in other words, only do it for SQLite (closes #6687, #6700) [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5637 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-26 22:10:55 +00:00
David Heinemeier Hansson
2d1169ad16 redirect_to is the one place where _url should be used, not _path [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5633 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-26 04:42:13 +00:00
David Heinemeier Hansson
619e5c29f4 Tried delaying database disconnect until after dependency resolution (references #6687, #6700) [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5627 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-25 19:59:00 +00:00
Nicholas Seckar
cf248eae1f Update initializer to load Rails::VERSION as soon as possible. Closes #6698. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5624 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-25 17:11:46 +00:00
David Heinemeier Hansson
f15d52fc4a Added text/csv as a default mime type and included example on how to make your own in config/environment.rb [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5620 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-23 17:25:52 +00:00
David Heinemeier Hansson
a02dbe0a3d Added ActiveRecord::Base.clear_active_connections! in development mode so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5618 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-23 05:16:46 +00:00
David Heinemeier Hansson
83dd1d8a03 Actually require the gem found 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5616 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-23 04:49:07 +00:00
David Heinemeier Hansson
958e9a36a9 Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 will give you 1.1.6.4520 if available [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-23 04:40:48 +00:00
David Heinemeier Hansson
3805c12a80 Dont include the mime.yml anyway, Mongrel will just ship with more defaults instead 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5612 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-23 02:41:59 +00:00
Thomas Fuchs
f5f3cdb1b6 Make sure .morph makes it in 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5602 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-20 23:45:16 +00:00
Jeremy Kemper
3fc4771996 Test session table pluralization. Closes #6459. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5585 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-20 04:17:48 +00:00
Thomas Fuchs
de6ffba806 Update trunk w/ latest Prototype and script.aculo.us 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5581 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-19 23:01:32 +00:00
David Heinemeier Hansson
44de099efe Restore windows compatibility 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5577 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-19 22:17:26 +00:00
David Heinemeier Hansson
f24ed3bf6d Starting, not started yet 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5576 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-19 21:54:48 +00:00
David Heinemeier Hansson
ee8121fc76 Make script/server work with -d and -e on Mongrel 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5575 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-19 21:52:14 +00:00
Rick Olson
5999fdd3f3 Use custom mime file for script/server mongrel if config/mime.yml exists. Pass --mime=other/path for a custom mime file. [Rick Olson] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5572 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-19 21:12:22 +00:00
Rick Olson
ca2d704c75 Add custom mime type file for mongrel. config/mime.yml is added with generated apps from the rails command. [Rick Olson] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5571 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-19 21:01:25 +00:00
David Heinemeier Hansson
bc6f0d2f30 Scaffold resource should have both a layout and a stylesheet [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5565 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-19 16:57:33 +00:00
Thomas Fuchs
bc76044fde Update Prototype in trunk to [5550] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5551 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-17 23:52:54 +00:00
Tobias Lütke
a64c6af57c Make sure that exceptions which are thrown outside of the user code try their best to be handeled in ApplicationController#rescue_action. 
This allos handling of ActionController::RoutingError which were previously always handeled by ActionController#Base


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5516 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-13 20:23:00 +00:00
Jeremy Kemper
a303a168ac Oracle: to increase performance, prefetch 100 rows and enable similar cursor sharing. Both are configurable in database.yml. Closes #6607. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5509 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-13 07:36:52 +00:00
Jeremy Kemper
45fd631e5e Rails::VERSION::STRING on trunk is 1.2.0 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5507 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-13 07:13:41 +00:00
Jeremy Kemper
277c1a803e Rails::VERSION::STRING should always be available. Closes #6244. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5506 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-13 06:23:58 +00:00
Sam Stephenson
c192bdfc74 Update to Prototype 1.5.0_rc2 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5497 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-12 03:44:35 +00:00
Jamis Buck
da3eae4922 Add grep-based fallback to reaper, so it can work in pidless setups (again) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5488 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-11 22:46:00 +00:00
Jeremy Kemper
2a92995d2a Only wrap request processing with our USR1 signal handler so FastCGI can trap it and raise an exception while waiting for connections. Idle processes exit immediately rather than waiting for another request; active processes gracefully exit when the request is finished. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5485 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-11 08:08:53 +00:00
Jeremy Kemper
2e0b33f277 Nested class gets qualified names. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5484 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-11 07:52:23 +00:00
Nicholas Seckar
d3100ec855 Alter prior change to use require_dependency instead of require_or_load. Causes ApplicationController to be reloaded again. Closes #6587. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5471 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-09 18:22:44 +00:00
Jeremy Kemper
089d3ec318 Rake: use absolute paths to load lib and vendor tasks so they may be run outside of RAILS_ROOT. Closes #6584. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5469 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-09 07:56:10 +00:00
Nicholas Seckar
fbccde9475 Update changelog 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5455 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-07 19:52:54 +00:00