aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #30238 from bogdanvlviv/add-skip_yarn-for-plugin_generatorRafael França2017-08-157-28/+43
|\ \ \ \ | | | | | | | | | | Add `--skip-yarn` option to the plugin generator
| * | | | Add --skip-yarn option to the plugin generatorbogdanvlviv2017-08-157-28/+43
| | | | | | | | | | | | | | | | | | | | | | | | | Add SharedGeneratorTests#application_path This method will help to DRY in files app_generator_test.rb, plugin_generator_test.rb
* | | | | restores some double newlines deleted in ae87217Xavier Noria2017-08-153-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were intentional, see https://github.com/rails/rails/pull/30061#issuecomment-320068368
* | | | | Merge pull request #30271 from ↵Rafael França2017-08-155-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 scopingRyuta Kamizono2017-08-155-19/+33
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Follow up of #29834. Fixes #30266.
* | | | | Merge pull request #30261 from bogdanvlviv/improve-guides-pluginsRafael França2017-08-151-33/+24
|\ \ \ \ \ | | | | | | | | | | | | Update guides/source/plugins.md [ci skip]
| * | | | | Update guides/source/plugins.md [ci skip]bogdanvlviv2017-08-151-33/+24
| | | | | |
* | | | | | Merge pull request #30272 from ↵Rafael França2017-08-151-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 Kamizono2017-08-161-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 walkthroughXavier Noria2017-08-1515-48/+59
| | | | | |
* | | | | | Merge pull request #30270 from yhirano55/update_guide_source_engineRyuta Kamizono2017-08-162-0/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Inserted system_test ones into scaffolding logs [ci skip]
| * | | | | Add system_test logs to guide [ci skip]Yoshiyuki Hirano2017-08-162-0/+9
|/ / / / /
* | | | | Merge pull request #30265 from yhirano55/fix_api_app_generatorKasper Timm Hansen2017-08-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix typo for api_app_generator_test
| * | | | Fix typo for api_app_generator_testYoshiyuki Hirano2017-08-151-1/+1
| | | | |
* | | | | Formatting CHANGELOGs [ci skip]Ryuta Kamizono2017-08-152-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | Add missing backticks Add missing * Add missing .
* | | | Merge pull request #30259 from yhirano55/fix_format_of_generator_docsRyuta Kamizono2017-08-151-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix format of generator docs [ci skip]
| * | | Fix format of generator docs [ci skip]Yoshiyuki Hirano2017-08-151-1/+1
|/ / /
* | | Merge pull request #30169 from awortham/awortham/awortham/fix-sql-distinct-bugRafael Mendonça França2017-08-143-0/+35
|\ \ \ | | | | | | | | | | | | Ensure sum honors distinct on has_many through
| * | | Ensure sum honors distinct on has_many throughAaron Wortham2017-08-143-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-testsRafael França2017-08-143-8/+18
|\ \ \ \ | | | | | | | | | | Clarify base_class tests on abstract STI vs concrete STI
| * | | | Clarify base_class tests on abstract STI vs concrete STIYukio Mizuta2017-08-123-8/+18
| | | | |
* | | | | Merge pull request #30073 from yalab/fixture_binary_helperRafael França2017-08-144-1/+14
|\ \ \ \ \ | | | | | | | | | | | | Add `binary` helper method to fixtures.
| * | | | | Add `binary` helper method to fixtures.yalab2017-08-124-1/+14
| | | | | |
* | | | | | Merge pull request #30219 from yhirano55/fix_app_generator_api_optionsRafael França2017-08-147-29/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | Refactor `--api` option of the app generator
| * | | | | | Refactor `--api` option of the app generatorYoshiyuki Hirano2017-08-137-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_lineRafael França2017-08-141-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix guide about command_line [ci skip]
| * | | | | | | Fix guide about command_line [ci skip]Yoshiyuki Hirano2017-08-151-0/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #30208 from kamipo/extract_primary_key_to_abstract_reflectionRafael França2017-08-141-8/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Extract `primary_key` to `AbstractReflection`
| * | | | | | | Extract `primary_key` to `AbstractReflection`Ryuta Kamizono2017-08-121-8/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #27609 from kamipo/fix_association_primary_keyRafael França2017-08-144-21/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix `reflection.association_primary_key` for `has_many` association
| * | | | | | | Fix `reflection.association_primary_key` for `has_many` associationsRyuta Kamizono2017-08-134-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_coderRafael França2017-08-143-9/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow `serialize` with a custom coder on `json` and `array` columns
| * | | | | | | Allow `serialize` with a custom coder on `json` and `array` columnsRyuta Kamizono2017-08-133-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-validatorRafael França2017-08-142-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Check :scope input in Uniqueness validator
| * | | | | | | | Check :scope input in Uniqueness validatorKir Shatrov2017-08-132-0/+11
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #30236 from padi/find-each-example-updateRafael França2017-08-141-1/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Completes ActiveRecord::Batches.find_each example [ci skip]
| * | | | | | | Completes ActiveRecord::Batches.find_each example [ci skip]Marc Rendl Ignacio2017-08-131-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-pipelineVipul A M2017-08-151-2/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Fix asset pipeline guide [ci skip]
| * | | | | | Fix asset pipeline guide [skip ci]Leandro Lourenci2017-08-141-2/+2
| | | | | | |
* | | | | | | Move test to its proper placeGeorge Claghorn2017-08-141-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_infoRafael França2017-08-141-10/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused `source_type_info` in `RuntimeReflection`
| * | | | | | | Remove unused `source_type_info` in `RuntimeReflection`Ryuta Kamizono2017-08-131-10/+7
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | `source_type_info` is only used for `constraints` in `PolymorphicReflection`.
* | | | | | | Merge pull request #30244 from yhirano55/refactor_max_age_secondsRafael França2017-08-142-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor max-age seconds
| * | | | | | | Refactor max-age secondsYoshiyuki Hirano2017-08-142-2/+2
| | | | | | | |
* | | | | | | | Merge pull request #30233 from kamipo/remove_duplicated_join_id_forRafael França2017-08-141-10/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Remove duplicated `join_id_for`
| * | | | | | | | Remove duplicated `join_id_for`Ryuta Kamizono2017-08-131-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_ymlRafael França2017-08-141-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Omit additional removing `config/cable.yml`
| * | | | | | | | Omit additional removing `config/cable.yml` by the app generatorbogdanvlviv2017-08-131-1/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | `config/cable.yml` is never created if `--skip-action-cable` is given.
* | | | | | | | Merge pull request #30239 from bogdanvlviv/improve-plugin_generator_codeRafael França2017-08-141-2/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve plugin generator codebase
| * | | | | | | | Remove `:force` from PASSTHROUGH_OPTIONS for plugin generatorbogdanvlviv2017-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `:force` is setted inside the method `generate_test_dummy`