aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix rake test warnings in actionpackMack Earnhardt2013-03-172-2/+3
|
* Merge pull request #9747 from macksmind/refactor_friend_followerRafael Mendonça França2013-03-166-6/+15
|\ | | | | Refactor Person/Friendship relationships to be more intuitive
| * Refactor Person/Friendship relationships to be more intuitiveMack Earnhardt2013-03-176-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 Klabnik2013-03-161-1/+1
| | | | | | There was an s missing in 'views'. Fixes #9752.
* Revert "Merge pull request #8156 from fredwu/acronym_fix-master"Steve Klabnik2013-03-163-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 Klabnik2013-03-161-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 Noria2013-03-161-2/+3
|
* Merge pull request #8156 from fredwu/acronym_fix-masterXavier Noria2013-03-163-1/+7
|\ | | | | Fix for inflector's incorrect camelCase replacement for acronyms
| * Added Inflector#underscore fix to the changelogFred Wu2013-03-171-0/+4
| |
| * Fixed a bug where the inflector would replace camelCase strings and ↵Fred Wu2013-03-172-1/+3
|/ | | | disregarding specified acronyms, fixes #8015
* fixes markup of the CHANGELOG entry from 455d710Xavier Noria2013-03-161-14/+14
|
* Merge pull request #9737 from wangjohn/counter_cache_update_attributes_fixJeremy Kemper2013-03-153-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 changingJohn Wang2013-03-153-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/masterRafael Mendonça França2013-03-151-2/+2
|\ | | | | Method #primary_key? is not reused
| * Refactored to reuse methodAnupam Choudhury2013-03-151-2/+2
| |
* | Revert "make new rails apps log to STDOUT"Steve Klabnik2013-03-156-47/+5
| | | | | | | | | | | | This reverts commit b7d9d6e2cd5082d269dafbc0316e2107febe1451. Per discussion with @jeremy and @rubys on Campfire.
* | Merge pull request #5606 from teohm/multipart_unicode_param_nameSteve Klabnik2013-03-156-32/+54
|\ \ | | | | | | multipart POST - utf8 param name not encoded
| * | UTF-8 encode all keys and values in nested params hash.Teo Hui Ming2013-03-156-32/+54
| | |
* | | Fix implicit join references option reversion in testCarlos Antonio da Silva2013-03-151-1/+2
| | |
* | | Merge pull request #9691 from hone/stdout_loggingSteve Klabnik2013-03-156-5/+47
|\ \ \ | | | | | | | | Rails default logging to STDOUT
| * | | make new rails apps log to STDOUTTerence Lee2013-03-156-5/+47
| | | |
* | | | Merge pull request #9733 from ↵Jon Leighton2013-03-154-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 Senn2013-03-154-2/+38
| | |_|/ | |/| | | | | | | | | | Closes #9712.
* / | | Cache the association proxy objectJon Leighton2013-03-152-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_optionJon Leighton2013-03-1524-59/+129
|\ \ \ | | | | | | | | rename `Relation#uniq` to `Relation#distinct`
| * | | Deprecate the `:distinct` option for `Relation#count`.Yves Senn2013-03-158-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 Senn2013-03-1522-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_typosCarlos Antonio da Silva2013-03-154-5/+5
|\ \ \ \ | | | | | | | | | | Small typos here and there.
| * | | | Small typos here and there.Vipul A M2013-03-154-5/+5
| | | | |
* | | | | Merge pull request #9686 from strzalek/cast_number_to_string_in_pgJon Leighton2013-03-152-3/+14
|\ \ \ \ \ | | | | | | | | | | | | Cast number to string in Postgres
| * | | | | Cast number to string in PostgresŁukasz Strzałkowski2013-03-122-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | fixes #9170
* | | | | | Merge pull request #9732 from arunagw/warning_fix_unused_variableAndrew White2013-03-151-1/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Warning removed unused variable task_name
| * | | | | Warning removed unused variable task_nameArun Agrawal2013-03-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | warning: assigned but unused variable - task_name
* | | | | | Fix typos and improve docs a bit [ci skip]Carlos Antonio da Silva2013-03-151-7/+5
| | | | | |
* | | | | | Merge pull request #9731 from senny/9724_argument_error_on_reset_countersAndrew White2013-03-152-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | `#reset_counters` verifies counter names.
| * | | | `#reset_counters` verifies counter names.Yves Senn2013-03-152-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_testsAndrew White2013-03-157-19/+90
|\ \ \ \ | | | | | | | | | | Rework headers functional tests
| * | | | document request simulation methods in functional tests.Yves Senn2013-03-151-7/+27
| | | | |
| * | | | `Http::Headers` directly modifies the passed environment.Yves Senn2013-03-156-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 pkAaron Patterson2013-03-141-1/+5
| | | |
* | | | fix hash duping on 1.9Aaron Patterson2013-03-141-1/+1
| | | |
* | | | clean up pk delclaration in `create_table`Aaron Patterson2013-03-141-1/+8
| | | |
* | | | bumping arelAaron Patterson2013-03-141-1/+1
| | | |
* | | | oops!Aaron Patterson2013-03-141-1/+0
| | | |
* | | | just access the ivars rather than rb_iv_getAaron Patterson2013-03-141-5/+3
| | | |
* | | | hide more data in the schema cacheAaron Patterson2013-03-145-17/+35
| | | |
* | | | safely publish columns and columns hash infoAaron Patterson2013-03-144-15/+23
| | | |
* | | | Getting Started Guide: 3.2.9 -> 4.0.0. [ci skip]Steve Klabnik2013-03-141-1/+1
| | | | | | | | | | | | | | | | Brought up in https://github.com/rails/rails/issues/9727
* | | | dup and set the default proc to nil rather than looping through everythingAaron Patterson2013-03-141-1/+3
| | | |
* | | | you can provide uuid_generate_v4 as the default value for uuid columnsAaron Patterson2013-03-143-2/+52
| |_|/ |/| |