aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
* | | | | | Merge pull request #24170 from maclover7/fix-24168Rafael França2016-05-211-2/+1
|\ \ \ \ \ \
| * | | | | | Un-hide helper and assets options for controller generatorJon Moss2016-03-121-2/+1
* | | | | | | Merge pull request #24862 from maclover7/jm-ar-fixesRafael França2016-05-211-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Add missing `the`Jon Moss2016-05-211-2/+2
* | | | | | | | Merge pull request #25093 from Erol/activerecord-transaction-serialization-errorRafael França2016-05-216-3/+163
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Add AR::TransactionSerializationError for transaction serialization failures ...Erol Fornoles2016-05-216-3/+163
* | | | | | | | Use #distinct instead of #uniq in the guides [ci skip] (#25098)Junya Ogura2016-05-211-1/+1
* | | | | | | | Added a shared section to config/secrets.yml that will be loaded for all envi...David Heinemeier Hansson2016-05-214-3/+46
* | | | | | | | Whitespaces [ci skip]Rafael Mendonça França2016-05-211-0/+1
* | | | | | | | Add CHANGELOG.md reference for #24958 (#25094)Jon Moss2016-05-211-0/+4
* | | | | | | | Fix Hash#from_xml with frozen strings (#24718)Marek Kirejczyk2016-05-212-11/+19
* | | | | | | | Merge pull request #24732 from y-yagi/update_record_specified_in_the_keyRafael França2016-05-212-1/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | update record specified in keyyuuji.yaginuma2016-04-272-1/+18
* | | | | | | | | Merge pull request #24918 from prathamesh-sonpatki/cable-assetsRafael França2016-05-214-5/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cable: Generate .js or .coffee files while generating channel as per the java...Prathamesh Sonpatki2016-05-174-5/+44
* | | | | | | | | | Merge pull request #24923 from vipulnsward/24816-add-labelRafael França2016-05-213-6/+25
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |