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
23,009 Commits 34 Branches 105 Tags
09e431aa893bb1d08705381e2bfcd006de22a70e
Commit Graph

6016 Commits

Author SHA1 Message Date
Jon Leighton
09e431aa89 Merge pull request #1318 from TheEmpty/master 
Resolve issue #534
 2011-05-26 12:54:38 -07:00
Mohammad Typaldos
ded7e35cb0 Removes a now needless test - via Github 2011-05-26 12:17:20 -07:00
John Mileham
043b624390 Don't merge base opts into includes when serializing ARs 
Conflicts:

	activerecord/lib/active_record/serialization.rb
 2011-05-26 11:40:57 -04:00
John Mileham
294e2a8c2e Failing test - JSON serialization shouldn't merge base opts into include opts. 2011-05-26 11:24:25 -04:00
Mohammad El-Abid
ec44763f03 Removes the restriction on primary key when joining in a habtm && test that it was properly removed 2011-05-26 00:54:51 -04:00
Xavier Noria
b7921f50e7 Merge branch 'master' of github.com:rails/rails 2011-05-25 22:49:23 +02:00
Xavier Noria
00e1d0832e Merge branch 'master' of git://github.com/lifo/docrails 
Conflicts:
	actionmailer/lib/action_mailer/base.rb
	activesupport/lib/active_support/core_ext/kernel/requires.rb
 2011-05-25 22:48:47 +02:00
Aaron Patterson
6b436c23a9 Merge pull request #1285 from joshk/remove_active_record_deprecations 
removed deprecated methods, and related tests, from ActiveRecord
 2011-05-25 13:48:35 -07:00
Franck Verrot
64d977359d Add the MIT-LICENSE to the Active Record gemspec 2011-05-25 15:32:04 +02:00
Franck Verrot
b2db8740ea Fix the AR::Base#inspect method [closes #1294] 2011-05-25 13:54:38 +02:00
Franck Verrot
bf159aa5fc Test AR::Base#inspect on an allocated object not yet initialized 2011-05-25 13:53:51 +02:00
Arun Agrawal
5d89675099 Database.rake file fixed for load_generators 2011-05-25 13:57:44 +05:30
Josh Kalderimis
542114e1d8 removed deprecated methods, and related tests, from ActiveRecord 2011-05-25 02:29:32 +02:00
José Valim
52e01fc59d Everyone receives app as argument for consistency. 2011-05-25 01:37:55 +02:00
Jon Leighton
c69111ba5f Fix infinite recursion where a lazy default scope references a scope. Fixes #1264. 2011-05-25 00:08:14 +01:00
Jon Leighton
ce37f747cd Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope 
Ignore :includes on through associations
 2011-05-24 15:34:28 -07:00
Jon Leighton
a000ff7a50 Ensure that the surrounding code in Relation#to_a respects the default_scope (as well as having Relation#arel respect the default scope). Fixes #1233. 2011-05-24 23:29:44 +01:00
Andrew White
f1f1ab77df Failing tests for #1233. 2011-05-24 23:25:21 +01:00
José Valim
36991f195b Merge pull request #1274 from vijaydev/rake-packagetask-warning-fix 
Fixes for Rake::GemPackageTask deprecation warnings from Rake 0.9.0
 2011-05-24 12:14:30 -07:00
Aaron Patterson
176883a906 rescue record invalid exceptions and return false from the save method. fixes #796 2011-05-24 11:22:11 -07:00
Aaron Patterson
559d809609 add tests surrounding behavior of save and save! for associations that have validation errors 2011-05-24 11:21:24 -07:00
Vijay Dev
79e9a2983a fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0 2011-05-24 23:39:24 +05:30
Aaron Patterson
964338777d adding a test for create! with invalid associations 2011-05-24 11:06:36 -07:00
Aaron Patterson
0df8830160 do not bother with assert_nothing_raised, the test will fail and we get a better trace without it 2011-05-24 11:05:36 -07:00
Joey Butler
e106dbf039 Add failing test case for issue 796 2011-05-24 10:59:37 -07:00
Karunakar (Ruby)
bfb9f758ae changed http://api.rubyonrails.com to http://api.rubyonrails.org in readme files 2011-05-24 21:12:01 +05:30
dmathieu
79dc275b8d properly reference yml alias nodes 
as per the last version of the yml specifications : http://www.yaml.org/spec/1.2/spec.html#* alias//
 2011-05-24 11:18:28 +02:00
