aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #19780 from 10io/active_job_testingAbdelkader Boudih2015-04-161-0/+7
|\
| * add active job testing section [ci skip]David Fernandez2015-04-161-0/+7
|/
* Merge pull request #19778 from thenickcox/commands_docsRichard Schneeman2015-04-161-0/+11
|\
| * [ci skip] Document running a rake command as a rails commandNick Cox2015-04-151-0/+11
|/
* Merge pull request #19775 from vngrs/fix_typo_asser_urlAbdelkader Boudih2015-04-151-6/+6
|\
| * fix typo asser url [ci skip]Mehmet Emin İNAÇ2015-04-161-6/+6
|/
* Merge pull request #19774 from davydovanton/doc-update-asser-urlAbdelkader Boudih2015-04-151-0/+30
|\
| * [Skip ci] Add information about :host optionsAnton Davydov2015-04-161-0/+30
* | Merge pull request #19766 from blasterpal/small_typo_in_asset_pipelineRafael Mendonça França2015-04-151-1/+1
|\ \
| * | Correct small typo.Hank Beaver2015-04-151-1/+1
* | | Merge pull request #19765 from y-yagi/fix_typo_in_form_builderKasper Timm Hansen2015-04-151-1/+1
|\ \ \ | |/ / |/| |
| * | remove extra `=` in form builder example [ci skip]yuuji.yaginuma2015-04-151-1/+1
|/ /
* | Merge pull request #19763 from jonatack/fix-typos-in-docsYves Senn2015-04-1511-29/+55
|\ \
| * | Fix typos and improve the documentationJon Atack2015-04-1511-29/+55
* | | Revert "Merge pull request #19755 from yuki24/activerecord/support-for-set"Yves Senn2015-04-153-15/+0
|/ /
* | Merge pull request #19446 from andersonDadario/fix_security_guide_captcha_03_...Zachary Scott2015-04-141-4/+6
|\ \
| * | [ci skip] Fix for Security Guide - Captcha SectionAnderson Dadario2015-03-221-4/+6
* | | Merge pull request #19757 from Strech/http-auth-realm-unquotingArthur Nogueira Neves2015-04-141-2/+2
|\ \ \
| * | | Tiny optimization of http auth Realm unquotingStrech (Sergey Fedorov)2015-04-141-2/+2
* | | | Merge pull request #19752 from yuki24/use-prepend-rather-than-aliasCarlos Antonio da Silva2015-04-142-42/+36
|\ \ \ \
| * | | | Use #prepend rather than using 2 aliasesYuki Nishijima2015-04-142-42/+36
* | | | | Enable Active Job integration tests againRafael Mendonça França2015-04-141-1/+0
* | | | | avoid double initialization error caused to sidekiqTakumi IINO2015-04-141-13/+34
* | | | | Merge pull request #19758 from andreynering/remove-gzip-docRafael Mendonça França2015-04-141-35/+0
|\ \ \ \ \
| * | | | | Removing GZip section since Sprockets 3.0 no longer create .gz files [ci skip]Andrey Nering2015-04-141-35/+0
| | |/ / / | |/| | |
* | | | | Fix typos in the documentation [ci skip]Rafael Mendonça França2015-04-141-1/+1
* | | | | Merge pull request #19736 from kmcphillips/masterRafael Mendonça França2015-04-1410-1/+129
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Override default form builder for a controllerKevin McPhillips2015-04-1310-1/+129
* | | | | 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