aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix some minor typos [ci skip]Vipul A M2013-11-262-2/+2
* Merge pull request #13025 from pwnall/nice_testYves Senn2013-11-253-0/+19
|\
| * Better error message for typos in assert_response argument.Victor Costan2013-11-253-0/+19
|/
* Merge pull request #13026 from vipulnsward/document_rewhereYves Senn2013-11-241-0/+26
|\
| * Added `rewhere` usage to AR querying guidesVipul A M2013-11-251-0/+26
|/
* Merge pull request #13020 from razielgn/raise-inspectable-messagesCarlos Antonio da Silva2013-11-242-4/+4
|\
| * Raise RuntimeErrors with inspectable and MRI-independent messages.Federico Ravasio2013-11-242-4/+4
* | Merge remote-tracking branch 'docrails/master'Xavier Noria2013-11-2429-183/+203
|\ \
| * | a couple of copy-edits before merging [ci skip]Xavier Noria2013-11-241-3/+2
| * | API Documentation Guidelines link correction [ci skip]Harshad Sabne2013-11-231-1/+1
| * | Improve reading / style of hashes in AR guideCarlos Antonio da Silva2013-11-191-5/+5
| * | Revert last two commits mistakenly changing join/include syntaxCarlos Antonio da Silva2013-11-191-7/+7
| * | syntax error joining/including modelsSergio2013-11-181-2/+2
| * | syntax error joining tablesSergio2013-11-181-5/+5
| * | The option is called encode_big_decimal_as_string [ci-skip]Godfrey Chan2013-11-151-1/+1
| * | Update action_controller_overview.md [ci skip]Harshad Sabne2013-11-151-1/+1
| * | Fix broken Wikipedia link.Harshad Sabne2013-11-131-1/+1
| * | Remove outdated guide on using rack builder w/o rails middlewareAlex Johnson2013-11-131-20/+0
| * | Correct guide relating MiddlewareStackProxy with EnumerableAlex Johnson2013-11-131-5/+4
| * | [ci skip] Replace #=> with # =>Alex Johnson2013-11-123-17/+17
| * | Fix RailsServer#start content in initialization guideAlex Johnson2013-11-121-17/+23
| * | Change syntax format for example returned valuesPrem Sichanugrist2013-11-1119-107/+107
| * | Add section for command_tasks in initialization guideAlex Johnson2013-11-081-12/+42
| * | Update commands.rb content in initialization guideAlex Johnson2013-11-081-2/+8
| * | Update README.rdoc [ci skip]Harshad Sabne2013-11-081-1/+1
* | | Merge pull request #13021 from razielgn/rbx-gemfile-and-travis-fixesRafael Mendonça França2013-11-241-1/+1
|\ \ \
| * | | Updated allow_failures for Rubinius 2.2.1.Federico Ravasio2013-11-241-1/+1
|/ / /
* | | Merge pull request #13019 from razielgn/rbx-gemfile-and-travis-fixesRafael Mendonça França2013-11-242-5/+3
|\ \ \ | |_|/ |/| |
| * | Properly fix Rubinius dependencies in Gemfile & Travis integration.Federico Ravasio2013-11-242-5/+3
|/ /
* | Merge pull request #13016 from arunagw/test-for-skip-assets-controllerGuillermo Iguaran2013-11-231-0/+6
|\ \
| * | Test for when controller with skip-assetsArun Agrawal2013-11-231-0/+6
|/ /
* | Merge pull request #13015 from arunagw/task-creation-command-testYves Senn2013-11-231-1/+13
|\ \
| * | Added test when task generator called on revokeArun Agrawal2013-11-231-1/+13
|/ /
* | Merge pull request #13012 from harrigan/masterYves Senn2013-11-231-1/+1
|\ \
| * | Helper should be a module in Rails guides [ci skip]Martin Harrigan2013-11-231-1/+1
|/ /
* | Merge pull request #13011 from arunagw/jruby-fixesYves Senn2013-11-231-2/+10
|\ \
| * | Using activerecord-jdbcsqlite3-adapterArun Agrawal2013-11-231-2/+10
* | | Merge pull request #13010 from arunagw/cleanedup-generator-testYves Senn2013-11-231-21/+6
|\ \ \ | |/ / |/| |
| * | Cleaned up app generator testArun Agrawal2013-11-231-21/+6
|/ /
* | Merge pull request #13007 from chancancode/dont_call_as_json_with_nilJeremy Kemper2013-11-222-2/+18
|\ \
| * | When Array#as_json and Hash#as_json are called without options, theyGodfrey Chan2013-11-222-2/+18
* | | Merge pull request #12774 from exAspArk/fix_uniqueness_on_relationYves Senn2013-11-223-1/+24
|\ \ \ | |/ / |/| |
| * | Fix validation on uniqueness of empty associationEvgeny Li2013-11-223-1/+24
|/ /
* | Use a more generic assertion to make sure this tests will be useful.Rafael Mendonça França2013-11-221-3/+2
* | Merge pull request #13003 from laurocaetano/fix_assertion_for_turbolinksRafael Mendonça França2013-11-221-1/+1
|\ \
| * | Fix the assertion for not inclusion of turbolinks on application.js.Lauro Caetano2013-11-221-1/+1
|/ /
* | Improve changelogsCarlos Antonio da Silva2013-11-224-11/+13
* | Merge pull request #13000 from arunagw/build-fix-rake-testYves Senn2013-11-211-2/+2
|\ \
| * | Build fix for new routing inspector changesArun Agrawal2013-11-221-2/+2
|/ /
* | Merge pull request #12996 from shreve/patch-2Guillermo Iguaran2013-11-211-1/+1
|\ \