aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #22581 from hirocaster/fix-expect-sample-codeYves Senn2015-12-211-4/+5
|\
| * Change output timming of sample codehirocaster2015-12-141-2/+2
* | Merge pull request #22486 from methyl/fix-includes-for-groupped-associationYves Senn2015-12-213-1/+26
|\ \
| * | Pass SQL group by values when including scoped associationLucjan Suski2015-12-153-1/+25
* | | Merge pull request #22706 from habermann24/fix_mattr_accessor_docsYves Senn2015-12-211-6/+6
|\ \ \
| * | | Fix documentation for mattr_accessor methodsJan Habermann2015-12-201-6/+6
* | | | Merge pull request #22716 from mattreduce/mattreduce-getting-started-guideMatthew Draper2015-12-211-1/+1
|\ \ \ \
| * | | | Update README extension in Getting Started guideMatthew Conway2015-12-201-1/+1
|/ / / /
* | | | Merge pull request #22712 from jonatack/update-changelogsRafael França2015-12-201-0/+1
|\ \ \ \
| * | | | Add missing @claudiob credit to change log [skip ci]Jon Atack2015-12-201-0/+1
* | | | | Merge pull request #22715 from kamipo/remove_mysql_adapterSean Griffin2015-12-2013-98/+87
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove legacy mysql adapterRyuta Kamizono2015-12-2113-98/+87
|/ / / /
* | | | Merge pull request #22711 from jonatack/add-missing-period-in-upgrading-rails...Kasper Timm Hansen2015-12-201-2/+2
|\ \ \ \
| * | | | Upgrade Guide: Add missing period, :scissors: whitespace [skip ci]Jon Atack2015-12-201-2/+2
|/ / / /
* | | | Merge pull request #22704 from rajcybage/mysql_fixSean Griffin2015-12-203-4/+4
|\ \ \ \
| * | | | mysql2 adapter instead of mysql [ci skip]Rajarshi Das2015-12-203-4/+4
| |/ / /
* | | | Merge pull request #22707 from yui-knk/fix_warningRichard Schneeman2015-12-201-1/+1
|\ \ \ \
| * | | | Suppress warning ambiguous first argumentyui-knk2015-12-201-1/+1
| |/ / /
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-12-203-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | remove extra spaces in fixtures doc partGaurav Sharma2015-12-131-2/+2
| * | | Add missing punctuation mark [ci skip]Gaurav Sharma2015-11-182-3/+3
* | | | Add a commend about deprecation of ActiveSupport::OrderedHashRafael Mendonça França2015-12-201-1/+1
* | | | Merge pull request #22697 from kamipo/remove_unused_mysql_specific_schemaYves Senn2015-12-191-62/+0
|\ \ \ \
| * | | | Remove unused `test/schema/mysql_specific_schema.rb`Ryuta Kamizono2015-12-191-62/+0
* | | | | docs, follow up to #22699. [ci skip]Yves Senn2015-12-191-2/+2
* | | | | Merge pull request #22699 from omotenko/patch-1Kasper Timm Hansen2015-12-191-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update README.mdOleg Motenko2015-12-191-1/+1
|/ / / /
* | | | Deprecation warning now targets at 5.1Akira Matsuda2015-12-192-2/+6
* | | | Merge pull request #22695 from sachin21/remove_ds_storeGuillermo Iguaran2015-12-191-0/+0
|\ \ \ \
| * | | | Remove .DS_StoreSatoshi Ohmori2015-12-191-0/+0
|/ / / /
* | | | Merge pull request #22479 from RobinClowers/fix-cache-notification-orderKasper Timm Hansen2015-12-192-20/+24
|\ \ \ \
| * | | | Fix cache fetch miss notification orderRobin Clowers2015-12-022-20/+24
* | | | | Merge pull request #22683 from gwincr11/No-Doc-Rails__Generators__Actions__Cr...Richard Schneeman2015-12-182-1/+1
|\ \ \ \ \
| * | | | | Add No DocCory Gwin2015-12-182-1/+1
* | | | | | Merge pull request #22690 from claudiob/remove-blank-lineRichard Schneeman2015-12-181-1/+1
|\ \ \ \ \ \
| * | | | | | Remove blank line generated in config.ruclaudiob2015-12-181-1/+1
* | | | | | | Merge pull request #22678 from akshay-vishnoi/base_test_caseGuillermo Iguaran2015-12-181-14/+14
|\ \ \ \ \ \ \
| * | | | | | | [ActionCable] declare asset_logged privateAkshay Vishnoi2015-12-191-14/+14
* | | | | | | | Merge pull request #22688 from claudiob/doc-cookie-serializerGuillermo Iguaran2015-12-181-0/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Explain what initializer/config_serializer doesclaudiob2015-12-181-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #22687 from claudiob/doc-cookie-serializerClaudio B2015-12-181-1/+0
|\ \ \ \ \ \ \
| * | | | | | | initializers/cookies_serializer is not new to 5.0claudiob2015-12-181-1/+0
|/ / / / / / /
* | | | | | | Merge pull request #19423 from yuroyoro/fix_performance_regression_of_preload...Aaron Patterson2015-12-182-2/+13
|\ \ \ \ \ \ \
| * | | | | | | Read already loaded association records from association.targetTomohito Ozaki2015-04-172-2/+13
* | | | | | | | Merge pull request #22682 from y-yagi/fix_typo_in_changelogSean Griffin2015-12-181-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | fix typo in config value [ci skip]yuuji.yaginuma2015-12-191-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #22671 from habermann24/patch-1Rafael França2015-12-181-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo in CHANGELOGJan2015-12-181-1/+1
|/ / / / / / /
* | | | | | | Add CHANGELOG headers for Rails 5.0.0.beta1eileencodes2015-12-1810-0/+50
* | | | | | | Merge pull request #22462 from lxsameer/i18n_html_wrapRafael França2015-12-185-0/+32
|\ \ \ \ \ \ \