aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Revise flow to what was described in 03e44f9Kasper Timm Hansen2019-08-044-38/+47
|
* Revise credentials diffing flow to use a separate diff commandKasper Timm Hansen2019-08-045-105/+79
| | | | | | | | | | | | | | Didn't like the complicated stuff that happened on credentials:edit. It would append to .gitattributes multiple times. Though I see why it was written that way. I'm cutting off for now, but since this new flow would require each developer to run --enable perhaps this should really be: 1. Developer enrolls Rails app by running `credentials:diff --enable` 2. credentials:edit checks .gitattributes for `diff=rails_credentials` and if the current file is covered by that. 3. If so, set up the "rails_credentials" driver automatically.
* Extract diffing to separate credentials:diff commandKasper Timm Hansen2019-08-043-51/+43
|
* Commands already make fileutils available.Kasper Timm Hansen2019-08-031-2/+0
|
* Rename to Diffing and move module into credentials commandKasper Timm Hansen2019-08-033-59/+54
| | | | | | | | | Helpers is more for sharing between commands. Since `Diffing` is only for credentials we should just keep it only for credentials. Replaces "pretty" with diffing since the former is ambiguous, while diffing captures what it does. `opt_in` seemed clunky so it's swapped for the one-word enable.
* 1.hour needs core_ext to workRafael Mendonça França2019-08-021-0/+2
| | | | | | Usually the application requires the entire active support at load time but the configuration happens before it is loaded. For that reason we need to require the core_ext that we want to use in this file.
* Revert "MethodCallAssertions is a regular player of the team ↵Rafael Mendonça França2019-08-022-0/+4
| | | | | | ActiveSupport::TestCase now" This reverts commit 98d0f7ebd34b858f12a12dcf37ae54fdbb5cab64.
* Revert "You give jruby_skip & rubinius_skip a good name"Rafael Mendonça França2019-08-021-0/+15
| | | | This reverts commit 8d2866bb80fbe81acb04f5b0c44f152f571fb29f.
* Remove duplicate method definitionDaniel Colson2019-08-011-5/+0
| | | | | | | | | | | | | no_color! is already defined in [`Rails::Command::Behavior`][behavior], which gets [included into `Rails:Generators`][include]. This duplication came about in 6813edc7d9 when we introduced the Thor command structure. We have [test coverage][] to ensure this method still behaves correctly on `Rails:Generators`. [behavior]: https://github.com/rails/rails/blob/f7e91c7224560fbd3e95c238a0e8bb362799bcb7/railties/lib/rails/command/behavior.rb#L12-L14 [include]: https://github.com/rails/rails/blob/f7e91c7224560fbd3e95c238a0e8bb362799bcb7/railties/lib/rails/generators.rb#L18 [test coverage]: https://github.com/rails/rails/blob/f7e91c7224560fbd3e95c238a0e8bb362799bcb7/railties/test/generators_test.rb#L163-L168
* You give jruby_skip & rubinius_skip a good nameAkira Matsuda2019-08-021-15/+0
| | | | | | | | This hack prevails everywhere in the codebase by being copy & pasted, and it's actually not a negative thing but a necessary thing for framework implementors, so it should better have a name and be a thing. And with this commit, activesupport/test/abstract_unit.rb now doesn't silently autoload AS::TestCase, so we're ready to establish clearner environment for running AS tests (probably in later commits)
* MethodCallAssertions is a regular player of the team ActiveSupport::TestCase nowAkira Matsuda2019-08-022-4/+0
| | | | It's used everywhere, clean and mature enough
* It may be better to explicitly require 'object/try' where we call `try`Akira Matsuda2019-08-011-0/+1
| | | | | | In most cases it works now without explicit require because it's accidentally required through active_support/core_ext/date_and_time/calculations.rb where we still call `try`, but that would stop working if we changed the Calculations implementation and remove the require call there.
* Use `try` only when we're unsure if the receiver would respond_to the methodAkira Matsuda2019-08-011-2/+2
|
* Fix db:seedeileencodes2019-07-311-0/+19
| | | | | | | | | | | | | | | | | | | The `rake db:seed` command was broken for the primary environment if the application is using multiple databases. We never implemented `rake db:seed` for other databases (coming soon), but that shouldn't break the default case. The reason this was broken was because `abort_if_pending_migrations` would loop through the configs for all databases and check for migrations but would leave the last established connection. So `db:seed` was looking in the wrong database for the table to seed. This PR doesn't fix the fact that `db:seed` doesn't work for multiple databases but does fix the default case. Fixes #36817 Co-authored-by: John Crepezzi <john.crepezzi@gmail.com>
* Address to rubocop offencesRyuta Kamizono2019-07-313-4/+4
|
* Remove redundant empty line when we don't use system testmeganemura2019-07-291-1/+1
|
* Use match? where we don't need MatchDataAkira Matsuda2019-07-2910-16/+16
|
* Let the generated initializers/backtrace_silencers.rb code use Regexp#match?Akira Matsuda2019-07-291-1/+1
|
* Add viewport meta tag to default application templateLachlan Campbell2019-07-281-0/+1
|
* Improves compatibility of require_dependency in zeitwerk mode [Closes #36774]Xavier Noria2019-07-281-0/+29
| | | | | | | | | | | | | | | Applications are not supposed to use require_dependency in their own code if running in zeitwerk mode, and require_dependency was initially aliased to require with that use case in mind. However, there are situations in which you cannot control the mode and need to be compatible with both. There, you might need require_dependency in case you are being executed in classic mode. Think about engines that want to support both modes in their parent applications, for example. Furthermore, Rails itself loads helpers using require_dependency. Therefore, we need better compatibility.
* Use match? where we don't need MatchDataAkira Matsuda2019-07-275-5/+5
| | | | We're already running Performance/RegexpMatch cop, but it seems like the cop is not always =~ justice
* Do not use the same temp file in different testsyuuji.yaginuma2019-07-271-4/+5
| | | | | It causes unexpected results when running tests in parallel. Ref: https://buildkite.com/rails/rails/builds/62610#0165f6d9-b9c8-4948-9319-07b58bfbfd4f/989-998
* Merge pull request #36777 from Edouard-chin/ec-git-pretty-credentialsRafael França2019-07-264-9/+185
|\ | | | | Prettify diff generated by git for encrypted file:
| * Prettify diff generated by git for encripted file:Edouard CHIN2019-07-264-9/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - @sinsoku had the idea and started implementing it few months ago but sadly didn't finish it. This PR is taking over his work. The credentials feature has changed a lot since @sinsoku opened hi PR, it was easier to just restart from scratch instead of checking out his branch. Sinsoku will get all the credit he deserves for this idea :) TL;DR on that that feature is to make the `git diff` or `git log` of encrypted files to be readable. The previous implementation was only setting up the git required configuration for the first time Rails was bootstraped, so I decided to instead provide the user a choice to opt-in for readable diff credential whenever a user types the `bin/rails credentials:edit` command. The question won't be asked in the future the user has already answered or if the user already opted in. Co-authored-by: Takumi Shotoku <insoku.listy@gmail.com>
* | Removed webpacker:compile step from scaffold test as it is not required and ↵Abhay Nikam2019-07-261-2/+0
| | | | | | | | assets are already precompiled in build_app step
* | Merge pull request #36747 from ↵y-yagi2019-07-261-0/+5
|\ \ | | | | | | | | | | | | y-yagi/add_mention_about_collection_cache_versioning Add mention about `active_record.collection_cache_versioning` to the `new_framework_defaults.rb`
| * | Add mention about `active_record.collection_cache_versioning` to the ↵yuuji.yaginuma2019-07-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | `new_framework_defaults.rb` All other recommended new configurations that set in `load_defaults` are already mentioned in `new_framework_defaults.rb`. So `active_record.collection_cache_versioning` should also be mentioned.
* | | Merge pull request #36731 from jhawthorn/dir_glob_base_instead_of_chdirJohn Hawthorn2019-07-251-6/+4
|\ \ \ | |_|/ |/| | Use Dir.glob(base: ...) to avoid chdir
| * | Use Dir.glob(base: ...) to avoid chdirJohn Hawthorn2019-07-221-6/+4
| | |
* | | let autoloaded? support modules with overridden names [closes #36757]Xavier Noria2019-07-251-0/+9
| | |
* | | read configuration to determine excluded eager loaded directory (#36354)Andrew Kress2019-07-252-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * read config/webpacker.yml to determine which path to exclude for zeitwerk:check * fix test errors * more changes to fix test errors * refactor webpacker_path [Andrew Kress + Rafael Mendonça França]
* | | Merge pull request #34218 from eliotsykes/filter-common-sensitive-paramsRafael França2019-07-241-1/+3
|\ \ \ | | | | | | | | Add common sensitive names to generated filter parameters
| * | | Add common sensitive names to generated filter parametersEliot Sykes2018-11-201-1/+3
| | | | | | | | | | | | | | | | | | | | These added names are distilled from the filter_parameters config of a number of open source Rails applications.
| * | | Add secret to generated filter parametersEliot Sykes2018-11-201-1/+1
| | | |
* | | | Merge pull request #36741 from Edouard-chin/ec-system-test-url-optionsEileen M. Uchitelle2019-07-241-0/+45
|\ \ \ \ | | | | | | | | | | Define the `url_options` needed for SytemTest inside the route proxy:
| * | | | Define the `url_options` needed for SytemTest inside the route proxy:Edouard CHIN2019-07-241-0/+45
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I made a change in https://github.com/rails/rails/pull/36691 to delegate route helper to a proxy class. This didn't take into account that the `url_options` we redefine in SystemTest would be ignored. This PR fixes that by definin the url_options inside the proxy
* | | | Merge pull request #36744 from freeletics/fix-db-prepareEileen M. Uchitelle2019-07-241-0/+16
|\ \ \ \ | | | | | | | | | | Fixed db:prepare task to not touch schema when it is disabled
| * | | | Fixed db:prepare task to not touch schema when dump_schema_after_migration ↵Wojciech Wnętrzak2019-07-241-0/+16
| |/ / / | | | | | | | | | | | | is false.
* | | | Merge pull request #36542 from spk/add-pidfile-option-to-puma-confRafael França2019-07-231-0/+3
|\ \ \ \ | |/ / / |/| | | Add pidfile option to puma config template
| * | | Add pidfile option to puma config templateLaurent Arnoud2019-06-231-0/+3
| | | | | | | | | | | | | | | | This allow to call `pumactl` directly without extra parameters needed
* | | | Make Active Storage routes optionalGannon McGibbon2019-07-221-0/+15
| | | | | | | | | | | | | | | | Add configuration option to turn off drawing of Active Storage routes.
* | | | Move the deprecation call after the new class has been defined:Edouard CHIN2019-07-221-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If we create the deprecation before the new class is defined this creates an issue in case you use a `TracePoint`. The `Tracepoint#return_value` will try to get the new class constant resulting in a uninitialized constant Rails::SourceAnnotationExtractor The problem can be reproduced like this: ```ruby @defined = Set.new ANONYMOUS_CLASS_DEFINITION_TRACEPOINT = TracePoint.new(:c_return) do |tp| next unless @defined.add?(tp.return_value) end ANONYMOUS_CLASS_DEFINITION_TRACEPOINT.enable require 'rails' require "rails/source_annotation_extractor" ```
* | | | create a newline between blocks when gem_group, github and add_source was ↵masakazutakewaka2019-07-212-12/+51
| | | | | | | | | | | | | | | | called.
* | | | Merge pull request #35285 from ↵y-yagi2019-07-212-16/+63
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | masakazutakewaka/fix_railtie_add_newline_to_gemfile_insertion Add a newline at the end of a Gemfile when it doesn't end with a newline
| * | | Append a newline to the Gemfile if it doesn't end with a newlinemasakazutakewaka2019-07-192-16/+63
| | | |
* | | | Preserve existing attachment assignment behavior for upgraded appsGeorge Claghorn2019-07-202-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning to a collection of attachments appends rather than replacing, as in 5.2. Existing 5.2 apps that rely on this behavior will no longer break when they're upgraded to 6.0. For apps generated on 6.0 or newer, assigning replaces the existing attachments in the collection. #attach should be used to add new attachments to the collection without removing existing ones. I expect that we'll deprecate the old behavior in 6.1. Closes #36374.
* | | | Merge pull request #36603 from y-yagi/add_skip_collision_check_optionYuji Yaginuma2019-07-182-2/+15
|\ \ \ \ | | | | | | | | | | Add `skip-collision-check` option to generator
| * | | | Add `skip-collision-check` option to generatoryuuji.yaginuma2019-07-052-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until Rails 5.2, generators can run same name multi times without destroying. But Rails 6.0(with Zeitwerk) can't this. In Rails 6.0, an error occurs due to class name collision check. The check uses `const_defined?`, which assumes that the autoload object is also defined. https://ruby-doc.org/core-2.6.3/Module.html#method-i-const_defined-3F It did not work until Rails 5.2, but Zeitwerk seems to be able to correctly check this against the application's code. However, this is a little inconvenient if want to run the generator again like mistake an attribute name(need to run `destoy` before). In order to solve this, this PR adds an option to skip the collision check. With this option, you can overwrite files just as did until Rails 5.2.
* | | | | Merge pull request #36663 from igor04/load_database_yaml_fixEileen M. Uchitelle2019-07-152-1/+6
|\ \ \ \ \ | | | | | | | | | | | | Prevent exception of loading database yaml with blank config file
| * | | | | Prevent exception of loading database yaml with blank config file [closes: ↵igor042019-07-122-1/+6
| |/ / / / | | | | | | | | | | | | | | | #36661]