github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-31 01:08:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,121 Commits 34 Branches 105 Tags
34b94de8b87d7c32a1fdba72eb1f02296f31cffe
Commit Graph

5121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Kemper
34b94de8b8 Improve Action View test coverage. Closes #7241, #7243, #7244. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6967 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-08 04:00:15 +00:00
Jeremy Kemper
9b444fe73b Rollback [6961] which breaks SQLite tests. Reference #7345. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6965 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-08 01:40:05 +00:00
Jeremy Kemper
72401dcbd6 Quote db path so SQLite AR tests work on Windows. Closes #5278 [mislav@nippur.irb.hr] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6964 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-08 01:37:13 +00:00
Jeremy Kemper
bab8966064 Test periodically_call_remote with frequency. Closes #7244 [Rich Collins] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6963 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-08 01:30:47 +00:00
Jeremy Kemper
271404e8b9 Register alternative template engines using ActionMailer::Base.register_template_extension('haml'). Closes #7534. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6962 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-07 23:42:47 +00:00
Jeremy Kemper
869a172a8a Migrations: raise if a column is duplicated. Closes #7345. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6961 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-07 23:25:50 +00:00
Jeremy Kemper
c7df5bd6ac More nested polymorphic url helper fixes. Closes #6432, references #8601. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6960 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-07 21:35:01 +00:00
Jeremy Kemper
5600776e30 Fix incomplete work from [6951] that was hidden by test stubs. Closes #6432. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6959 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-06 16:52:37 +00:00
Jeremy Kemper
5dd3db8615 Resources: url_for([parent, child]) generates /parents/1/children/2 for the nested resource. Likewise with the other simply helpful methods like form_for and link_to. Closes #6432. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6951 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 19:10:59 +00:00
Rick Olson
b83efadb32 Assume html format when rendering partials in RJS. #8076 [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6950 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 16:51:49 +00:00
Rick Olson
ed1ed9ed97 revert [6924] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6946 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 14:09:15 +00:00
Jeremy Kemper
319107ae40 Migrations: report the number of rows affected when calling insert, update, delete, etc. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6945 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 08:21:55 +00:00
Jeremy Kemper
8d6d450303 Fixtures: correctly delete and insert fixtures in a single transaction. Closes #8553. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6944 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 04:37:05 +00:00
Jeremy Kemper
255b913637 Fix typo. Closes #7504 [aurelianito] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6943 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 04:32:08 +00:00
Jeremy Kemper
7709df5f17 Don't double-escape url_for in views. Closes #8144. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6942 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 04:29:19 +00:00
Jeremy Kemper
f80468c3c3 Remove junk form helper test. Closes #8416 [eric_oconnell] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6941 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 04:09:39 +00:00
Jeremy Kemper
673daeabca Fixtures: people(:technomancy, :josh) returns both fixtures. Closes #7880. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6940 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 03:47:02 +00:00
Jeremy Kemper
d6785e9674 Fix indentation in model generator migration template. Closes #8577 [Josh Peek] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6939 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 03:34:56 +00:00
Jeremy Kemper
6204a52fac Sexy migrations for the session_migration generator. Closes #8561. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6938 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-05 02:42:57 +00:00
Jeremy Kemper
1b32a305df Add Date#since, ago, beginning_of_day, and end_of_day. Date + seconds works now. Closes #8575. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6937 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-04 22:00:53 +00:00
Jeremy Kemper
4685fa0c20 String#to_time overflows to DateTime. Add String#to_datetime. Closes #8572. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6935 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-04 19:49:13 +00:00
Jeremy Kemper
601778e38a Date.yesterday and .tomorrow. Closes #8571. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6934 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-04 18:14:42 +00:00
Jeremy Kemper
1312259294 Readable Date and DateTime#inspect. Closes #8570. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6933 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-04 17:49:43 +00:00
Thomas Fuchs
3cfb894bac Allow JSON-style values for the :with option of observe_field. Closes #8557 [kommen] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6930 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-03 14:27:43 +00:00
Tobias Lütke
13058b0188 Enhance assert_difference to accept arrays of strings which are then evaled 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6926 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-01 20:20:19 +00:00
Rick Olson
4d1c87a069 pass the prefix_options to the instantiated record when using find without a specific id. Closes #8544 [alloy] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6925 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-01 17:14:14 +00:00
David Heinemeier Hansson
846e858727 Added proper handling of arrays (closes #8537) [hasmanyjosh] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6924 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-01 06:48:09 +00:00
Jeremy Kemper
83ce4c59be Remove RAILS_ROOT from backtrace paths. Closes #8540. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6923 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-01 05:18:21 +00:00
Jeremy Kemper
8ce5479307 Routing: map.resource :logo routes to LogosController so the controller may be reused for multiple nestings or namespaces. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6922 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-01 04:40:30 +00:00
Jeremy Kemper
507da04a14 Move common DateTime calculations to Date. Closes #8536. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6921 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-01 04:03:46 +00:00
Jeremy Kemper
a6a1dc967c render :partial recognizes Active Record associations as Arrays. Closes #8538. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6920 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-01 03:53:39 +00:00
Jeremy Kemper
b05fc40b5d Calculations support non-numeric foreign keys. Closes #8154. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6919 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-06-01 03:26:51 +00:00
Jeremy Kemper
6435ecc68a Missing helper load error shouldn't shadow load errors within the helper itself. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6914 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-31 19:07:57 +00:00
Jeremy Kemper
d0360a4d5c Base.inspect handles Base itself and abstract_class? Don't use #<Foo ...> since that notation's typically used for instances of a class, not the class itself. Closes #8490 [deepblue] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6913 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-31 17:31:33 +00:00
Jeremy Kemper
8158455ded Fix an edge case with find with a list of ids, limit, and offset. Closes #8437. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6912 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-31 17:15:56 +00:00
David Heinemeier Hansson
0cf79f07b0 Fixed that DateHelper#date_select should set the day to the 1st when its a hidden option and the month is visible (or invalid dates can be produced) [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6911 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-31 16:38:36 +00:00
David Heinemeier Hansson
ff5c7c8c40 Added Date#change (like Time#change) [DHH] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6910 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-31 16:37:09 +00:00
Jeremy Kemper
1edd21bb02 with_scope is protected. Closes #8524. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6909 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-30 21:40:55 +00:00
Jeremy Kemper
962b12fb9f Fix imprecise duration addition test. Closes #8516 [Geoff Buesing] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6906 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-30 07:21:14 +00:00
Jeremy Kemper
ff6d2aae0a Quickref for association methods. Closes #7723. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-30 07:05:14 +00:00
Jeremy Kemper
1f802968c5 Calculations: return nil average instead of 0 when there are no rows to average. Closes #8298. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6904 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-30 06:57:04 +00:00
Jeremy Kemper
b2681cca2e acts_as_nested_set: direct_children is sorted correctly. Closes #4761. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6903 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-30 06:34:25 +00:00
Jeremy Kemper
b7d2dae6dc DateTime#to_time converts to Time unless out of range. Date#to_datetime and Date#to_s(:rfc822). Closes #8512. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6902 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-30 06:24:32 +00:00
Jeremy Kemper
6503da6991 Time durations use since instead of + for accuracy. Closes #8513. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6901 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-30 06:21:08 +00:00
Jeremy Kemper
a1c88273f4 Skip databases that couldn't be created. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6900 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-30 05:39:49 +00:00
Jeremy Kemper
186ac4cdaa Don't choke on nested helpers. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6899 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-29 22:06:13 +00:00
Jeremy Kemper
34a5a896e1 Missed svn add from [6897]. References #8393. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6898 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-29 21:49:37 +00:00
Jeremy Kemper
3cf2c63eee Console reload! runs to_prepare callbacks also. Closes #8393. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6897 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-29 21:44:35 +00:00
Jeremy Kemper
af98d883b9 Raise an exception if both attr_protected and attr_accessible are declared. Closes #8507, #6004. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6896 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-29 20:35:46 +00:00
Rick Olson
32b307bc32 fix test cases to match new json output. Closes #8371 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6894 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-05-29 09:42:13 +00:00