| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | extra lines from Rakefile removed, which also threw warning | Vipul A M | 2013-03-17 | 1 | -2/+0 |
| | | |||||
| * | Merge pull request #9747 from macksmind/refactor_friend_follower | Rafael Mendonça França | 2013-03-16 | 6 | -6/+15 |
| |\ | | | | | Refactor Person/Friendship relationships to be more intuitive | ||||
| | * | Refactor Person/Friendship relationships to be more intuitive | Mack Earnhardt | 2013-03-17 | 6 | -6/+15 |
| |/ | | | | | | | | PR #5210 added a Friendship model to illustrate a bug, but in doing so created a confusing structure because both belongs_to declarations in Friendship referred to the same side of the join. The new structure maintains the integrity of the bug test while changing the follower relationship to be more useful for other testing. | ||||
| * | Getting Started Guide: typo fix. [ci skip] | Steve Klabnik | 2013-03-16 | 1 | -1/+1 |
| | | | | | | | There was an s missing in 'views'. Fixes #9752. | ||||
| * | Revert "Merge pull request #8156 from fredwu/acronym_fix-master" | Steve Klabnik | 2013-03-16 | 3 | -8/+1 |
| | | | | | | | | | | This reverts commit 867dc1700f32aae6f98c4651bd501597e6b52bc0, reversing changes made to 9a421aaa8285cf2a7ecb1af370748b0337818930. This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065 Please see comments on #8156 for some discussion. | ||||
| * | Update image in Getting Started Guide [ci skip] | Steve Klabnik | 2013-03-16 | 1 | -0/+0 |
| | | | | | | | | When I updated these images, I must have gotten this one wrong. Now it's right. Fixes #9749. | ||||
| * | revises the CHANGELOG entry from 26aa265 [ci skip] | Xavier Noria | 2013-03-16 | 1 | -2/+3 |
| | | |||||
| * | Merge pull request #8156 from fredwu/acronym_fix-master | Xavier Noria | 2013-03-16 | 3 | -1/+7 |
| |\ | | | | | Fix for inflector's incorrect camelCase replacement for acronyms | ||||
| | * | Added Inflector#underscore fix to the changelog | Fred Wu | 2013-03-17 | 1 | -0/+4 |
| | | | |||||
| | * | Fixed a bug where the inflector would replace camelCase strings and ↵ | Fred Wu | 2013-03-17 | 2 | -1/+3 |
| |/ | | | | disregarding specified acronyms, fixes #8015 | ||||
| * | fixes markup of the CHANGELOG entry from 455d710 | Xavier Noria | 2013-03-16 | 1 | -14/+14 |
| | | |||||
| * | Merge pull request #9737 from wangjohn/counter_cache_update_attributes_fix | Jeremy Kemper | 2013-03-15 | 3 | -0/+77 |
| |\ | | | | | The counter cache will now work correctly when the foreign key is changed. Fixes #9722. | ||||
| | * | If a counter_cache is defined, then using update_attributes and changing | John Wang | 2013-03-15 | 3 | -0/+77 |
| |/ | | | | | the primary key on an association will make sure that the corresponding counter on the association is changed properly. Fixes #9722. | ||||
| * | Merge pull request #9734 from choudhuryanupam/master | Rafael Mendonça França | 2013-03-15 | 1 | -2/+2 |
| |\ | | | | | Method #primary_key? is not reused | ||||
| | * | Refactored to reuse method | Anupam Choudhury | 2013-03-15 | 1 | -2/+2 |
| | | | |||||
| * | | Revert "make new rails apps log to STDOUT" | Steve Klabnik | 2013-03-15 | 6 | -47/+5 |
| | | | | | | | | | | | | | This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451. Per discussion with @jeremy and @rubys on Campfire. | ||||
| * | | Merge pull request #5606 from teohm/multipart_unicode_param_name | Steve Klabnik | 2013-03-15 | 6 | -32/+54 |
| |\ \ | | | | | | | multipart POST - utf8 param name not encoded | ||||
| | * | | UTF-8 encode all keys and values in nested params hash. | Teo Hui Ming | 2013-03-15 | 6 | -32/+54 |
| | | | | |||||
| * | | | Fix implicit join references option reversion in test | Carlos Antonio da Silva | 2013-03-15 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge pull request #9691 from hone/stdout_logging | Steve Klabnik | 2013-03-15 | 6 | -5/+47 |
| |\ \ \ | | | | | | | | | Rails default logging to STDOUT | ||||
| | * | | | make new rails apps log to STDOUT | Terence Lee | 2013-03-15 | 6 | -5/+47 |
| | | | | | |||||
| * | | | | Merge pull request #9733 from ↵ | Jon Leighton | 2013-03-15 | 4 | -2/+38 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | senny/9712_option_to_turn_references_deprecation_off make it possible to disable implicit join references. | ||||
| | * | | | | make it possible to disable implicit join references. | Yves Senn | 2013-03-15 | 4 | -2/+38 |
| | | |_|/ | |/| | | | | | | | | | | Closes #9712. | ||||
| * / | | | Cache the association proxy object | Jon Leighton | 2013-03-15 | 2 | -1/+6 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | This reimplements the behaviour of Rails 3, as I couldn't see why we shouldn't cache the object, and @alindeman had a good use case for caching it: https://github.com/rails/rails/commit/c86a32d7451c5d901620ac58630460915292f88b#commitcomment-2784312 | ||||
| * | | | Merge pull request #9683 from senny/deprecate_count_distinct_option | Jon Leighton | 2013-03-15 | 24 | -59/+129 |
| |\ \ \ | | | | | | | | | rename `Relation#uniq` to `Relation#distinct` | ||||
| | * | | | Deprecate the `:distinct` option for `Relation#count`. | Yves Senn | 2013-03-15 | 8 | -15/+44 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We moved more and more away from passing options to finder / calculation methods. The `:distinct` option in `#count` was one of the remaining places. Since we can now combine `Relation#distinct` with `Relation#count` the option is no longer necessary and can be deprecated. | ||||
| | * | | | rename `Relation#uniq` to `Relation#distinct`. `#uniq` still works. | Yves Senn | 2013-03-15 | 22 | -45/+86 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The similarity of `Relation#uniq` to `Array#uniq` is confusing. Since our Relation API is close to SQL terms I renamed `#uniq` to `#distinct`. There is no deprecation. `#uniq` and `#uniq!` are aliases and will continue to work. I also updated the documentation to promote the use of `#distinct`. | ||||
| * | | | | Merge pull request #9728 from vipulnsward/fix_em_typos | Carlos Antonio da Silva | 2013-03-15 | 4 | -5/+5 |
| |\ \ \ \ | | | | | | | | | | | Small typos here and there. | ||||
| | * | | | | Small typos here and there. | Vipul A M | 2013-03-15 | 4 | -5/+5 |
| | | | | | | |||||
| * | | | | | Merge pull request #9686 from strzalek/cast_number_to_string_in_pg | Jon Leighton | 2013-03-15 | 2 | -3/+14 |
| |\ \ \ \ \ | | | | | | | | | | | | | Cast number to string in Postgres | ||||
| | * | | | | | Cast number to string in Postgres | Łukasz Strzałkowski | 2013-03-12 | 2 | -3/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | fixes #9170 | ||||
| * | | | | | | Merge pull request #9732 from arunagw/warning_fix_unused_variable | Andrew White | 2013-03-15 | 1 | -1/+0 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Warning removed unused variable task_name | ||||
| | * | | | | | Warning removed unused variable task_name | Arun Agrawal | 2013-03-15 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | warning: assigned but unused variable - task_name | ||||
| * | | | | | | Fix typos and improve docs a bit [ci skip] | Carlos Antonio da Silva | 2013-03-15 | 1 | -7/+5 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #9731 from senny/9724_argument_error_on_reset_counters | Andrew White | 2013-03-15 | 2 | -1/+9 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | `#reset_counters` verifies counter names. | ||||
| | * | | | | `#reset_counters` verifies counter names. | Yves Senn | 2013-03-15 | 2 | -1/+9 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9724. Raise an `ArgumentError` when the name of the counter does not match an association name. | ||||
| * | | | | Merge pull request #9716 from senny/rework_headers_functional_tests | Andrew White | 2013-03-15 | 7 | -19/+90 |
| |\ \ \ \ | | | | | | | | | | | Rework headers functional tests | ||||
| | * | | | | document request simulation methods in functional tests. | Yves Senn | 2013-03-15 | 1 | -7/+27 |
| | | | | | | |||||
| | * | | | | `Http::Headers` directly modifies the passed environment. | Yves Senn | 2013-03-15 | 6 | -12/+63 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The env hash passed to `Http::Headers#new` must be in env format. Also be aware that the passed hash is modified directly. docs and test-cases for setting headers/env in functional tests. Follow up to #9700. | ||||
| * | | | | ask column if it is a pk | Aaron Patterson | 2013-03-14 | 1 | -1/+5 |
| | | | | | |||||
| * | | | | fix hash duping on 1.9 | Aaron Patterson | 2013-03-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | clean up pk delclaration in `create_table` | Aaron Patterson | 2013-03-14 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | bumping arel | Aaron Patterson | 2013-03-14 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | oops! | Aaron Patterson | 2013-03-14 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | just access the ivars rather than rb_iv_get | Aaron Patterson | 2013-03-14 | 1 | -5/+3 |
| | | | | | |||||
| * | | | | hide more data in the schema cache | Aaron Patterson | 2013-03-14 | 5 | -17/+35 |
| | | | | | |||||
| * | | | | safely publish columns and columns hash info | Aaron Patterson | 2013-03-14 | 4 | -15/+23 |
| | | | | | |||||
| * | | | | Getting Started Guide: 3.2.9 -> 4.0.0. [ci skip] | Steve Klabnik | 2013-03-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Brought up in https://github.com/rails/rails/issues/9727 | ||||
| * | | | | dup and set the default proc to nil rather than looping through everything | Aaron Patterson | 2013-03-14 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | you can provide uuid_generate_v4 as the default value for uuid columns | Aaron Patterson | 2013-03-14 | 3 | -2/+52 |
| | |_|/ |/| | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |