rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #26226 from schneems/schneems/explicit-public-urls	Richard Schneeman	2016-08-31	6	-20/+199
\|\
\| *	Fix style	schneems	2016-08-30	2	-31/+31
\| *	Better keyword argument name	schneems	2016-08-30	1	-3/+3
\| *	Address comment via @dhh, better option naming	schneems	2016-08-30	3	-23/+23
\| *	Explicitly mention defaults.	schneems	2016-08-29	2	-2/+2
\| *	Document public_poster_folder option	schneems	2016-08-29	1	-0/+4
\| *	Address doc style comments from @robin850	schneems	2016-08-29	2	-10/+10
\| *	Fix asset_pipeline.md miss-merge	schneems	2016-08-29	1	-7/+7
\| *	Specify version of Sprockets-rails this will be in	schneems	2016-08-29	1	-1/+1
\| *	Set unknown_asset_fallback false only new apps	schneems	2016-08-29	1	-1/+1
\| *	Move default to different initializer	schneems	2016-08-29	3	-16/+4
\| *	Thanks rubocop	schneems	2016-08-29	1	-1/+1
\| *	[ci skip] configuring.md assets.unknown_asset_fallback	schneems	2016-08-29	1	-0/+2
\| *	[ci skip] asset_pipeline.md assets.unknown_asset_fallback	schneems	2016-08-29	1	-7/+20
\| *	[ci skip] Upgrading assets.unknown_asset_fallback	schneems	2016-08-29	1	-0/+12
\| *	Fix initializer	schneems	2016-08-29	1	-1/+1
\| *	Fully document asset_path.	schneems	2016-08-29	1	-7/+58
\| *	Do not deprecate using assets with leading slash	schneems	2016-08-29	1	-10/+5
\| *	Default assets.unknown_asset_fallback to false	schneems	2016-08-29	1	-0/+4
\| *	Missed 2 public_* methods in cleanup	schneems	2016-08-29	1	-16/+0
\| *	Favor `public_folder: true` over `public_*`	schneems	2016-08-29	3	-169/+47
\| *	Fix formatting	schneems	2016-08-29	3	-26/+25
\| *	Add `public_*` helpers to all the `_tag` methods.	schneems	2016-08-29	2	-19/+73
\| *	Test `public_` methods.	schneems	2016-08-29	1	-0/+72
\| *	Match method signature	schneems	2016-08-29	1	-3/+3
\| *	Add docs to `public_*_path` methods & fix comments	schneems	2016-08-29	1	-15/+36
\| *	Add public URL helpers	schneems	2016-08-29	1	-0/+56
\| *	Add descriptive comment	schneems	2016-08-29	1	-7/+7
\| *	Make sure routes don't interfere with paths	schneems	2016-08-29	1	-0/+11
\| *	Allow a more explicit public behavior	schneems	2016-08-29	1	-2/+37
* \|	Merge pull request #26283 from kamipo/use_splat_hash_for_options	Sean Griffin	2016-08-31	1	-6/+1
\|\ \
\| * \|	Use splat `options` hash for `has_and_belongs_to_many`	Ryuta Kamizono	2016-08-26	1	-6/+1
* \| \|	Merge pull request #26282 from kamipo/add_type_default_value	Sean Griffin	2016-08-31	9	-15/+13
\|\ \ \
\| * \| \|	Add `Type.default_value` and use it everywhere for internal	Ryuta Kamizono	2016-08-26	9	-15/+13
* \| \| \|	Ensure that inverse associations are set before running callbacks	Sean Griffin	2016-08-31	14	-24/+77
* \| \| \|	Merge pull request #26327 from mechanicles/remove-duplication	Guillermo Iguaran	2016-08-30	1	-2/+6
\|\ \ \ \
\| * \| \| \|	Refactor remove duplication.	Santosh Wadghule	2016-08-31	1	-2/+6
* \| \| \| \|	Merge pull request #26331 from kjellberg/broken-links	Jon Moss	2016-08-30	3	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Broken links in documentation fix	Rasmus Kjellberg	2016-08-30	3	-3/+3
* \| \| \| \| \|	Merge pull request #23498 from jcoleman/remove-unnecessary-belongs-to-load	Matthew Draper	2016-08-31	3	-1/+14
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Don't unnecessarily load a belongs_to when saving.	James Coleman	2016-08-26	3	-1/+14
* \| \| \| \| \| \|	Merge pull request #26329 from riseshia/patch-1	Jon Moss	2016-08-30	1	-12/+7
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Update typo & Make explanation more clear	Shia	2016-08-31	1	-12/+7
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #25880 from ryandv/fix_performance_regression_in_timewithz...	Andrew White	2016-08-30	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Memoize coerced TimeWithZone value in TimeWithZone#localtime.	Ryan De Villa	2016-08-23	1	-7/+1
\| * \| \| \| \| \|	Fix performance regression in `TimeWithZone#to_time`	Ryan De Villa	2016-08-23	1	-0/+6
* \| \| \| \| \| \|	Merge pull request #26317 from maclover7/jm-fix-26298	Aaron Patterson	2016-08-29	3	-8/+30
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Remove default argument, and extract internal convenience method	Jon Moss	2016-08-29	1	-6/+12
\| * \| \| \| \| \|	Add regression tests	Jon Moss	2016-08-29	1	-0/+14
\| * \| \| \| \| \|	Allow `send_file` to declare a charset	Jon Moss	2016-08-29	2	-4/+6