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,033 Commits 34 Branches 105 Tags
2eac4e2e2ff3a740c71268bfb78ebf0b72efc48d
Commit Graph

4880 Commits

Author SHA1 Message Date
Vijay Dev
6e02164e02 styling changes 2011-06-02 01:08:14 +05:30
Ayose
196c8f13bf Edited activerecord/lib/active_record/transactions.rb via GitHub 2011-06-01 12:36:16 -07:00
Ayose
3523144ea4 The URL http://dev.mysql.com/doc/refman/5.0/en/savepoints.html is no longer available 2011-06-01 08:47:06 -07:00
Sebastian Martinez
dfba8f544b Fix font styling on associations.rb 2011-05-26 17:51:20 -03: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
b2db8740ea Fix the AR::Base#inspect method [closes #1294] 2011-05-25 13:54:38 +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
Aaron Patterson
176883a906 rescue record invalid exceptions and return false from the save method. fixes #796 2011-05-24 11:22:11 -07:00
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
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
Bhavin Kamani
e9a2ff8bb7 fix connection not established error while running rake task 
db:schema:dump
 2011-05-21 15:51:07 +05:30
Jon Leighton
d62a39a22b Merge pull request #1162 from guilleiguaran/singularize_individual_table_name 
Singularize individual table name
 2011-05-21 01:30:00 -07:00
Ganesh Kumar
3d789ea4b9 ActionMailer deliver method Documentation corrected Ticket #761 2011-05-21 13:55:52 +05:30
Karunakar (Ruby)
b134e0f445 Documentation Error Fixed for ticket #839 2011-05-21 13:01:53 +05:30
Guillermo Iguaran
e0e8918003 AliasTracker.pluralize use pluralize_table_names of model 2011-05-20 22:54:55 -05:00
Sebastian Martinez
bf50935a5d Add more doc to #update_column. 2011-05-20 21:56:08 -03:00
Xavier Noria
499825e19f Merge pull request #1157 from smartinez87/extra_whitespaces 
Remove extra white spaces.
 2011-05-20 06:03:12 -07:00
Guillermo Iguaran
6a3b3fba5a Allow pluralize_table_names for individual model 2011-05-20 01:44:13 -05:00
Guillermo Iguaran
159213001a for => each in model migration template 2011-05-20 00:22:17 -05:00
Guillermo Iguaran
0cb812a50e Changing examples: use 'each' instead of 'for in' 2011-05-19 21:12:11 -07:00
Guillermo Iguaran
e7d600dcdb Syntax cleanup: for in => each 2011-05-19 22:55:37 -05:00
Sebastian Martinez
b91c9076a6 Remove extra white spaces. 2011-05-19 20:51:33 -03:00