aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix `test_sqlite3_mem` test run.Yves Senn2013-09-301-0/+1
* Merge pull request #12383 from marclennox/masterRafael Mendonça França2013-09-292-2/+11
|\
| * Fixed issue #12327Marc Lennox2013-09-272-2/+11
* | Merge pull request #12400 from jaredbeck/fixes_guide_re_action_on_unpermitted...Rafael Mendonça França2013-09-281-1/+1
|\ \
| * | fixes incorrect spelling of `action_on_unpermitted_parameters`Jared Beck2013-09-281-1/+1
|/ /
* | Merge pull request #12354 from kennyj/fix_12293Rafael Mendonça França2013-09-283-1/+26
|\ \
| * | Strong parameters should permit nested number as key. Closes #12293kennyj2013-09-273-1/+26
* | | Merge pull request #12387 from francisgo/patch-9Rafael Mendonça França2013-09-281-14/+14
|\ \ \
| * | | Migrations Guide: Add semicolon to sentences before code block [ci skip]Francis Go2013-09-281-14/+14
* | | | Merge pull request #12398 from thedarkone/thread-safety-stuffRafael Mendonça França2013-09-283-25/+35
|\ \ \ \
| * | | | Make GTG::TransTable thread safe.thedarkone2013-09-281-12/+23
| * | | | Use TS::Cache instead of Mutex + Hash.thedarkone2013-09-281-12/+8
| * | | | Replace global Hash with TS::Cache.thedarkone2013-09-281-1/+4
* | | | | Merge pull request #11496 from jetthoughts/11376_has_many_assoc_respect_scope...Rafael Mendonça França2013-09-284-4/+34
|\ \ \ \ \
| * | | | | Removed where_values_hash from AR::NullRelationPaul Nikitochkin2013-09-284-4/+34
* | | | | | Merge pull request #12396 from arthurnn/cleanup_logsubsRafael Mendonça França2013-09-281-11/+2
|\ \ \ \ \ \
| * | | | | | Cleanup identitymap logger from LogSubscriberArthur Neves2013-09-281-11/+2
* | | | | | | 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
| * | | | | | 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 urls Sergio2013-09-161-2/+2
| * | | | | | surplus : in attachment_fu pluginSergio2013-09-151-1/+1
| * | | | | | 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
| * | | | | | 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]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
* | | | | | Merge pull request #12388 from rkofman/masterJeremy Kemper2013-09-271-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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]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]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 testclaudiob2013-09-141-5/+0
* | | | | | Merge pull request #12379 from francisgo/patch-7Yves Senn2013-09-271-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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.Thomas von Deyen2013-09-262-0/+21
|/ / / /