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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #30260 from kamipo/remove_unused_action_arg	Rafael França	2017-08-16	1	-2/+3
\|\
\| *	Remove unused `action` arg for `generate_routing_code`	Ryuta Kamizono	2017-08-15	1	-2/+3
* \|	Test with released thor	Rafael Mendonça França	2017-08-16	2	-36/+28
* \|	Add space	Jon Moss	2017-08-16	1	-1/+1
* \|	Small grammar fixes	Jon Moss	2017-08-16	1	-1/+1
* \|	Change to plural	Jon Moss	2017-08-16	1	-1/+1
* \|	Remove period from within links	Jon Moss	2017-08-16	1	-3/+3
* \|	Merge pull request #30280 from koic/change_namespace_of_active_storage_rake_task	Ryuta Kamizono	2017-08-16	1	-1/+1
\|\ \
\| * \|	Change namespace of Active Storage rake task	Koichi ITO	2017-08-16	1	-1/+1
* \| \|	Merge pull request #30210 from koic/fix_rubocop_offenses	Matthew Draper	2017-08-16	31	-139/+141
\|\ \ \
\| * \| \|	Fix RuboCop offenses	Koichi ITO	2017-08-16	31	-139/+141
\| \|/ /
* / /	Fix test "_before_type_cast" for enum (#29004)	Ryuta Kamizono	2017-08-16	1	-6/+8
\|/ /
* \|	Add test case to make sure Parameters configuration are executed once	Rafael Mendonça França	2017-08-15	1	-0/+10
* \|	Merge pull request #30045 from albertoalmagro/fix-raise-unpermitted-parameter...	Rafael França	2017-08-15	3	-9/+64
\|\ \
\| * \|	Load Parameters configurations on :action_controller only once	Alberto Almagro	2017-08-14	1	-1/+1
\| * \|	Allow lazy load hooks to be executed only once	Alberto Almagro	2017-08-14	2	-8/+63
* \| \|	Merge pull request #30238 from bogdanvlviv/add-skip_yarn-for-plugin_generator	Rafael França	2017-08-15	7	-28/+43
\|\ \ \
\| * \| \|	Add --skip-yarn option to the plugin generator	bogdanvlviv	2017-08-15	7	-28/+43
* \| \| \|	restores some double newlines deleted in ae87217	Xavier Noria	2017-08-15	3	-0/+6
* \| \| \|	Merge pull request #30271 from kamipo/through_scope_should_not_be_affected_by...	Rafael França	2017-08-15	5	-19/+33
\|\ \ \ \
\| * \| \| \|	Through scope should not be affected by scoping	Ryuta Kamizono	2017-08-15	5	-19/+33
\| \|/ / /
* \| \| \|	Merge pull request #30261 from bogdanvlviv/improve-guides-plugins	Rafael França	2017-08-15	1	-33/+24
\|\ \ \ \
\| * \| \| \|	Update guides/source/plugins.md [ci skip]	bogdanvlviv	2017-08-15	1	-33/+24
* \| \| \| \|	Merge pull request #30272 from kamipo/dont_expose_write_attribute_without_typ...	Rafael França	2017-08-15	1	-6/+5
\|\ \ \ \ \
\| * \| \| \| \|	Don't expose `write_attribute_without_type_cast`	Ryuta Kamizono	2017-08-16	1	-6/+5
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	minor tweaks in Active Storage after a walkthrough	Xavier Noria	2017-08-15	15	-48/+59
* \| \| \| \|	Merge pull request #30270 from yhirano55/update_guide_source_engine	Ryuta Kamizono	2017-08-16	2	-0/+9
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Add system_test logs to guide [ci skip]	Yoshiyuki Hirano	2017-08-16	2	-0/+9
\|/ / / /
* \| \| \|	Merge pull request #30265 from yhirano55/fix_api_app_generator	Kasper Timm Hansen	2017-08-15	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix typo for api_app_generator_test	Yoshiyuki Hirano	2017-08-15	1	-1/+1
* \| \| \|	Formatting CHANGELOGs [ci skip]	Ryuta Kamizono	2017-08-15	2	-4/+4
\|/ / /
* \| \|	Merge pull request #30259 from yhirano55/fix_format_of_generator_docs	Ryuta Kamizono	2017-08-15	1	-1/+1
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Fix format of generator docs [ci skip]	Yoshiyuki Hirano	2017-08-15	1	-1/+1
\|/ /
* \|	Merge pull request #30169 from awortham/awortham/awortham/fix-sql-distinct-bug	Rafael Mendonça França	2017-08-14	3	-0/+35
\|\ \
\| * \|	Ensure sum honors distinct on has_many through	Aaron Wortham	2017-08-14	3	-0/+35
* \| \|	Merge pull request #30215 from untidy-hair/clarify-abstract-or-not-in-tests	Rafael França	2017-08-14	3	-8/+18
\|\ \ \
\| * \| \|	Clarify base_class tests on abstract STI vs concrete STI	Yukio Mizuta	2017-08-12	3	-8/+18
* \| \| \|	Merge pull request #30073 from yalab/fixture_binary_helper	Rafael França	2017-08-14	4	-1/+14
\|\ \ \ \
\| * \| \| \|	Add `binary` helper method to fixtures.	yalab	2017-08-12	4	-1/+14
* \| \| \| \|	Merge pull request #30219 from yhirano55/fix_app_generator_api_options	Rafael França	2017-08-14	7	-29/+48
\|\ \ \ \ \
\| * \| \| \| \|	Refactor `--api` option of the app generator	Yoshiyuki Hirano	2017-08-13	7	-29/+48
* \| \| \| \| \|	Merge pull request #30246 from yhirano55/fix_guide_command_line	Rafael França	2017-08-14	1	-0/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix guide about command_line [ci skip]	Yoshiyuki Hirano	2017-08-15	1	-0/+3
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #30208 from kamipo/extract_primary_key_to_abstract_reflection	Rafael França	2017-08-14	1	-8/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Extract `primary_key` to `AbstractReflection`	Ryuta Kamizono	2017-08-12	1	-8/+4
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #27609 from kamipo/fix_association_primary_key	Rafael França	2017-08-14	4	-21/+25
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix `reflection.association_primary_key` for `has_many` associations	Ryuta Kamizono	2017-08-13	4	-21/+25
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #30229 from kamipo/allow_serialize_with_custom_coder	Rafael França	2017-08-14	3	-9/+54
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Allow `serialize` with a custom coder on `json` and `array` columns	Ryuta Kamizono	2017-08-13	3	-9/+54
* \| \| \| \| \| \|	Merge pull request #30214 from kirs/uniqueness-scope-validator	Rafael França	2017-08-14	2	-0/+11
\|\ \ \ \ \ \ \