aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11496 from ↵Rafael Mendonça França2013-09-284-4/+34
|\ | | | | | | | | jetthoughts/11376_has_many_assoc_respect_scope_on_build Removed where_values_hash from AR::NullRelation
| * Removed where_values_hash from AR::NullRelationPaul Nikitochkin2013-09-284-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to build associated records for owners which has not been saved need to get where values to use as default attributes. But for new record owner uses `ActiveRecord::NullRelation` which override `where_values_hash` to return empty hash stub. `where_values_hash` is not used to invoke any sql query, but good to build others chains (even will be never executed) like: ```ruby post = Post.new admin_comment = post.admin_comments.build assert_equal 'Admin', admin_comment.author ``` Closes #11376, #11676, #11675
* | Merge pull request #12396 from arthurnn/cleanup_logsubsRafael Mendonça França2013-09-281-11/+2
|\ \ | | | | | | Cleanup identitymap logger from LogSubscriber
| * | Cleanup identitymap logger from LogSubscriberArthur Neves2013-09-281-11/+2
| | | | | | | | | | | | Also renaming ivar @odd_or_even to @odd
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-2810-60/+27
|\ \ \
| * | | Added missing active record configurations.wangjohn2013-09-251-0/+6
| | | |
| * | | Fix link_to return valueEarl J St Sauver2013-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The documentation is showing the link_to method as just returning the contents of the url_for method. It should be returning an "<a>" tag with the correct href set.
| * | | use active voice and use more descriptive termsWeston Platter2013-09-221-1/+1
| | | |
| * | | `skiping` => `skipping`Vipul A M2013-09-171-1/+1
| | | |
| * | | Fix Show link on resourceVipul A M2013-09-171-1/+1
| | | |
| * | | incorrect urlSergio2013-09-161-1/+1
| | | | | | | | | | | | incorrect url
| * | | incorrect urls Sergio2013-09-161-2/+2
| | | | | | | | | | | | I've found two incorrects urls for adding ':' at the end of the url
| * | | surplus : in attachment_fu pluginSergio2013-09-151-1/+1
| | | | | | | | | | | | surplus ':' character in url
| * | | EncryptedCookieStore => CookieStore [ci skip]Rashmi Yadav2013-09-131-1/+1
| | | |
| * | | asset_url => asset-url in sass-rails docs [ci skip]Rashmi Yadav2013-09-131-1/+1
| | | |
| * | | Removed doc of diff method [ci skip]Rashmi Yadav2013-09-131-38/+0
| | | |
| * | | Updated guides with latest method [ci skip]Rashmi Yadav2013-09-131-2/+2
| | | |
| * | | Updated the file path [ci skip]Rashmi Yadav2013-09-131-4/+4
| | | |
| * | | Updated with latest method [ci skip]Rashmi Yadav2013-09-131-4/+5
| | | |
| * | | Revert ""generates" applies to "collection radio" so it should be singular"Rafael Mendonça França2013-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit faeb33dc036e4f707491c91a23ee3e990573141b. Reason: Code changes can't be done on docrails
| * | | take out reference to previous versions of RailsWaynn Lue2013-09-121-3/+1
| | | |
| * | | "generates" applies to "collection radio" so it should be singularWaynn Lue2013-09-121-2/+2
| | | |
* | | | Merge pull request #12391 from francisgo/patch-10Yves Senn2013-09-281-2/+2
|\ \ \ \ | |_|_|/ |/| | | Migrations Guide: Fix line length [ci skip]
| * | | Migrations Guide: Fix line length [ci skip]Francis Go2013-09-281-2/+2
|/ / /
* | | adding a test to demonstrate how to use STI subclasses on the far rightAaron Patterson2013-09-273-0/+10
| | | | | | | | | | | | side of a hm:t association along with preloading.
* | | Merge pull request #12388 from rkofman/masterJeremy Kemper2013-09-271-1/+1
|\ \ \ | | | | | | | | Fixed grammatical typo in configuring.md guide.
| * | | Fixed grammatical typo in configuring.md guide.Roman Kofman2013-09-271-1/+1
|/ / /
* | | Merge pull request #12385 from francisgo/patch-8Guillermo Iguaran2013-09-271-0/+2
|\ \ \ | | | | | | | | Getting Started Guide: Fix code container in Chapter 5.2 [ci-skip]
| * | | Getting Started Guide: Fix code container in Chapter 5.2 [ci-skip]Francis Go2013-09-281-0/+2
|/ / /
* | | Merge pull request #12366 from francisgo/patch-4Yves Senn2013-09-271-1/+1
|\ \ \ | | | | | | | | Getting Started Guide: Update sentence in Chapter 5.8 [ci-skip]
| * | | Getting Started Guide: Update sentence in Chapter 5.8 [ci-skip]Francis Go2013-09-271-1/+1
| | | |
* | | | Merge pull request #12233 from claudiob/delete-actionpack-unused-fixtureYves Senn2013-09-271-5/+0
|\ \ \ \ | | | | | | | | | | Remove HelperyTestHelper not used in any test
| * | | | Remove HelperyTestHelper not used in any testclaudiob2013-09-141-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HelperyTestHelper was introduced in 66ef922 by @josevalim to pair with HelperyTestController. This test controller was later removed in e10a253 by @strzalek, leaving HelperyTestHelper unused
* | | | | Merge pull request #12379 from francisgo/patch-7Yves Senn2013-09-271-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add new line after create action on CommentsController code example [ci skip]
| * | | | Add new line after create action on CommentsController code exampleFrancis Go2013-09-271-0/+1
|/ / / /
* | | | Merge pull request #12376 from tvdeyen/cache-digests-rake-tasksRafael Mendonça França2013-09-262-0/+21
|\ \ \ \ | | | | | | | | | | Adds template dependencies rake task from cache_digests gem.
| * | | | Adds template dependencies rake task from cache_digests gem.Thomas von Deyen2013-09-262-0/+21
|/ / / / | | | | | | | | | | | | This adds the rake tasks `cache_digests:dependencies` and `cache_digests:nested_dependencies` from `cache_digests` gem.
* | | | Merge pull request #12338 from JuanitoFatas/generatorYves Senn2013-09-261-3/+18
|\ \ \ \ | | | | | | | | | | [ci skip] Update scaffold output and change some words.
| * | | | [ci skip] Update scaffold output and change some words.Juanito Fatas2013-09-271-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scaffold output: add jbuilder, update timestamp (edge guide!) Add some file breadcrumb (comment) to help reader find files. Improve readability by adding some command outputs. Thanks for great help from @senny.
* | | | | Merge pull request #12373 from francisgo/patch-6Yves Senn2013-09-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Getting Started Guide: post.rb -> Post [ci skip]
| * | | | | Getting Started Guide: post.rb -> PostFrancis Go2013-09-261-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #12371 from cciollaro/masterYves Senn2013-09-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] escape unintended url in docs
| * | | | | [ci skip] escape unintended url in docsChris Ciollaro2013-09-261-1/+1
|/ / / / /
* | | | | Merge pull request #12349 from odigity/masterYves Senn2013-09-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | added "id: false" to HABTM join table example [ci skip]
| * | | | | added "id: false" to HABTM join table exampleOfer Nave2013-09-241-1/+1
| | | | | | | | | | | | | | | | | | Based on the instructions further down in section 3.3.2.
* | | | | | Merge pull request #12356 from francisgo/patch-3Yves Senn2013-09-261-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Getting Started Guide: posts_controller -> PostsController [ci skip]
| * | | | | | Getting Started Guide: posts_controller -> PostsController [ci skip]Francis Go2013-09-261-3/+3
| | | | | | |
* | | | | | | Merge pull request #12357 from JuanitoFatas/AR-basicsYves Senn2013-09-261-11/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Add missing periods in active_record_basics.md.
| * | | | | | | [ci skip] Add missing periods and update link name and some wording.Juanito Fatas2013-09-261-11/+11
| |/ / / / / /
* | | | | | | quote `false` reference in querying guide.Yves Senn2013-09-261-1/+1
| | | | | | |