Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | fixing some tests on ruby 1.9.3 | Aaron Patterson | 2011-03-07 | 1 | -0/+23 | |
| | | ||||||
| * | reorganizes the RDoc of Hash#to_param | Xavier Noria | 2011-03-07 | 1 | -6/+14 | |
| | | ||||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-07 | 29 | -87/+79 | |
| |\ | ||||||
| | * | formatting changes | Vijay Dev | 2011-03-07 | 2 | -15/+14 | |
| | | | ||||||
| | * | Improved docs for Hash#to_param method | Dalibor Nasevic | 2011-03-06 | 1 | -3/+2 | |
| | | | ||||||
| | * | Configuration options are symbols | Paco Guzman | 2011-03-06 | 1 | -2/+2 | |
| | | | ||||||
| | * | Remove Example headers. Code just flows with the text. 6ce844a3 | Paco Guzman | 2011-03-06 | 3 | -8/+2 | |
| | | | ||||||
| | * | more "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 18 | -52/+52 | |
| | | | | | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | |||||
| | * | "SSL everywhere" for GitHub URLs | Akira Matsuda | 2011-03-07 | 4 | -4/+4 | |
| | | | | | | | | | | | | see: https://github.com/blog/738-sidejack-prevention-phase-2-ssl-everywhere | |||||
| | * | s/a/an/ | Akira Matsuda | 2011-03-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | fix typos | Akira Matsuda | 2011-03-07 | 1 | -2/+2 | |
| | | | ||||||
* | | | Rename Reflection#through_reflection_chain and #through_options to ↵ | Jon Leighton | 2011-03-10 | 5 | -50/+53 | |
| | | | | | | | | | | | | Reflection#chain and Reflection#options as they now no longer relate solely to through associations. | |||||
* | | | Move the code which builds a scope for through associations into a generic ↵ | Jon Leighton | 2011-03-10 | 9 | -215/+162 | |
| | | | | | | | | | | | | AssociationScope class which is capable of building a scope for any association. | |||||
* | | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-07 | 25 | -44/+193 | |
|\| | | ||||||
| * | | do not test explicit equality of predicate methods, they should be allowed ↵ | Aaron Patterson | 2011-03-07 | 2 | -8/+4 | |
| | | | | | | | | | | | | to return truthy or falsey objects | |||||
| * | | refactor calls to to_param in expand_key method | Aaron Patterson | 2011-03-07 | 1 | -9/+10 | |
| | | | ||||||
| * | | Referencing a table via the ON condition in a join should force that table ↵ | Jon Leighton | 2011-03-07 | 2 | -1/+27 | |
| | | | | | | | | | | | | to be eager-loaded via a JOIN rather than via subsequent queries. | |||||
| * | | Merge branch 'master' of github.com:rails/rails | Aaron Patterson | 2011-03-07 | 23 | -27/+179 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of github.com:rails/rails: (44 commits) Fixed indentation in actionmailer base_test [#6538 state:committed] remove unused assigned variable removes merge conflicts removes Examples headers introduced in 9b96de6 Revert "Fixed identation in actionmailer base_test" Report the correct value of nil.id in the exception message as different ruby implementations may have different values, for example Rubinius returns 53 for nil.id. Improve testing of cookies in functional tests: - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear more style changes Some style changes style changes Revert "style changes" Raise ArgumentError if route name is invalid [#6517 state:resolved] style changes Allow model to be inherited from Hash [#6487 state:resolved] styles applied for usage added failing test for fields_for with a record object that inherits from Hash Fixed identation in actionmailer base_test wrong SQL statement commas to set off expressions that interrupt sentence flow typo changes ... | |||||
| | * \ | Merge branch 'active_model_unused_variable' of ↵ | Xavier Noria | 2011-03-07 | 1 | -1/+1 | |
| | |\ \ | | | | | | | | | | | | | | | | https://github.com/pacoguzman/rails into pacoguzman-active_model_unused_variable | |||||
| | | * | | remove unused assigned variable | Paco Guzman | 2011-03-06 | 1 | -1/+1 | |
| | | |/ | ||||||
| | * / | Fixed indentation in actionmailer base_test [#6538 state:committed] | Dalibor Nasevic | 2011-03-07 | 1 | -2/+2 | |
| | |/ | | | | | | | | | | Signed-off-by: Xavier Noria <fxn@hashref.com> | |||||
| | * | removes merge conflicts | Xavier Noria | 2011-03-06 | 2 | -15/+0 | |
| | | | ||||||
| | * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-03-06 | 12 | -15/+47 | |
| | |\ | ||||||
| | | * | removes Examples headers introduced in 9b96de6 | Xavier Noria | 2011-03-06 | 1 | -10/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example headers are discouraged in the API guidelines. Code just flows with the text. They may be good in places where there's a lot of stuff and structure may add clarity | |||||
| | | * | Revert "Fixed identation in actionmailer base_test" | Xavier Noria | 2011-03-06 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Please excuse the revert. Albeit the commit is totally innocent, docrails has a strong no-code policy we need to enforce. Please feel free to submit the fix as a patch and assign it to me, I'll apply right away. This reverts commit d8462510c5378f9204778ffb9df4fdbece7dccd0. | |||||
| | | * | more style changes | suchasurge | 2011-03-06 | 2 | -2/+2 | |
| | | | | ||||||
| | | * | Some style changes | suchasurge | 2011-03-06 | 5 | -5/+11 | |
| | | | | ||||||
| | | * | style changes | JudeArasu | 2011-03-06 | 1 | -3/+5 | |
| | | | | ||||||
| | | * | Revert "style changes" | JudeArasu | 2011-03-06 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | This reverts commit 1d4826937e438ebcd6a2f9e29d2e466a43fef7a8. | |||||
| | | * | style changes | JudeArasu | 2011-03-06 | 1 | -3/+3 | |
| | | | | ||||||
| | | * | styles applied for usage | JudeArasu | 2011-03-06 | 1 | -3/+4 | |
| | | | | ||||||
| | | * | Fixed identation in actionmailer base_test | Dalibor Nasevic | 2011-03-06 | 1 | -2/+2 | |
| | | | | ||||||
| | | * | wrong SQL statement | Akira Matsuda | 2011-03-06 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | merges rails | Xavier Noria | 2011-03-05 | 98 | -1334/+2114 | |
| | | |\ | ||||||
| | | * | | commas to set off expressions that interrupt sentence flow | JudeArasu | 2011-03-05 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | typo changes | JudeArasu | 2011-03-05 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | typo changes | JudeArasu | 2011-03-05 | 1 | -1/+2 | |
| | | | | | ||||||
| | | * | | Railties typos. | R.T. Lechow | 2011-03-04 | 4 | -6/+6 | |
| | | | | | ||||||
| | | * | | Action Pack typos. | R.T. Lechow | 2011-03-04 | 11 | -15/+15 | |
| | | | | | ||||||
| | | * | | Active Record typos. | R.T. Lechow | 2011-03-04 | 6 | -10/+10 | |
| | | | | | ||||||
| | | * | | Active Support typos. | R.T. Lechow | 2011-03-04 | 7 | -7/+7 | |
| | | | | | ||||||
| | | * | | Active Resource typos. | R.T. Lechow | 2011-03-04 | 5 | -6/+6 | |
| | | | | | ||||||
| | | * | | Active Model typos. | R.T. Lechow | 2011-03-04 | 2 | -2/+2 | |
| | | | | | ||||||
| | | * | | Merge remote branch 'origin/master' | Jonathon D. Jones | 2011-03-03 | 1 | -1/+1 | |
| | | |\ \ | ||||||
| | | | * | | Properly escaped a + in the dynamic segments TIP | tashian | 2011-03-03 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | Adds link to Object.blank? from Object.present? | Jonathon D. Jones | 2011-03-03 | 1 | -1/+1 | |
| | | |/ / | ||||||
| | | * | | fixes a missmatched column in example | mjy | 2011-03-03 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | Spelling mistake | JudeArasu | 2011-03-03 | 1 | -1/+2 | |
| | | | | | ||||||
| | | * | | Correct spelling for Base64 in action_mailer | Dalibor Nasevic | 2011-03-03 | 1 | -1/+1 | |
| | | | | | ||||||
| | | * | | Removed link to un-existing Issues page on Github | Dalibor Nasevic | 2011-03-01 | 1 | -3/+0 | |
| | | | | |