Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Setup explicit requires for files with exceptions. Removed them from ↵ | José Valim | 2010-09-02 | 4 | -5/+0 |
| | | | | | | | | autoloading." Booting a new Rails application does not work after this commit [#5359 state:open] This reverts commit 38a421b34d0b414564e919f67d339fac067a56e6. | ||||
* | Setup explicit requires for files with exceptions. Removed them from ↵ | Łukasz Strzałkowski | 2010-09-02 | 4 | -0/+5 |
| | | | | | | autoloading. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Reset default scope in Thread.current when class is unloaded [#5497 ↵ | Andrew White | 2010-09-01 | 1 | -0/+8 |
| | | | | | | state:resolved] Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | Make all the Relation finder methods consistent | Pratik Naik | 2010-08-31 | 1 | -32/+67 |
| | |||||
* | Merge remote branch 'miloops/rails_master_fixes' | Pratik Naik | 2010-08-31 | 1 | -15/+26 |
|\ | |||||
| * | Avoid calling build_where is no argument is given. | Emilio Tagua | 2010-08-31 | 1 | -1/+1 |
| | | |||||
| * | Improved conditionals usage to prevent calling methods. | Emilio Tagua | 2010-08-31 | 1 | -8/+19 |
| | | |||||
| * | Don't test conditional in iteration if it is not present just clone it. | Emilio Tagua | 2010-08-31 | 1 | -9/+9 |
| | | |||||
* | | Remove default values for Relation#limit/offset/from/create_with | Pratik Naik | 2010-08-31 | 1 | -4/+4 |
| | | |||||
* | | Change relation merging to always append select, group and order values | Pratik Naik | 2010-08-31 | 1 | -7/+10 |
|/ | |||||
* | replacing superclass_delegating_accessor with class_attribute | Neeraj Singh | 2010-08-31 | 1 | -6/+6 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Replacing superclass_delegating_accessoror with class_attribute. | Neeraj Singh | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | :store_full_sti_class will have value true or false so there is no danger of mutability here. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | Replacing superclass_delegating_accessoror with class_attribute. | Neeraj Singh | 2010-08-31 | 1 | -1/+1 |
| | | | | | | | :partial_attributes will have value true or false so there is no danger of mutability here. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | resolves merge conflict | Xavier Noria | 2010-08-31 | 1 | -3/+0 |
|\ | |||||
| * | The call-seq directive has no useful effect on our documentation and is not ↵ | Joost Baaij | 2010-08-28 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | used anywhere else. Worse still, its use breaks some rdoc, replacing method names with a curly brace. Having just one call-seq directive doesn't add anything since this is covered by regular rdoc. Having multiple might make sense, but these are already documented with examples. This partly re-reverts 60de0e56b7f57f0052d7e4f43bd2ef9e363c6a1a but does not touch the vendorized code in html-scanner. | ||||
* | | PERF: Avoid two method calls | Santiago Pastorino | 2010-08-28 | 1 | -1/+1 |
|/ | |||||
* | Fix em_mysql2 error in rake db:create | Sam Aarons | 2010-08-27 | 1 | -1/+1 |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | lifecycle should be two words, life cycle | Jaime Iniesta | 2010-08-26 | 3 | -4/+4 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-08-26 | 1 | -8/+6 |
|\ | |||||
| * | minor formatting fixes | Neeraj Singh | 2010-08-25 | 1 | -8/+6 |
| | | |||||
* | | Catch mysql2 access denied errors in rake db:create [#5432 state:resolved] | Andrew White | 2010-08-25 | 1 | -2/+4 |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | use blank? instead of present?, mark SQL literals as SQL literals | Aaron Patterson | 2010-08-25 | 1 | -5/+5 |
| | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/query_methods.rb | ||||
* | | no need to send on a public method | Aaron Patterson | 2010-08-25 | 1 | -1/+1 |
| | | |||||
* | | refactor select { is_a? } to grep() | Aaron Patterson | 2010-08-25 | 1 | -1/+1 |
| | | |||||
* | | mark SQL literals as SQL literals | Aaron Patterson | 2010-08-25 | 1 | -1/+1 |
|/ | |||||
* | :nodoc:s #unscoped until its behavior is more clear, now sometimes works, ↵ | Xavier Noria | 2010-08-25 | 1 | -1/+1 |
| | | | | sometimes not | ||||
* | edit pass to a recent doc patch | Xavier Noria | 2010-08-25 | 1 | -3/+10 |
| | |||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-08-25 | 2 | -2/+11 |
|\ | |||||
| * | touch operationg if used along with belongs_to will also be invoked on ↵ | Neeraj Singh | 2010-08-24 | 1 | -2/+6 |
| | | | | | | | | associated objects | ||||
| * | unscoped does not work when chained with named_scope | Neeraj Singh | 2010-08-23 | 1 | -0/+5 |
| | | |||||
* | | @user.touch should not fail if User does not have updated_at/updated_on column. | Neeraj Singh | 2010-08-24 | 1 | -9/+11 |
| | | | | | | | | | | | | [#5439 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | fix broken relative links [#5415 state:committed] | Joost Baaij | 2010-08-24 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | ||||
* | | Ensure timestamps are not generated when explicitly set to false [#5440 ↵ | José Valim | 2010-08-24 | 1 | -1/+1 |
| | | | | | | | | state:resolved] | ||||
* | | Master is now targeting 3.1.0.beta | David Heinemeier Hansson | 2010-08-23 | 1 | -2/+2 |
| | | |||||
* | | marking sql literals as sql literals | Aaron Patterson | 2010-08-23 | 1 | -1/+1 |
| | | |||||
* | | we should mark sql strings as sql literals | Aaron Patterson | 2010-08-23 | 1 | -1/+1 |
| | | |||||
* | | sql literal strings should be marked as sql literal strings | Aaron Patterson | 2010-08-23 | 1 | -1/+3 |
| | | |||||
* | | we should mark strings as SQL Literal values | Aaron Patterson | 2010-08-23 | 1 | -1/+1 |
| | | |||||
* | | mysql2 adapter is being maintained in the mysql2 gem itself | Brian Lopez | 2010-08-23 | 1 | -644/+0 |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
* | | removing unused code | Aaron Patterson | 2010-08-22 | 1 | -3/+1 |
|/ | |||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-08-23 | 2 | -8/+10 |
|\ | |||||
| * | Revert "Just add connection management middleware if running in a concurrent ↵ | Jeremy Kemper | 2010-08-20 | 1 | -8/+5 |
| | | | | | | | | | | | | environment." This reverts commit 6b29dc876fe185881d46731c3ae170478a3828fe. | ||||
| * | adding FOUND_ROWS to the connect flags for mysql2 | Aaron Patterson | 2010-08-20 | 1 | -0/+5 |
| | | |||||
* | | Fix docs to reference ActiveRecord::LogSubscriber | Evgeniy Dolzhenko | 2010-08-21 | 1 | -1/+1 |
|/ | | | | since Rails::LogSubscriber doesn't seem to be defined anymore | ||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-08-20 | 8 | -22/+29 |
|\ | |||||
| * | fisting after_rollback and after commit callbacks | Aaron Patterson | 2010-08-20 | 1 | -1/+1 |
| | | |||||
| * | updates return number of rows matched rather than number of rows affected | Aaron Patterson | 2010-08-19 | 1 | -0/+1 |
| | | |||||
| * | Optimize find_sti_class when store_full_sti_class is true | Andrew White | 2010-08-19 | 1 | -1/+5 |
| | | | | | | | | | | | | [#5403] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | While creating a new record using has_many create method default scope of ↵ | Neeraj Singh | 2010-08-19 | 2 | -5/+13 |
| | | | | | | | | | | | | | | | | | | | | | | child should be respected. author.posts.create should take into account default_scope defined on post. [#3939: state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | removing useless ternary | Aaron Patterson | 2010-08-19 | 1 | -1/+1 |
| | |