aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #16641 from cristianbica/aj-backburner-enqueue-laterRafael Mendonça França2014-08-222-5/+6
|\ \ \ \ \ \ \
| * | | | | | | Implemented enqueue_at for ActiveJob's Backburner adapterCristian Bica2014-08-222-5/+6
* | | | | | | | Merge pull request #16642 from cristianbica/aj-doc-queue-name-prefixZachary Scott2014-08-221-2/+23
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Active Job guide: Add info about queue_name prefix and clarity supporter feat...Cristian Bica2014-08-221-2/+23
| |/ / / / / /
* | | | | | | Merge pull request #16622 from matthewd/default-debugMatthew Draper2014-08-232-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Don't fight against ourselves for the default log levelMatthew Draper2014-08-222-3/+3
* | | | | | | | Merge pull request #16626 from adomokos/replacing-each-with-reduceSantiago Pastorino2014-08-221-3/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Using `each_with_object` instead of `reduce`Attila Domokos2014-08-221-2/+2
| * | | | | | | Replacing an each with reduceAttila Domokos2014-08-211-4/+2
* | | | | | | | Merge pull request #16560 from robin850/rbx-duration-eqlRafael Mendonça França2014-08-223-2/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Define the Duration#instance_of? methodRobin Dupret2014-08-183-2/+16
* | | | | | | | Merge pull request #16633 from tgxworld/prefer_log_message_through_blockYves Senn2014-08-221-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Pass logging message through block.Guo Xiang Tan2014-08-221-4/+4
* | | | | | | | | Merge pull request #16634 from tgxworld/missing_spaceZachary Scott2014-08-221-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Missing space. [CI SKIP]Guo Xiang Tan2014-08-221-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #11859 from zzak/nested_model_forms_guideZachary Scott2014-08-221-1/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | add nested_model_forms to guides/documents.yaml [wip] [ci skip]Zachary Scott2014-08-221-1/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'jonatack-patch-8'Zachary Scott2014-08-221-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Follow up on #16408Jon Atack2014-08-221-2/+6
|/ / / / / / / /
* | | | | | | | [ci skip] Running AR tests guide [Fixes GH-15891]Zachary Scott2014-08-221-2/+2
* | | | | | | | Merge pull request #16630 from tomkadwill/added_has_and_belongs_to_many_scope...Zachary Scott2014-08-221-0/+12
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | [ci skip] Added documentation for has_and_belongs_to_many scope parameterTom Kadwill2014-08-221-0/+12
|/ / / / / / /
* | | | | | | Merge pull request #16629 from rails/revert-16438-input-placeholder-i18nJeremy Kemper2014-08-215-214/+0
|\ \ \ \ \ \ \
| * | | | | | | Revert "Add I18n support for `:placeholder` HTML option is passed to form fie...Jeremy Kemper2014-08-215-214/+0
|/ / / / / / /
* | | | | | | Merge pull request #16604 from saarons/clean-remote-ip-middlewareJeremy Kemper2014-08-213-53/+61
|\ \ \ \ \ \ \
| * | | | | | | Refactor ActionDispatch::RemoteIpSam Aarons2014-08-213-53/+61
| | |/ / / / / | |/| | | | |
* | | | | | | fix grammar [ci skip]Vijay Dev2014-08-221-1/+1
* | | | | | | fix server names [ci skip]Vijay Dev2014-08-221-1/+1
|/ / / / / /
* | | | | | 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
|/ / / / / / /