Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | ensuring that documentation does not exceed 100 columns | Neeraj Singh | 2010-08-01 | 3 | -194/+282 | |
| | | ||||||
| * | ensuring that documentation does not exceed 100 columns | Neeraj Singh | 2010-07-31 | 1 | -51/+65 | |
| | | ||||||
| * | adding the missing closing tag | Neeraj Singh | 2010-07-31 | 1 | -1/+1 | |
| | | ||||||
| * | fixing documentation just a little bit | Neeraj Singh | 2010-07-31 | 2 | -22/+16 | |
| | | ||||||
* | | Remove duplicated logic. | José Valim | 2010-08-02 | 1 | -7/+9 | |
| | | ||||||
* | | Eager loading an association should not change the count of children | Neeraj Singh | 2010-08-02 | 1 | -0/+4 | |
| | | | | | | | | | | | | [#4971 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | Tidy up previous commit. | José Valim | 2010-08-02 | 2 | -17/+15 | |
| | | ||||||
* | | test and fix collection_singular_ids= with string primary keys [#5125 ↵ | Robert Pankowecki | 2010-08-02 | 1 | -1/+3 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | | Add an internal (private API) after_touch callback. [#5271 state:resolved] | José Valim | 2010-08-02 | 4 | -15/+20 | |
|/ | ||||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-07-31 | 3 | -26/+20 | |
|\ | ||||||
| * | reverting where() functionality, adding a test | Aaron Patterson | 2010-07-30 | 1 | -4/+4 | |
| | | ||||||
| * | fewer method calls, using faster methods when possible | Aaron Patterson | 2010-07-30 | 1 | -5/+5 | |
| | | ||||||
| * | reducing function calls and using faster methods for testing | Aaron Patterson | 2010-07-30 | 2 | -16/+10 | |
| | | ||||||
| * | Don't increment and then decrement the same counter when re-assigning a ↵ | Tarmo Tänav | 2010-07-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | belongs_to association [#2786 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | | returns not returned . fixing documentation for reflection | Neeraj Singh | 2010-07-30 | 1 | -28/+30 | |
|/ | ||||||
* | Merge remote branch 'rails/master' | Xavier Noria | 2010-07-30 | 10 | -27/+29 | |
|\ | ||||||
| * | edit pass to apply API guideline wrt the use of "# =>" in example code | Xavier Noria | 2010-07-30 | 2 | -3/+3 | |
| | | ||||||
| * | got the ternary backwards. somehow the sqlite tests passed! | Aaron Patterson | 2010-07-29 | 1 | -1/+1 | |
| | | ||||||
| * | PERF: avoiding splat args and reducing function calls | Aaron Patterson | 2010-07-29 | 1 | -8/+5 | |
| | | ||||||
| * | Revert "Avoid uneeded queries in session stores if sid is not given." | José Valim | 2010-07-29 | 1 | -0/+1 | |
| | | | | | | | | | | | | First step to merge Rails and Rack session stores. Rack always expects to receive the SID since it may have different behavior if the SID is nil. This reverts commit e210895ba95e498b9debbf43a3e5ae588bca81f0. | |||||
| * | Shouldn't have committed this! Revert "avoid calling to_sql twice" | Aaron Patterson | 2010-07-28 | 1 | -7/+4 | |
| | | | | | | | | This reverts commit 1c030a3c3c61d6d6262785bf67e1d8f44da87ea5. | |||||
| * | avoid calling to_sql twice | Aaron Patterson | 2010-07-28 | 1 | -4/+7 | |
| | | ||||||
| * | slight performance improvement when grabbing an arel table | Aaron Patterson | 2010-07-27 | 1 | -1/+1 | |
| | | ||||||
| * | fixed joining of attributes when using find_or_create_by with multiple ↵ | Jon Buda | 2010-07-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | attributes through an association Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | Prep for RC | David Heinemeier Hansson | 2010-07-26 | 1 | -1/+1 | |
| | | ||||||
| * | Move runtime back to the Thread.current | José Valim | 2010-07-26 | 3 | -13/+17 | |
| | | ||||||
* | | moving time zone related documentation to timestamp.rb from base.rb | Neeraj Singh | 2010-07-29 | 2 | -13/+12 | |
| | | ||||||
* | | adding documentation regarding time_zone_aware_attributes and ↵ | Neeraj Singh | 2010-07-29 | 1 | -0/+13 | |
| | | | | | | | | skip_time_zone_conversion_for_attributes | |||||
* | | removed ambiguity from autosave description | Simon Tokumine | 2010-07-28 | 1 | -1/+1 | |
| | | ||||||
* | | adding punctuations | Neeraj Singh | 2010-07-28 | 1 | -4/+4 | |
| | | ||||||
* | | more documentation for update_attribute | Neeraj Singh | 2010-07-28 | 1 | -5/+6 | |
| | | ||||||
* | | Revert "Frameworks are loaded in application.rb rather than config.rb ↵ | Xavier Noria | 2010-07-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | according to Rails 3 conventions." This reverts commit 1793b21479d29ec29bd47c37ee68cb6ebdb71617. This commit had no risk, but docrails has a hard rule about touching code. The contribution is appreciated, I hope you do not mind this technical revert. I'll apply that to master with proper credit. | |||||
* | | Frameworks are loaded in application.rb rather than config.rb according to ↵ | Brian Smith | 2010-07-27 | 1 | -1/+1 | |
| | | | | | | | | Rails 3 conventions. | |||||
* | | adding comments to update_attribute method | Neeraj Singh | 2010-07-27 | 1 | -0/+4 | |
|/ | ||||||
* | No need to check for :uniq | Neeraj Singh | 2010-07-26 | 1 | -6/+3 | |
| | | | | | | [#5170 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Removing unnecessary code [#5192 state:resolved] | Thiago Pradi | 2010-07-26 | 1 | -4/+0 | |
| | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Don't interpolate a blank string, avoid warnings | Santiago Pastorino | 2010-07-26 | 1 | -0/+2 | |
| | ||||||
* | Merge remote branch 'docrails/master' | Xavier Noria | 2010-07-26 | 2 | -15/+18 | |
|\ | ||||||
| * | Fixes syntax error in "with_scope" example | Arkadiusz Holko | 2010-07-25 | 1 | -1/+1 | |
| | | ||||||
| * | bringing consistency in comments | Neeraj Singh | 2010-07-24 | 1 | -14/+17 | |
| | | ||||||
* | | Cache instrumenter again as per Aaron's patch. | José Valim | 2010-07-25 | 1 | -1/+2 | |
| | | ||||||
* | | Cache connection access. | José Valim | 2010-07-25 | 2 | -6/+4 | |
| | | ||||||
* | | Move runtime back to connection. | José Valim | 2010-07-25 | 3 | -17/+15 | |
| | | ||||||
* | | Revert the previous three commits. | José Valim | 2010-07-25 | 3 | -20/+19 | |
| | | | | | | | | | | | | * AS::Notifications#instrument should not measure anything, it is not its responsibility; * Adding another argument to AS::Notifications#instrument API needs to be properly discussed; | |||||
* | | look up connection once | Aaron Patterson | 2010-07-25 | 1 | -2/+3 | |
| | | ||||||
* | | cache the instrumentor for a speed gain | Aaron Patterson | 2010-07-25 | 1 | -2/+2 | |
| | | ||||||
* | | use a hash to collect optional statistics about the instrumentation | Aaron Patterson | 2010-07-25 | 3 | -19/+19 | |
| | | ||||||
* | | runtime should be properly initialized. | José Valim | 2010-07-25 | 1 | -2/+1 | |
| | | ||||||
* | | Move runtime to log subscriber. | José Valim | 2010-07-25 | 3 | -15/+18 | |
| | | ||||||
* | | Get rid of instrumenter.elapsed. | José Valim | 2010-07-24 | 2 | -8/+7 | |
| | |