github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-31 09:18:17 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,265 Commits 34 Branches 105 Tags
github30
Commit Graph

10265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Kemper
953214bd23 Remove unrelated render :yaml changes. References #4185. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5697 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-06 23:16:25 +00:00
Jeremy Kemper
189ecafa53 Update changelog to reflect application/json content type. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5696 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-06 23:10:58 +00:00
Jeremy Kemper
91d99e2f53 More thorough JSON tests. Use application/json by default, per rfc4627. References #4185. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5695 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-06 23:06:38 +00:00
Jeremy Kemper
42596543dc respond_to recognizes JSON. render :json => @person.to_json automatically sets the content type and takes a :callback option to specify a client-side function to call using the rendered JSON as an argument. References #4185. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5694 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-06 22:27:08 +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
Jeremy Kemper
50c98942a5 Don't do introspection queries during locking tests [Michael Schoen] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5689 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-06 20:28:26 +00:00
Jeremy Kemper
07423bed4b Bob's raining patches: fixes date_helper bugs and usability issues. References #3811. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5685 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-06 19:15:24 +00:00
Tobias Lütke
cdad2d41e1 Consolidated different create and create! versions to call through to the base class with scope. This fixes inconsistencies, especially related to protected attribtues. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5684 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-06 00:13:31 +00:00
Jeremy Kemper
8dea60b0c3 find supports :lock with :include. Check whether your database allows SELECT ... FOR UPDATE with outer joins before using. Closes #6764. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5682 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-05 22:07:55 +00:00
Jeremy Kemper
eb300f8428 AssociationCollection#any? takes a block [Michael Schoen] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-05 21:49:36 +00:00
Jeremy Kemper
7370e54cc4 *_path instance methods. Check for missing/invalid site uri. http_mock response takes message arg, extracts numeric code. Tests log to test/debug.log 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5680 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-05 19:12:51 +00:00
Tobias Lütke
0ee0c1b2aa Add AssociationCollection#create! to be consistent with AssociationCollection#create when dealing with a foreign key that is a protected attribute 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5677 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-05 17:55:44 +00:00
David Heinemeier Hansson
22f095be23 Added counter optimization for AssociationCollection#any? so person.friends.any? won't actually load the full association if we have the count in a cheaper form [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5676 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-05 03:26:56 +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
Kent Sibilev
abe8fa73a9 Added support for decimal types. Closes #6676. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5670 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-03 20:30:34 +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
0297b31b82 Fixed Array#to_xml when it contains a series of hashes (each piece would get its own XML declaration) (closes #6610) [thkarcher/cyu] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5668 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-03 16:47:53 +00:00
David Heinemeier Hansson
7611fa6d46 Added Request#format to return the format used for the request as a mime type. If no format is specified, the first Request#accepts type is used. This means you can stop using respond_to for anything else than responses [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5664 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-02 23:07:04 +00:00
David Heinemeier Hansson
5410f2cb74 Added the option for extension aliases to mime type registration [DHH] Refactored default mime types to use the extension framework instead of just declaring themselves verbosely 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5663 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-02 22:48:20 +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
Jeremy Kemper
8ffb22056c Subclasses of an abstract class work with single-table inheritance. Closes #5704. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5660 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-12-01 21:24:47 +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
033a5148eb Premature commit 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5653 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-30 22:01:58 +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
Jeremy Kemper
ec75642e13 Merge [5645] from 1.2. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5646 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-28 23:41:04 +00:00
Jeremy Kemper
13e1d295d6 @response.redirect_url works with 201 Created responses: just return headers['Location'] rather than checking the response status. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5643 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-28 23:25:00 +00:00
Michael Koziarski
f6e85e4ec6 Merge [5641] to Trunk 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5642 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-27 23:56:27 +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
Jeremy Kemper
4887e53bf9 Use Location rather than location header. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5635 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-26 05:35:53 +00:00
David Heinemeier Hansson
093c725732 Fix that redirects should set "Location" header, not "location", and remove dead CGI.redirect 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5634 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-26 05:04:57 +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
Jeremy Kemper
ba1db2de63 uses_component_template_root looks at caller[0] which turns up the deprecation method rather than the controller. Use caller[1] instead. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5631 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-26 01:24:10 +00:00
Jeremy Kemper
1d564d97c5 strip_tags passes through blank args such as nil or "". Closes #6702, references #2229. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5629 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-26 01:00:10 +00:00
David Heinemeier Hansson
eacca8d7e6 Added Time#to_s(:time) which will just return H:M, like 17:44 [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5628 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-25 23:56:28 +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
David Heinemeier Hansson
396b3f2bef Dont set default charset if the response is sending a file. Closes #6689 [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5626 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-25 19:29:10 +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
Tobias Lütke
ad62d461e8 Added CSV to Mime::SET so that respond_to csv will work 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5623 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-24 16:35:00 +00:00
David Heinemeier Hansson
7c7d58937b Fixed that HEAD should return the proper Content-Length header (that is, actually use @body.size, not just 0) [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5622 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-23 23:52:25 +00:00
David Heinemeier Hansson
efd0bdd9ea * Added GET-masquarading for HEAD, so request.method will return :get even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you dont even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5621 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2006-11-23 23:24:47 +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