aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Removing GZip section since Sprockets 3.0 no longer create .gz files [ci skip]Andrey Nering2015-04-141-35/+0
* Use `silence_warnings` on `StaticTests`eileencodes2015-04-141-6/+12
* Merge pull request #19751 from y-yagi/fix_indent_of_controllerAndrew White2015-04-142-4/+7
|\
| * fix indent in routes when using namespaced controllersyuuji.yaginuma2015-04-142-4/+7
* | Merge pull request #19755 from yuki24/activerecord/support-for-setYves Senn2015-04-143-0/+15
|\ \
| * | Add support for Set to Relation#whereYuki Nishijima2015-04-133-0/+16
* | | Merge pull request #19754 from yuki24/ruby-2.2.2-on-travisGuillermo Iguaran2015-04-131-1/+1
|\ \ \
| * | | Use Ruby 2.2.2 on travisYuki Nishijima2015-04-131-1/+1
| |/ /
* | | Merge pull request #19753 from jonatack/use-ruby-2-2-2Guillermo Iguaran2015-04-1312-15/+15
|\ \ \ | |/ / |/| |
| * | Upgrade to Ruby 2.2.2Jon Atack2015-04-1412-15/+15
* | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-04-147-48/+34
|\ \ \ | |_|/ |/| |
| * | [ci skip] add missing file extensionMikhail Dieterle2015-04-101-1/+1
| * | [ci skip] format rake outputMikhail Dieterle2015-04-101-5/+3
| * | [ci skip] fix helper nameMikhail Dieterle2015-04-101-1/+1
| * | [ci skip] Wrap with double quotationyui-knk2015-04-101-1/+1
| * | [ci skip] Add `,`yui-knk2015-04-081-1/+1
| * | [ci skip] Remove unnecessary linesyui-knk2015-04-011-2/+0
| * | [ci skip] Add `:`yui-knk2015-04-011-1/+1
| * | No need to mention unit tests in testing guide anymoreKir Shatrov2015-03-311-2/+0
| * | New test runner syntax in testing guideKir Shatrov2015-03-311-4/+4
| * | Suggest new hash syntax in testing guideKir Shatrov2015-03-311-2/+2
| * | [ci skip] Remove unnecessary `>`yui-knk2015-03-311-1/+1
| * | Don't suggest `bin/rails test controllers`Kir Shatrov2015-03-311-1/+0
| * | Add missing "of" to testing guide.Hendy Tanata2015-03-301-1/+1
| * | Merge branch 'kirs'Matthew Draper2015-03-301-30/+23
| |\ \
| | * | Switch to `bin/rails test` in testing guideKir Shatrov2015-03-301-30/+23
* | | | Merge pull request #19742 from vngrs/config_autoload_paths_wrong_docCarlos Antonio da Silva2015-04-131-3/+1
|\ \ \ \
| * | | | Fix the wrong documentation about config.autoload_paths [ci skip]Mehmet Emin İNAÇ2015-04-131-3/+1
* | | | | Improve note about unique index and foreign key on has_one associationCarlos Antonio da Silva2015-04-131-6/+7
* | | | | Merge pull request #19741 from greysteil/add-note-about-partial-index-supportYves Senn2015-04-131-0/+2
|\ \ \ \ \
| * | | | | Document that partial indexes are only supported by Postgres and SQLite.Grey Baker2015-04-132-0/+8
|/ / / / /
* | | | | Merge branch 'feature/doc_request_forgery_protection_for_api'Zachary Scott2015-04-121-7/+17
|\ \ \ \ \
| * | | | | Add note regarding CSRF for APIs, as a use-case for skipping it [ci skip]Zachary Scott2015-04-121-0/+4
| * | | | | Apply comments from @jeremy regarding why HTML and Javascript requestsZachary Scott2015-04-121-0/+5
| * | | | | update request_forgery_protection docs [ci skip]Vladimir Lyzo2015-04-121-7/+8
|/ / / / /
* | | | | Add a note regarding add_column restricted API [ci skip]Zachary Scott2015-04-121-0/+4
* | | | | Merge branch 'master' of github.com:rails/railsZachary Scott2015-04-123-31/+3
|\ \ \ \ \
| * | | | | Revert "Merge pull request #19682 from supercaracal/fix_force_ssl_redirection...Santiago Pastorino2015-04-123-31/+3
* | | | | | Add note wrt foreign key constraint to ensure data integrityZachary Scott2015-04-121-0/+10
|/ / / / /
* | | | | Apply edits from @senny to close #19397 [ci skip]Zachary Scott2015-04-121-4/+1
* | | | | Apply comments from @rafaelfranca: we shouldn't recommend you use scaffold cssZachary Scott2015-04-121-9/+0
* | | | | Merge branch 'patch-1'Zachary Scott2015-04-121-3/+5
|\ \ \ \ \
| * | | | | Enhance documentation of pluck with a hint to ids [ci skip]wingfire2015-04-121-3/+5
* | | | | | Merge pull request #19564 from jonatack/counter_cache_docsZachary Scott2015-04-121-3/+11
|\ \ \ \ \ \
| * | | | | | [skip ci] Fix counter_cache in the Rails GuidesJon Atack2015-03-281-3/+11
* | | | | | | Fix (intermittent?) test failureMatthew Draper2015-04-131-1/+1
* | | | | | | Merge pull request #19738 from ojab/squishXavier Noria2015-04-121-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Speedup String#squishojab2015-04-121-2/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'nishantmodak-view_paths'Zachary Scott2015-04-121-1/+33
|\ \ \ \ \ \ \
| * | | | | | | Some copy edits for modifying View Paths [ci skip]Zachary Scott2015-04-121-5/+21