aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow all ActiveJob assertion helper to accept Proc in their `only` kw:Edouard CHIN2018-11-214-4/+101
* Merge pull request #34498 from ThomBian/thombian/fix-opclass-parsingRyuta Kamizono2018-11-222-1/+13
|\
| * Fixing an issue when parsing an opclass by allowing indexed columnThomas Bianchini2018-11-212-1/+13
|/
* Merge pull request #34491 from rails/fix-query-cache-on-multiple-connectionsEileen M. Uchitelle2018-11-212-4/+27
|\
| * Fix query cache for multiple connectionsEileen Uchitelle2018-11-202-4/+27
* | Remove odd spaces [ci skip]Ryuta Kamizono2018-11-211-2/+2
* | Merge pull request #34489 from 6temes/add_slice_method_to_errorsRafael França2018-11-213-0/+39
|\ \
| * | Add slice! method to ActiveModel::ErrorsDaniel Lopez Prat2018-11-213-0/+39
* | | Merge pull request #34497 from 6temes/make_documentation_for_slice_more_explicitRafael França2018-11-201-2/+3
|\ \ \
| * | | Improve documentation for Hash#slice!Daniel Lopez 👾2018-11-211-2/+3
| |/ /
* | | Merge pull request #34495 from rails/make-connection-handler-per-thread-not-p...Eileen M. Uchitelle2018-11-202-2/+39
|\ \ \
| * | | Make connection handler per thread instead of per fiberEileen Uchitelle2018-11-202-2/+39
| | |/ | |/|
* | | Merge pull request #34494 from gmcgibbon/warn_root_conflictRafael França2018-11-203-7/+22
|\ \ \ | |/ / |/| |
| * | Raise an error on root route naming conflicts.Gannon McGibbon2018-11-203-7/+22
|/ /
* | Merge pull request #33954 from febeling/inconsistent-assignment-has-many-thro...Aaron Patterson2018-11-204-3/+43
|\ \
| * | Optimize difference and intersectionFlorian Ebeling2018-11-061-17/+9
| * | Rename union to intersectionFlorian Ebeling2018-11-063-3/+3
| * | Fix handling of duplicates for `replace` on has_many-throughFlorian Ebeling2018-11-064-3/+51
* | | Merge pull request #34492 from alfonsojimenez/fix-typoVipul A M2018-11-201-1/+1
|\ \ \
| * | | Fix typo in development_dependencies_install.md [ci skip]Alfonso Jiménez2018-11-201-1/+1
|/ / /
* | | Deprecate `event.end = Time.now` in favor of `event.finish!`Ryuta Kamizono2018-11-201-2/+6
* | | Merge pull request #22534 from evopark/masterRafael Mendonça França2018-11-194-3/+26
|\ \ \
| * | | ActionMailer: support overriding template name in multipartMarcus Ilgner2015-12-084-3/+26
* | | | Merge pull request #20865 from colavitam/only-except-behaviorRafael Mendonça França2018-11-192-2/+30
|\ \ \ \
| * | | | :only and :except are now chained for routing resource(s)Michael Colavita2015-07-133-3/+40
* | | | | Merge pull request #34488 from mullican/word_wrap_preserve_left_side_whitespaceRafael França2018-11-193-1/+23
|\ \ \ \ \
| * | | | | Prevent TextHelper#word_wrap from stripping white space on the leftLyle Mullican2018-11-193-1/+23
* | | | | | Merge pull request #34085 from albertoalmagro/display-help-as-command-line-gu...Rafael França2018-11-192-34/+35
|\ \ \ \ \ \
| * | | | | | Homogenize rails help outputAlberto Almagro2018-11-191-9/+10
| * | | | | | Indent guides as rails help command output[ci skip]Alberto Almagro2018-11-191-25/+25
* | | | | | | Merge pull request #34106 from berniechiu/rails-5-job-serializable-params-classRafael Mendonça França2018-11-193-3/+34
|\ \ \ \ \ \ \
| * | | | | | | Permit ActionController::Parameters for serializable HashBernie Chiu2018-11-193-3/+34
|/ / / / / / /
* | | | | | | Merge pull request #34482 from jacobherrington/chore/add-comments-to-templatesRafael França2018-11-192-9/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add comments to markdown templatesjacobherrington2018-11-182-9/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #34453 from bogdanvlviv/exercise-connected_to-and-connects_toAaron Patterson2018-11-192-1/+36
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Exercise `connected_to` and `connects_to` methodsbogdanvlviv2018-11-152-1/+36
* | | | | | Merge pull request #34486 from tamarr/masterRafael Mendonça França2018-11-193-3/+772
|\ \ \ \ \ \
| * | | | | | allow right to left styling of docs (#3)tamarr2018-11-193-3/+771
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #34410 from gmcgibbon/test_support_windowsEileen M. Uchitelle2018-11-193-3/+8
|\ \ \ \ \ \
| * | | | | | Windows support for parallelization and instrumenterGannon McGibbon2018-11-083-3/+8
* | | | | | | Merge pull request #34476 from y-yagi/fix_no_method_error_in_parallelizationEileen M. Uchitelle2018-11-192-0/+16
|\ \ \ \ \ \ \
| * | | | | | | Correctly handle unknown object in parallel testsyuuji.yaginuma2018-11-172-0/+16
* | | | | | | | Merge pull request #34483 from iguchi1124/patch-1Ryuta Kamizono2018-11-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [ci skip] Update active_job_basics.mdShota Iguchi2018-11-191-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #34481 from jacobherrington/patch-1Gannon McGibbon2018-11-199-15/+15
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Change queueing to queuing in docs and comments [skip ci]jacobherrington2018-11-189-15/+15
|/ / / / / / /
* | | | | | | Fix test name to match the test behavioryuuji.yaginuma2018-11-181-4/+4
* | | | | | | Remove unused `Journey::Router::RoutingError`yuuji.yaginuma2018-11-181-3/+0
* | | | | | | Merge pull request #34475 from rmacklin/synchronize-actioncable-compiled-bund...Yuji Yaginuma2018-11-171-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Synchronize ActionCable JS source code with compiled bundleRichard Macklin2018-11-161-3/+4
|/ / / / / /