aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #25164 from y-yagi/add_missing_as_option_to_deprecation_me...Kasper Timm Hansen2016-05-271-2/+3
|\
| * add missing `as` to request kwargs of `ActionDispatch::IntegrationTest`yuuji.yaginuma2016-05-271-2/+3
* | Merge pull request #25157 from maclover7/jm-23930-add-testsKasper Timm Hansen2016-05-271-0/+8
|\ \ | |/ |/|
| * Add test for `delegate_missing_to` where method doesn't existJon Moss2016-05-261-0/+8
* | Merge pull request #25158 from xhpwn/masterArun Agrawal2016-05-271-1/+1
|\ \ | |/ |/|
| * Bash markdown syntaxAnubhav Saxena2016-05-271-1/+1
|/
* Merge pull request #25146 from maclover7/fix-25128Sean Griffin2016-05-262-1/+20
|\
| * Fix `has_one` `enum` `where` queriesJon Moss2016-05-262-1/+20
* | Merge pull request #25153 from jaredbeck/docs_re_assoc_persistVipul A M2016-05-261-4/+4
|\ \ | |/ |/|
| * Docs: Clarify when assoc. methods persistJared Beck2016-05-261-4/+4
|/
* autoloading guide: specify autoload paths are set when the app boots [ci skip]Xavier Noria2016-05-261-3/+4
* Merge pull request #25139 from vipulnsward/revert-bundler-versionJeremy Daer2016-05-251-1/+1
|\
| * Revert back to a compatible bundler versionVipul A M2016-05-251-1/+1
* | Merge pull request #25138 from ysksn/test_delegationRafael França2016-05-251-0/+15
|\ \ | |/ |/|
| * Add tests for keyword arg to: for Module#delegateYosuke Kabuto2016-05-251-0/+15
* | CI: run Action Cable browser tests in Sauce LabsJon Moss2016-05-256-3/+61
|/
* Merge pull request #25134 from malept/consistent-hash-examplesJon Moss2016-05-241-6/+6
|\
| * Normalize whitespace for Hash#compact documentation [ci skip]Mark Lee2016-05-241-6/+6
|/
* Don't delegate to private methods of the targerRafael Mendonça França2016-05-242-1/+19
* Merge pull request #25119 from javan/actioncable/blade-buildRafael França2016-05-2414-59/+20
|\
| * Remove package:clean taskJavan Makhmali2016-05-2410-10/+0
| * Build action_cable.js with BladeJavan Makhmali2016-05-245-50/+21
* | Merge pull request #23930 from gsamokovarov/module-delegate-missing-toRafael Mendonça França2016-05-243-1/+129
|\ \
| * | Introduce Module#delegate_missing_toGenadi Samokovarov2016-02-273-1/+129
* | | Merge pull request #25131 from javierhonduco/javierhonduco/clone_depth_to_1Rafael França2016-05-241-0/+3
|\ \ \
| * | | Cloning depth set to 1Javier Honduvilla Coto2016-05-241-0/+3
|/ / /
* | | Merge pull request #25130 from xhpwn/masterRafael França2016-05-242-5/+5
|\ \ \
| * | | Minor comment language correction.Anubhav Saxena2016-05-241-2/+2
| * | | Fixing commands with Markdown formattingAnubhav Saxena2016-05-241-3/+3
|/ / /
* | | Remove version header from railties CHANGELOG.md (#25122)Jon Moss2016-05-241-2/+0
* | | Merge pull request #25061 from eugeneius/rails_max_threads_mysql_sqliteRichard Schneeman2016-05-2410-2/+10
|\ \ \ | |_|/ |/| |
| * | Use RAILS_MAX_THREADS as pool size on all adaptersEugene Kenny2016-05-2410-2/+10
* | | Merge pull request #25126 from bquorning/this-is-not-an-aliasVipul A M2016-05-241-2/+0
|\ \ \
| * | | [] and read_attribute are not aliases [ci skip]Benjamin Quorning2016-05-241-2/+0
|/ / /
* | | Revert "Add default exceptions affected by suppress (#25099)"Rafael Mendonça França2016-05-232-10/+0
* | | Add default exceptions affected by suppress (#25099)Alexey Zapparov2016-05-232-0/+10
* | | Merge pull request #25114 from y-yagi/remove_qualified_const_from_guideJon Moss2016-05-231-71/+0
|\ \ \
| * | | remove deprecated `Module#qualified_const_` from guide [ci skip]yuuji.yaginuma2016-05-231-71/+0
* | | | Merge pull request #25110 from andrii/fix_scaffold_cssRafael França2016-05-231-8/+4
|\ \ \ \
| * | | | Fix and optimize scaffold CSS [ci skip]Andrii Ponomarov2016-05-221-8/+4
| |/ / /
* / / / Respect `log_warning_on_csrf_failure` setting for all CSRF failuresMatthew Caruana Galizia2016-05-232-1/+34
|/ / /
* | | Remove Blade gem dependencyVipul A M2016-05-213-2/+41
* | | Merge pull request #25076 from jeroenvisser101/keep-to-max-lengthSean Griffin2016-05-212-2/+4
|\ \ \
| * | | Change comments to not exceed 80 charactersJeroen Visser2016-05-192-2/+4
* | | | Merge pull request #25101 from maclover7/jm-rm-space-1Kasper Timm Hansen2016-05-211-5/+5
|\ \ \ \
| * | | | Remove space, properly italicizeJon Moss2016-05-211-5/+5
* | | | | Merge pull request #25100 from maclover7/jm-add-backticksKasper Timm Hansen2016-05-211-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add backticks to `config/secrets.yml`Jon Moss2016-05-211-1/+1
|/ / / /
* | | | Merge pull request #24850 from maclover7/jm-actioncable-docsJon Moss2016-05-212-4/+4
|\ \ \ \
| * | | | Pass over Action Cable docsJon Moss2016-05-212-4/+4