aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix RuboCop offensesKoichi ITO2017-08-1631-139/+141
* Add test case to make sure Parameters configuration are executed onceRafael Mendonça França2017-08-151-0/+10
* Merge pull request #30045 from albertoalmagro/fix-raise-unpermitted-parameter...Rafael França2017-08-153-9/+64
|\
| * Load Parameters configurations on :action_controller only onceAlberto Almagro2017-08-141-1/+1
| * Allow lazy load hooks to be executed only onceAlberto Almagro2017-08-142-8/+63
* | 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 generatorbogdanvlviv2017-08-157-28/+43
* | | restores some double newlines deleted in ae87217Xavier Noria2017-08-153-0/+6
* | | Merge pull request #30271 from kamipo/through_scope_should_not_be_affected_by...Rafael França2017-08-155-19/+33
|\ \ \
| * | | Through scope should not be affected by scopingRyuta Kamizono2017-08-155-19/+33
| |/ /
* | | Merge pull request #30261 from bogdanvlviv/improve-guides-pluginsRafael França2017-08-151-33/+24
|\ \ \
| * | | Update guides/source/plugins.md [ci skip]bogdanvlviv2017-08-151-33/+24
* | | | Merge pull request #30272 from kamipo/dont_expose_write_attribute_without_typ...Rafael França2017-08-151-6/+5
|\ \ \ \
| * | | | Don't expose `write_attribute_without_type_cast`Ryuta Kamizono2017-08-161-6/+5
| | |/ / | |/| |
* | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | 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_testYoshiyuki Hirano2017-08-151-1/+1
* | | Formatting CHANGELOGs [ci skip]Ryuta Kamizono2017-08-152-4/+4
|/ /
* | Merge pull request #30259 from yhirano55/fix_format_of_generator_docsRyuta Kamizono2017-08-151-1/+1
|\ \
| * | 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 throughAaron Wortham2017-08-143-0/+35
* | | 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 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.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 generatorYoshiyuki Hirano2017-08-137-29/+48
* | | | | | Merge pull request #30246 from yhirano55/fix_guide_command_lineRafael França2017-08-141-0/+3
|\ \ \ \ \ \
| * | | | | | 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`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` associationsRyuta Kamizono2017-08-134-21/+25
| | |_|/ / / | |/| | | |
* | | | | | 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` columnsRyuta Kamizono2017-08-133-9/+54
* | | | | | | Merge pull request #30214 from kirs/uniqueness-scope-validatorRafael França2017-08-142-0/+11
|\ \ \ \ \ \ \
| * | | | | | | 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]Marc Rendl Ignacio2017-08-131-1/+6
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #30255 from lourenci/change-assets-path-of-pipelineVipul A M2017-08-151-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix asset pipeline guide [skip ci]Leandro Lourenci2017-08-141-2/+2
* | | | | | Move test to its proper placeGeorge Claghorn2017-08-141-0/+0
* | | | | | Merge pull request #30231 from kamipo/remove_unused_source_type_infoRafael França2017-08-141-10/+7
|\ \ \ \ \ \
| * | | | | | Remove unused `source_type_info` in `RuntimeReflection`Ryuta Kamizono2017-08-131-10/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #30244 from yhirano55/refactor_max_age_secondsRafael França2017-08-142-2/+2
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \ \