aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Temporarily point to a fork of SDocRobin Dupret2017-08-172-4/+10
| | | | | | | | | | | This fork brings: * A tiny refresh of the default theme. * SEO tags to class files. * The removal of HTML tags from search results. * Some general template clean-up (HTML 5, removal of the jQuery effect library, etc.). * A speed up of the generation time (by ~30 seconds).
* Encrypt the IRC notification setting, so it's not used on forksMatthew Draper2017-08-171-1/+2
| | | | The value isn't actually secret, so I've kept it as a comment.
* Merge pull request #30287 from y-yagi/use_queue_adapter_name_to_get_adapter_nameKasper Timm Hansen2017-08-171-3/+1
|\ | | | | Use `ActiveJob::Base.queue_adapter_name` to get adapter name
| * Use `ActiveJob::Base.queue_adapter_name` to get adapter nameyuuji.yaginuma2017-08-171-3/+1
| | | | | | | | Since 673606a, it holds adapter name.
* | Merge pull request #30288 from y-yagi/bump_thor_and_bladeRafael França2017-08-161-3/+3
|\ \ | | | | | | Bump `thor` and `blade`
| * | Bump `thor` and `blade`yuuji.yaginuma2017-08-171-3/+3
|/ / | | | | | | For test with latest thor.
* | Merge pull request #30048 from yahonda/regexp_aware_schema_dumper_prefix_suffixRafael França2017-08-162-1/+28
|\ \ | | | | | | Allow `table_name_prefix` and `table_name_suffix` have `$`
| * | Allow `table_name_prefix` and `table_name_suffix` have `$`Yasuo Honda2017-08-042-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL 5.7 and PostgreSQL 9.6 allow table identifiers have the dollar sign. * MySQL 5.7 https://dev.mysql.com/doc/refman/5.7/en/identifiers.html > Permitted characters in unquoted identifiers: > ASCII: [0-9,a-z,A-Z$_] (basic Latin letters, digits 0-9, dollar, underscore) * PostgreSQL 9.6 https://www.postgresql.org/docs/9.6/static/sql-syntax-lexical.html > SQL identifiers and key words must begin with a letter (a-z, but also letters with diacritical marks and non-Latin letters) or an underscore (_). Subsequent characters in an identifier or key word can be letters, underscores, digits (0-9), or dollar signs ($). Note that dollar signs are not allowed in identifiers according to the letter of the SQL standard, so their use might render applications less portable. The SQL standard will not define a key word that contains digits or starts or ends with an underscore, so identifiers of this form are safe against possible conflict with future extensions of the standard. Address #30044 [Yasuo Honda & Ryuta Kamizono]
* | | Merge pull request #30285 from albertoalmagro/pass-missing-name-attributeRafael França2017-08-162-7/+12
|\ \ \ | | | | | | | | Pass missing name attribute to execute_hook
| * | | Pass missing name attribute to execute_hookAlberto Almagro2017-08-162-7/+12
| | | | | | | | | | | | | | | | Fixes commit 10bf93ef92a70ae511036134290bf0e2de184b5c created to solve issue #30025
* | | | Merge pull request #30260 from kamipo/remove_unused_action_argRafael França2017-08-161-2/+3
|\ \ \ \ | | | | | | | | | | Remove unused `action` arg for `generate_routing_code`
| * | | | Remove unused `action` arg for `generate_routing_code`Ryuta Kamizono2017-08-151-2/+3
| | | | |
* | | | | Test with released thorRafael Mendonça França2017-08-162-36/+28
| |/ / / |/| | | | | | | | | | | thor 0.20.0 was released so we can test with the released version.
* | | | Add spaceJon Moss2017-08-161-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Small grammar fixesJon Moss2017-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Changed sentence to be more clear [ci skip]
* | | | Change to pluralJon Moss2017-08-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `it` and `has` are for singular, not plural [ci skip]
* | | | Remove period from within linksJon Moss2017-08-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Periods should be outside of the <a> tags [ci skip]
* | | | Merge pull request #30280 from koic/change_namespace_of_active_storage_rake_taskRyuta Kamizono2017-08-161-1/+1
|\ \ \ \ | | | | | | | | | | Change namespace of Active Storage rake task
| * | | | Change namespace of Active Storage rake taskKoichi ITO2017-08-161-1/+1
| | | | |
* | | | | Merge pull request #30210 from koic/fix_rubocop_offensesMatthew Draper2017-08-1631-139/+141
|\ \ \ \ \ | | | | | | | | | | | | Fix RuboCop offenses
| * | | | | Fix RuboCop offensesKoichi ITO2017-08-1631-139/+141
| |/ / / / | | | | | | | | | | | | | | | And enable `context_dependent` of Style/BracesAroundHashParameters cop.
* / / / / Fix test "_before_type_cast" for enum (#29004)Ryuta Kamizono2017-08-161-6/+8
|/ / / / | | | | | | | | Since c51f9b61 changed the "_before_type_cast" expectation for enum.
* | | | Add test case to make sure Parameters configuration are executed onceRafael Mendonça França2017-08-151-0/+10
| | | | | | | | | | | | | | | | Test case for #30045
* | | | Merge pull request #30045 from ↵Rafael França2017-08-153-9/+64
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | albertoalmagro/fix-raise-unpermitted-parameters-regression Load Parameters configurations on :action_controller only once
| * | | Load Parameters configurations on :action_controller only onceAlberto Almagro2017-08-141-1/+1
| | | | | | | | | | | | | | | | Fixes regression ActionController::UnpermittedParameters not raised. The inner hook was being executed twice, once when ActionController::Base was loaded and again when ActionController::API was loaded. As options.delete operations inside the block are not idempotent, the second time it was run there was no configuration option available
| * | | Allow lazy load hooks to be executed only onceAlberto Almagro2017-08-142-8/+63
| | | | | | | | | | | | | | | | Provide run_once: true option to on_load in case you want a hook only to be executed once. This may be useful in cases where executing a hook several times may have undesired side effects
* | | | 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