Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #10106 from rmm5t/fix-explicit-name-on-multiple-fields-master | Rafael Mendonça França | 2013-04-05 | 3 | -8/+24 |
|\ | |||||
| * | Fix explicit names on multiple file fields | Ryan McGeary | 2013-04-05 | 3 | -8/+24 |
|/ | |||||
* | Merge pull request #10098 from subwindow/postgres_dump_bigint_default | Rafael Mendonça França | 2013-04-05 | 4 | -1/+12 |
|\ | |||||
| * | Correctly parse bigint defaults in PostgreSQL | Erik Peterson | 2013-04-05 | 4 | -1/+12 |
* | | Move changelog to the top [ci skip] | Carlos Antonio da Silva | 2013-04-05 | 1 | -17/+17 |
* | | Fix indent and remove extra white spaces | Carlos Antonio da Silva | 2013-04-05 | 1 | -15/+17 |
* | | Merge pull request #9996 from mikz/master | Jon Leighton | 2013-04-05 | 3 | -0/+34 |
|\ \ | |||||
| * | | fix inverse_of association in block of new child | Michal Cichra | 2013-04-01 | 3 | -0/+34 |
* | | | Merge pull request #10058 from jamesgolick/master | Jon Leighton | 2013-04-05 | 2 | -5/+3 |
|\ \ \ | |||||
| * | | | Refactor CollectionProxy#scope to avoid calling #extend. | James Golick | 2013-04-02 | 2 | -5/+3 |
* | | | | Fix scope chaining + STI | Jon Leighton | 2013-04-05 | 4 | -11/+5 |
* | | | | failing test for #9869 | Neeraj Singh | 2013-04-05 | 2 | -0/+6 |
* | | | | Merge pull request #10102 from xxxcaqui/master | Carlos Antonio da Silva | 2013-04-05 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Sort modules in alphabetical order. | Shunsuke Osa | 2013-04-05 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* / | | | Improve `belongs_to touch: true` timestamp test | Andrew White | 2013-04-05 | 1 | -7/+21 |
|/ / / | |||||
* | | | Avoid an attempt to fetch old record when id was not present in touch callback | Carlos Antonio da Silva | 2013-04-04 | 1 | -7/+7 |
* | | | Use the correct pk field from the reflected class to find the old record | Carlos Antonio da Silva | 2013-04-04 | 1 | -1/+2 |
* | | | Refactor mail_to to not generate intermediate hashes when adding href | Carlos Antonio da Silva | 2013-04-04 | 1 | -5/+6 |
* | | | Ensure mail_to helper does not modify the given html options hash | Carlos Antonio da Silva | 2013-04-04 | 2 | -4/+10 |
* | | | Merge pull request #10065 from spohlenz/mail_to_block | Carlos Antonio da Silva | 2013-04-04 | 3 | -5/+30 |
|\ \ \ | |||||
| * | | | Add block support for the helper | Sam Pohlenz | 2013-04-03 | 3 | -5/+30 |
* | | | | Merge pull request #10092 from amco/master | Carlos Antonio da Silva | 2013-04-04 | 1 | -10/+16 |
|\ \ \ \ | |||||
| * | | | | Model generator USAGE doc improved | Jason King | 2013-04-04 | 1 | -10/+16 |
* | | | | | Use inspect when writing the foreign key from the reflection | Andrew White | 2013-04-05 | 2 | -2/+8 |
* | | | | | Use a space after the comment sign when showing the result of commands | Carlos Antonio da Silva | 2013-04-04 | 1 | -4/+4 |
* | | | | | Merge pull request #10094 from neerajdotname/fix2 | Carlos Antonio da Silva | 2013-04-04 | 4 | -5/+23 |
|\ \ \ \ \ | |||||
| * | | | | | template should have generic name | Neeraj Singh | 2013-04-04 | 2 | -2/+2 |
| * | | | | | use | to have more intent revealing code | Neeraj Singh | 2013-04-04 | 1 | -1/+1 |
| * | | | | | expanded rdoc for chain and reflection_names | Neeraj Singh | 2013-04-04 | 1 | -2/+20 |
* | | | | | | Merge pull request #10095 from frodsan/exclude_template_files | Carlos Antonio da Silva | 2013-04-04 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Exclude template files for rdoc API [ci skip] | Francesco Rodriguez | 2013-04-04 | 1 | -1/+2 |
|/ / / / / / | |||||
* | | | | | | Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_... | Rafael Mendonça França | 2013-04-04 | 3 | -33/+1 |
* | | | | | | stop depending on callbacks | Aaron Patterson | 2013-04-04 | 1 | -6/+12 |
* | | | | | | Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters | Rafael Mendonça França | 2013-04-04 | 3 | -1/+33 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fixes skipping object callback filters | Ben McRedmond | 2013-04-04 | 3 | -1/+33 |
* | | | | | | Merge pull request #10087 from neerajdotname/10016 | Carlos Antonio da Silva | 2013-04-04 | 7 | -3/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | has_many through obeys order on through association | Neeraj Singh | 2013-04-04 | 7 | -3/+26 |
* | | | | | | | Merge pull request #10090 from vipulnsward/fix_private_warn | Steve Klabnik | 2013-04-04 | 2 | -3/+6 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | fix private attribute warning | Vipul A M | 2013-04-04 | 2 | -3/+6 |
* | | | | | | | Further simplify enumerable group_by test | Carlos Antonio da Silva | 2013-04-04 | 1 | -3/+1 |
* | | | | | | | Merge pull request #10076 from choudhuryanupam/master | Rafael Mendonça França | 2013-04-04 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Replaced inject with map | Anupam Choudhury | 2013-04-04 | 1 | -2/+2 |
| * | | | | | | | Removed unused comma after loop variable | Anupam Choudhury | 2013-04-04 | 1 | -1/+1 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #10088 from neerajdotname/fixes1 | Rafael Mendonça França | 2013-04-04 | 3 | -5/+15 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | expanded rdoc on source_reflection method | Neeraj Singh | 2013-04-04 | 1 | -0/+10 |
| * | | | | | | show name of the klass that has missing association | Neeraj Singh | 2013-04-02 | 1 | -1/+1 |
| * | | | | | | not a relation. it's an arel select manager | Neeraj Singh | 2013-04-02 | 1 | -4/+4 |
* | | | | | | | Merge pull request #10082 from vipulnsward/fix_railties_test-v2 | Steve Klabnik | 2013-04-03 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix warnings in railties test | Vipul A M | 2013-04-04 | 1 | -3/+3 |
|/ / / / / / / | |||||
* | | | | | | | Fix typo in view name | Carlos Antonio da Silva | 2013-04-03 | 2 | -1/+1 |