aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Fix on-site markdown rendering [ci skip]"Vijay Dev2013-12-191-1/+1
* Revert "Underscore in markdown should be escaped with backslash [ci skip]"Vijay Dev2013-12-191-1/+1
* [ci skip] add `assets.raise_runtime_errors` flagschneems2013-12-141-2/+4
* Merge branch 'master' of github.com:rails/docrailsKuldeep Aggarwal2013-12-101-1/+1
|\
| * Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-12-10588-6771/+10534
| |\
| * \ Merge branch 'master' of github.com:lifo/docrailsaditya-kapoor2013-09-01301-2671/+3921
| |\ \
| * | | fixed a typoaditya-kapoor2013-08-201-1/+1
* | | | fixed typo mistake time_formats.rb -> date_formats.rb [ci skip]Kuldeep Aggarwal2013-12-101-1/+1
| |_|/ |/| |
* | | Remove an extra periodRobin Dupret2013-12-041-1/+1
* | | Typos. return -> returns. [ci skip]Lauro Caetano2013-12-0316-23/+23
* | | Update contributing_to_ruby_on_rails.mdHarshad Sabne2013-12-011-1/+1
* | | Update security.mdHarshad Sabne2013-11-301-1/+1
* | | Remove Rdoc formatting from markdown [ci skip]Harshad Sabne2013-11-291-1/+1
* | | Fix on-site markdown rendering [ci skip]Harshad Sabne2013-11-281-1/+1
* | | Underscore in markdown should be escaped with backslash [ci skip]Harshad Sabne2013-11-261-1/+1
* | | Globalize has moved to a new repositoryHarshad Sabne2013-11-251-1/+1
* | | 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