Andrew White
d8bd19f6ab Ignore :includes on through associations 2011-05-24 07:21:32 +01:00
Sebastian Martinez
0034b7822d Remove extra white spaces on ActiveRecord docs. 2011-05-23 20:58:25 -03:00
Sebastian Martinez
05f29ca2c9 Remove extra white-space on some exception messages. 2011-05-23 20:53:18 -03:00
Aaron Patterson
5ec23b95ba fixing 1.8 support for new fixture tests 2011-05-23 15:06:13 -07:00
Aaron Patterson
1716da0720 removing CSV fixture support 2011-05-23 15:06:12 -07:00
Aaron Patterson
081b36c6ce fixture file will validate fixture format 2011-05-23 15:06:12 -07:00
Aaron Patterson
5278af3d8e return an empty array for empty yaml files 2011-05-23 15:06:12 -07:00
Aaron Patterson
74c5f65bfb use top level file constant for join, etc 2011-05-23 15:06:12 -07:00
Aaron Patterson
ad3f0eec75 adding AR::Fixtures::File class to wrap a fixture file 2011-05-23 15:06:12 -07:00
Josh Kalderimis
eff5d9aed4 Removed AS core_ext/kernel/requires as it's not used and is bad practice. 2011-05-23 15:31:33 +02:00
José Valim
a8b2a895b7 Merge pull request #1228 from fcheung/db_time_fix2 
Take into account time spent in AR even if a redirect occurs or if it is after the render
 2011-05-23 03:11:15 -07:00
Frederick Cheung
8a722e0912 Take into account time spent in AR even if a redirect occurs or if it is after the render 2011-05-23 10:58:43 +01:00
Aaron Patterson
78172987cf Merge pull request #1184 from gnufied/master 
Fixes connection_not established error while running db:schema:dump
 2011-05-23 00:21:13 -07:00
David Heinemeier Hansson
ba3ea9c90b Revert "Take into account time spent in AR even if a redirect occurs or if it is after the render" because it's causing test failures about missing db_during_render. 
This reverts commit 60b55baca9.
 2011-05-22 18:10:52 -05:00
Jon Leighton
d7a910e31e Fix problem with loading polymorphic associations which have been defined in an abstract superclass. Fixes #552. 2011-05-22 21:25:02 +01:00
Frederick Cheung
60b55baca9 Take into account time spent in AR even if a redirect occurs or if it is after the render 2011-05-22 19:49:31 +01:00
Aditya Sanghi
e4f6e6ad2d has_many :dependent => :restrict raises an exception but is not documented appropriately. has_one also has :dependent => :restrict but is not documented at all. 2011-05-22 04:47:04 -07:00
Guillermo Iguaran
6e5419a0b1 Adding pluralize_table_names change to CHANGELOG 2011-05-21 22:16:34 -05:00
David Heinemeier Hansson
82857adc56 Bump versions for rc1 2011-05-21 20:56:52 -05:00
Xavier Noria
eb0257944e Merge pull request #1180 from Karunakar/documentation_change 
Documentation Error Fixed for ticket #839
 2011-05-21 10:39:28 -07:00
Santiago Pastorino
da8469fa7d Merge pull request #1187 from thedarkone/polymorphic-class-fix 
Handle polymorphic_type NOT NULL columns
 2011-05-21 09:43:42 -07:00
Andrew White
09daaaa1e0 Add support for passing mass assignment roles to dynamic finders. Closes #1170. 2011-05-21 16:33:54 +01:00
thedarkone
1c614bcb0f Handle polymorphic_type NOT NULL-able columns as well. 2011-05-21 15:18:09 +02:00