aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Refactor ActionDispatch::RemoteIpSam Aarons2014-08-213-53/+61
* ActiveJob -> Active Job [ci skip]Xavier Noria2014-08-213-3/+3
* applies API guidelines to new AM docsXavier Noria2014-08-212-32/+32
* Merge pull request #16621 from Calyhre/patch-1Rafael Mendonça França2014-08-211-0/+3
|\
| * Add change to ActionView Notable changes [ci skip]Charley D2014-08-211-0/+3
|/
* Merge pull request #16271 from alol/action-view-overview-guide-tweaksVijay Dev2014-08-221-11/+11
|\
| * Small Action View Overview edits [ci skip]Alan Oliver2014-07-241-11/+11
* | Merge pull request #16204 from jonatack/patch-7Vijay Dev2014-08-211-12/+14
|\ \
| * | Grammar passJon Atack2014-08-191-12/+14
* | | Merge pull request #16617 from tomkadwill/added_has_one_scope_documentationZachary Scott2014-08-211-0/+11
|\ \ \
| * | | [ci skip] Added documentation for has_one scope parameterTom Kadwill2014-08-211-0/+11
* | | | Merge pull request #16615 from tgxworld/guide_fixZachary Scott2014-08-211-3/+3
|\ \ \ \
| * | | | Guide fix. [CI SKIP]Guo Xiang Tan2014-08-221-3/+3
* | | | | Make text consistent in help text of rails server and console commands.Vijay Dev2014-08-212-13/+13
|/ / / /
* | | | Merge pull request #16612 from loganhasson/masterZachary Scott2014-08-211-5/+5
|\ \ \ \
| * | | | [ci skip] Clarify Action Mailer/Active Job usage noteLogan Hasson2014-08-211-5/+5
| |/ / /
* | | | Merge pull request #16607 from tgxworld/upgrading_guide_passSantiago Pastorino2014-08-211-9/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Upgrade guide pass. [CI SKIP]Guo Xiang Tan2014-08-211-9/+10
* | | | Merge pull request #16608 from GRoguelon/fix_issues_in_4_2_release_notesYves Senn2014-08-211-3/+0
|\ \ \ \
| * | | | Fix some issues in 4.2 release notes.Geoffrey ROGUELON2014-08-211-3/+0
* | | | | Merge pull request #15443 from tgxworld/preload_head_routesAndrew White2014-08-215-24/+80
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Improve router test.Guo Xiang Tan2014-08-211-6/+11
| * | | | Avoid duplicating routes for HEAD requests.Guo Xiang Tan2014-08-215-18/+69
|/ / / /
* | | | Merge pull request #16603 from jwworth/task/fix_grammarZachary Scott2014-08-201-1/+1
|\ \ \ \
| * | | | Change 'does' to 'do'Jake Worth2014-08-211-1/+1
|/ / / /
* | | | Merge pull request #16466 from schneems/schneems/gzip-action-dispatchGuillermo Iguaran2014-08-207-16/+76
|\ \ \ \ | |/ / / |/| | |
| * | | Enable gzip compression by defaultschneems2014-08-207-16/+76
|/ / /
* | | Merge pull request #16600 from bradly/spelling-fix-in-testing-guideZachary Scott2014-08-201-1/+1
|\ \ \
| * | | [ci skip] Fixing spelling typo in testing guide.Bradly Feeley2014-08-201-1/+1
|/ / /
* | | "warning: assigned but unused variable"Akira Matsuda2014-08-211-1/+1
* | | Fix SyntaxErrorAkira Matsuda2014-08-211-1/+1
* | | Merge pull request #16597 from teeparham/masterZachary Scott2014-08-201-2/+0
|\ \ \
| * | | Update configuring.md [ci skip]Tee Parham2014-08-201-2/+0
|/ / /
* | | Make the explicit the Active Job dependency of Action MailerRafael Mendonça França2014-08-201-0/+1
* | | Remove timestamp type from generator usageRafael Mendonça França2014-08-201-1/+0
* | | Merge pull request #16594 from loganhasson/masterZachary Scott2014-08-202-2/+2
|\ \ \
| * | | [ci skip] Fix Active Job grammar in api docsLogan Hasson2014-08-202-2/+2
* | | | Merge pull request #16593 from aditya-kapoor/add-doc-for-stepZachary Scott2014-08-201-3/+6
|\ \ \ \
| * | | | [ci skip] add doc for STEP in migrationAditya Kapoor2014-08-211-3/+6
| |/ / /
* | | | Merge pull request #16575 from tomkadwill/added_has_many_scope_documentationZachary Scott2014-08-201-0/+11
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Added documentation for has_many scope parameterTom Kadwill2014-08-201-0/+11
* | | | Merge pull request #16592 from aditya-kapoor/fix-migration-docsSantiago Pastorino2014-08-201-9/+2
|\ \ \ \
| * | | | [ci skip] correct docs about the migration generationAditya Kapoor2014-08-211-9/+2
* | | | | Merge pull request #16590 from loganhasson/masterZachary Scott2014-08-201-8/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix a few typos/some grammar in Active Job BasicsLogan Hasson2014-08-201-8/+8
|/ / / /
* | | | Same as f39cb2b except backport friendlyZachary Scott2014-08-201-1/+4
* | | | Same as f39cb2b except backport friendlyZachary Scott2014-08-201-4/+4
* | | | Point release notes to stable branch for list of commits. [ci skip]Zachary Scott2014-08-206-9/+15
* | | | Merge pull request #16587 from seuros/masterRafael Mendonça França2014-08-202-16/+16
|\ \ \ \
| * | | | [Rdoc] Make clear that we are sending an AR object [ci skip]Abdelkader Boudih2014-08-202-16/+16
|/ / / /