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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge pull request #30271 from ↵	Rafael França	2017-08-15	5	-19/+33
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/through_scope_should_not_be_affected_by_scoping Through scope should not be affected by scoping
\| * \| \| \| \|	Through scope should not be affected by scoping	Ryuta Kamizono	2017-08-15	5	-19/+33
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow up of #29834. Fixes #30266.
* \| \| \| \|	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]
\| * \| \| \| \|	Update guides/source/plugins.md [ci skip]	bogdanvlviv	2017-08-15	1	-33/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #30272 from ↵	Rafael França	2017-08-15	1	-6/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kamipo/dont_expose_write_attribute_without_type_cast Don't expose `write_attribute_without_type_cast`
\| * \| \| \| \| \|	Don't expose `write_attribute_without_type_cast`	Ryuta Kamizono	2017-08-16	1	-6/+5
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`write_attribute_without_type_cast` is defined as a private method in `AttributeMethods::Write`, but `AttributeMethods::Dirty` overrode it as a public method. It should be kept the original visibility.
* \| \| \| \| \|	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
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Inserted system_test ones into scaffolding logs [ci skip]
\| * \| \| \| \|	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
\| * \| \| \|	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
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing backticks Add missing * Add missing .
* \| \| \|	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]
\| * \| \|	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
\| * \| \|	Ensure sum honors distinct on has_many through	Aaron Wortham	2017-08-14	3	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When using a has_many through relation and then summing an attribute the distinct was not being used. This will ensure that when summing an attribute, the number is only used once when distinct has been used.
* \| \| \|	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
\| * \| \| \|	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.
\| * \| \| \| \|	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
\| * \| \| \| \| \|	Refactor `--api` option of the app generator	Yoshiyuki Hirano	2017-08-13	7	-29/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It can't use JavaScript in api mode. Action cable should be disabled by default.
* \| \| \| \| \| \|	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]
\| * \| \| \| \| \| \|	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`
\| * \| \| \| \| \| \|	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` association
\| * \| \| \| \| \| \|	Fix `reflection.association_primary_key` for `has_many` associations	Ryuta Kamizono	2017-08-13	4	-21/+25
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is incorrect to treat `options[:primary_key]` as `association_primary_key` if `has_many` associations because the `:primary_key` means the column on the owner record, not on the association record. It will break `ids_reader` and `ids_writer`. ```ruby people(:david).essay_ids # => ActiveRecord::StatementInvalid: Mysql2::Error: Unknown column 'essays.first_name' in 'field list': SELECT `essays`.first_name FROM `essays` WHERE `essays`.`writer_id` = 'David' ``` Fixes #14439.
* \| \| \| \| \| \|	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
\| * \| \| \| \| \| \|	Allow `serialize` with a custom coder on `json` and `array` columns	Ryuta Kamizono	2017-08-13	3	-9/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We already have a test case for `serialize` with a custom coder in `PostgresqlHstoreTest`. https://github.com/rails/rails/blob/v5.1.3/activerecord/test/cases/adapters/postgresql/hstore_test.rb#L316-L335
* \| \| \| \| \| \| \|	Merge pull request #30214 from kirs/uniqueness-scope-validator	Rafael França	2017-08-14	2	-0/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check :scope input in Uniqueness validator
\| * \| \| \| \| \| \| \|	Check :scope input in Uniqueness validator	Kir Shatrov	2017-08-13	2	-0/+11
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #30236 from padi/find-each-example-update	Rafael França	2017-08-14	1	-1/+6
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|	Completes ActiveRecord::Batches.find_each example [ci skip]
\| * \| \| \| \| \| \|	Completes ActiveRecord::Batches.find_each example [ci skip]	Marc Rendl Ignacio	2017-08-13	1	-1/+6
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The previous paragraph mentions that you can hand off the same processing queue to multiple workers. This completes the following example below it.
* \| \| \| \| \| \|	Merge pull request #30255 from lourenci/change-assets-path-of-pipeline	Vipul A M	2017-08-15	1	-2/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \|	Fix asset pipeline guide [ci skip]
\| * \| \| \| \| \|	Fix asset pipeline guide [skip ci]	Leandro Lourenci	2017-08-14	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Move test to its proper place	George Claghorn	2017-08-14	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveStorage::Filename is a model, so its test case belongs in test/models.
* \| \| \| \| \| \|	Merge pull request #30231 from kamipo/remove_unused_source_type_info	Rafael França	2017-08-14	1	-10/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused `source_type_info` in `RuntimeReflection`
\| * \| \| \| \| \| \|	Remove unused `source_type_info` in `RuntimeReflection`	Ryuta Kamizono	2017-08-13	1	-10/+7
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`source_type_info` is only used for `constraints` in `PolymorphicReflection`.
* \| \| \| \| \| \|	Merge pull request #30244 from yhirano55/refactor_max_age_seconds	Rafael França	2017-08-14	2	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor max-age seconds
\| * \| \| \| \| \| \|	Refactor max-age seconds	Yoshiyuki Hirano	2017-08-14	2	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #30233 from kamipo/remove_duplicated_join_id_for	Rafael França	2017-08-14	1	-10/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicated `join_id_for`
\| * \| \| \| \| \| \| \|	Remove duplicated `join_id_for`	Ryuta Kamizono	2017-08-13	1	-10/+2
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The primary key on the owner record is abstracted as `join_foreign_key`.
* \| \| \| \| \| \| \|	Merge pull request #30235 from bogdanvlviv/omit-additional-removing-cable_yml	Rafael França	2017-08-14	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Omit additional removing `config/cable.yml`
\| * \| \| \| \| \| \| \|	Omit additional removing `config/cable.yml` by the app generator	bogdanvlviv	2017-08-13	1	-1/+0
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`config/cable.yml` is never created if `--skip-action-cable` is given.
* \| \| \| \| \| \| \|	Merge pull request #30239 from bogdanvlviv/improve-plugin_generator_code	Rafael França	2017-08-14	1	-2/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve plugin generator codebase
\| * \| \| \| \| \| \| \|	Remove `:force` from PASSTHROUGH_OPTIONS for plugin generator	bogdanvlviv	2017-08-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`:force` is setted inside the method `generate_test_dummy`
\| * \| \| \| \| \| \| \|	Register `--api` option for plugin generator by PASSTHROUGH_OPTIONS constant	bogdanvlviv	2017-08-13	1	-2/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #30252 from rails/activestorage-service-ci	Rafael França	2017-08-14	2	-3/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Run Active Storage service tests in CI
\| * \| \| \| \| \| \| \|	Run Active Storage service tests in CI	George Claghorn	2017-08-14	2	-3/+1
\| \| \| \| \| \| \| \| \|