aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
Commit message (Collapse)AuthorAgeFilesLines
* Fix generator suggestion raise error when I18n.available_locales don’t ↵willnet2017-11-221-1/+2
| | | | include :en
* Fix formatting of `credentials` and `encrypted` [ci skip]yuuji.yaginuma2017-11-191-8/+8
|
* Deprecate an `after_bundle` callback in Rails plugin templatesyuuji.yaginuma2017-11-181-0/+4
| | | | | | | | | Since fbd1e98cf983572ca9884f17f933ffe92833632a, Rails plugin does not run `bundle install` when generating. Therefore, `after_bundle` callback is not actually executed after `bundle`. Since there is a difference between the name and the actual behavior, I think that should be remove.
* Fixed example of `Rails.application.encrypted` method usageWojciech Wnętrzak2017-11-161-1/+1
| | | | [ci skip]
* Add master key to `gitignore` on `rails new`yuuji.yaginuma2017-11-163-1/+11
| | | | | | | We generate master key on `rails new`. Therefore, if do not add master key to `.gitginore` on `rails new`as well, there is a possibility that the master key will be committed accidentally.
* Pass options onto key file generator.Kasper Timm Hansen2017-11-151-1/+1
|
* Merge branch 'freeletics-manage-multiple-credential-files'Kasper Timm Hansen2017-11-157-40/+253
|\ | | | | | | Fixes https://github.com/rails/rails/pull/30940
| * Add CLI to manage encrypted files/configs.Wojciech Wnętrzak2017-11-158-49/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To edit/show encrypted file: ``` bin/rails encrypted:edit config/staging_tokens.yml.enc bin/rails encrypted:edit config/staging_tokens.yml.enc --key config/staging.key bin/rails encrypted:show config/staging_tokens.yml.enc ``` Also provides a backing Rails.application.encrypted API for Ruby access: ```ruby Rails.application.encrypted("config/staging_tokens.yml.enc").read Rails.application.encrypted("config/staging_tokens.yml.enc").config Rails.application.encrypted("config/staging_tokens.yml.enc", key: "config/staging.key") ```
* | Go through a single credentials instance.Kasper Timm Hansen2017-11-151-9/+10
| | | | | | | | Instead of stashing the values in constants.
* | Merge pull request #30004 from npenzin/patch-1Yuji Yaginuma2017-11-151-1/+1
|\ \ | | | | | | Update plugin_generator.rb
| * | Ensure plugin_generator adds to new line in GemfileNikita Penzin2017-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Ensure plugin_generator adds to new line in Gemfile, even if the Gemfile does not end with an empty line. [Lisa Ugray, Nikita Penzin]
* | | Use released arelRafael Mendonça França2017-11-141-5/+2
| |/ |/|
* | Use .tt extension to all the template filesRafael Mendonça França2017-11-1397-2/+2
| | | | | | | | | | | | | | | | Make clear that the files are not to be run for interpreters. Fixes #23847. Fixes #30690. Closes #23878.
* | Merge pull request #30773 from y-yagi/fix_30765Eileen M. Uchitelle2017-11-121-0/+3
|\ \ | | | | | | Make automatically synchronize test schema work inside engine
| * | Make automatically synchronize test schema work inside engineyuuji.yaginuma2017-10-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails engine, migration files are in under `db/migrate` of engine. Therefore, when rake task is executed in engine, `db/migrate` is automatically added to `DatabaseTasks.migrations_paths`. https://github.com/rails/rails/blob/a18cf23a9cbcbeed61e8049442640c7153e0a8fb/activerecord/lib/active_record/railtie.rb#L39..L43 However, if execute the rake task under dummy app, migration files will not be loaded because engine's migration path setting process is not called. Therefore, in order to load migration files correctly, it is necessary to execute rake task under engine. Fixes #30765
* | | Revert displaying master key generation info on `rails new`.Kasper Timm Hansen2017-11-123-23/+20
| | | | | | | | | | | | | | | It's already a default for new apps, like so many others, so no need to flaunt it.
* | | Deprecate encrypted secrets in favor of credentials.Kasper Timm Hansen2017-11-123-99/+9
| | | | | | | | | | | | | | | | | | | | | | | | Allow edits of existing encrypted secrets generated on Rails 5.1, but refer to credentials when attempting to setup. This also removes the need for any of the setup code, so the generator can be ripped out altogether.
* | | Merge pull request #30770 from ↵Kasper Timm Hansen2017-11-122-2/+3
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/do_not_create_credential_in_dummy_application Do not create credentials in dummy application
| * | | Do not create credentials in dummy applicationyuuji.yaginuma2017-10-022-2/+3
| |/ / | | | | | | | | | | | | Because dummy application is only for use test, so credentials is unnecessary.
* | | Adjust blank linesRyuta Kamizono2017-11-104-4/+5
| | |
* | | Do not show credentials in generators helpyuuji.yaginuma2017-11-091-0/+1
| | | | | | | | | | | | | | | | | | Since credentials generator is executed via the credentials command and does not need to be executed directly, so it is not necessary to show it in help.
* | | Change output log about skipping instalation of Active Storagebogdanvlviv2017-11-081-1/+1
| | | | | | | | | | | | Using of "`" is preferable over "'" to express console command in output log
* | | Do not run `active_storage:install` when bundle install is skippedyuuji.yaginuma2017-11-081-1/+5
| | | | | | | | | | | | | | | | | | | | | In order to execute the `rails` command, need to run bundle install in advance. Therefore, if skipped bundle install, `rails` command may fail and should not do it.
* | | Fix comment in `check_class_collision` [ci skip]yuuji.yaginuma2017-11-071-1/+1
| | | | | | | | | | | | `ScaffoldBase` was changed to `ResourceHelpers` by 0efedf2.
* | | Merge pull request #30101 from bogdanvlviv/initialization-active_storageRafael França2017-11-0616-62/+123
|\ \ \ | | | | | | | | Provide initialization of Active Storage
| * | | Execution of `active_storage:install` should respect `--quiet` during `rails ↵bogdanvlviv2017-11-061-1/+1
| | | | | | | | | | | | | | | | new`
| * | | Rails::Generators::Actions#execute_command allows option `capture`bogdanvlviv2017-11-061-1/+7
| | | |
| * | | `rails new` runs `rails active_storage:install`bogdanvlviv2017-11-062-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Omit `rails activestorage:install` for jdbcmysql, jdbc and shebang tests AppGeneratorTest#test_config_jdbcmysql_database rails aborted! LoadError: Could not load 'active_record/connection_adapters/mysql_adapter'. Make sure that the adapter in config/database.yml is valid. If you use an adapter other than 'mysql2', 'postgresql' or 'sqlite3' add the necessary adapter gem to the Gemfile. (compressed) bin/rails:4:in `<main>' Tasks: TOP => activestorage:install => environment (See full trace by running task with --trace) AppGeneratorTest#test_config_jdbc_database rails aborted! LoadError: Could not load 'active_record/connection_adapters/jdbc_adapter'. Make sure that the adapter in config/database.yml is valid. If you use an adapter other than 'mysql2', 'postgresql' or 'sqlite3' add the necessary adapter gem to the Gemfile. (compressed) bin/rails:4:in `<main>' Tasks: TOP => activestorage:install => environment (See full trace by running task with --trace) AppGeneratorTest#test_shebang_is_added_to_rails_file /home/ubuntu/.rbenv/versions/2.4.1/bin/ruby: no Ruby script found in input (LoadError) Prevent PendingMigrationError in tests * Run `bin/rails db:migrate RAILS_ENV=test` in test_cases before start tests to prevent PendingMigrationError * FileUtils.rm_r("db/migrate") * --skip-active-storage Fix failed tests in `railties/test/railties/engine_test.rb` Related to #30111 Imporve `SharedGeneratorTests#test_default_frameworks_are_required_when_others_are_removed` - Explicitly skip active_storage - Ensure that skipped frameworks are commented - Ensure that default frameworks are not commented Fix error `Errno::ENOSPC: No space left on device - sendfile` Since `rails new` runs `rails active_storage:install` that boots an app. Since adding Bootsnap 0312a5c67e35b960e33677b5358c539f1047e4e1 during booting an app, it creates the cache: 264K tmp/cache/bootsnap-load-path-cache 27M tmp/cache/bootsnap-compile-cache * teardown_app must remove app
| * | | Add --skip-active-storage and do so automatically when --skip-active-record ↵bogdanvlviv2017-11-0615-61/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is used Closes #30102 Revert part 787fe90dc0a7c5b91bb5af51f2858ea8c4676268 --skip-active-storage pass throughs `rails plugin new` Add changelog entry about default initialization of Active Storage
* | | | Remove unused requireyuuji.yaginuma2017-11-061-1/+0
| | | | | | | | | | | | | | | | Since f182831, this file does not use methods added by `module/introspection`.
* | | | Generate the correct path in nested scaffold generatoryuuji.yaginuma2017-11-051-9/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, namespaced scaffold generator will generate an incorrect path and the generated file will not work properly. ``` $ ./bin/rails g scaffold admin/user $ ./bin/rails db:migrate $ ./bin/rails t test/controllers # Running: E Error: Admin::UsersControllerTest#test_should_create_admin_user: NameError: undefined local variable or method `admin_admin_users_url' for #<Admin::UsersControllerTest:0x000055a59f25ff68> Did you mean? admin_users test/controllers/admin/users_controller_test.rb:20:in `block (2 levels) in <class:UsersControllerTest>' test/controllers/admin/users_controller_test.rb:19:in `block in <class:UsersControllerTest>' bin/rails test test/controllers/admin/users_controller_test.rb:18 ``` This is because combine `controller_class_path` and `singular_table_name` to generate route. https://github.com/rails/rails/blob/360698aa245b45349d1d1b12e1afb34759515e69/railties/lib/rails/generators/named_base.rb#L172 Normally, if using namspaced generator, table name already contains namespace. Therefore, adding `controller_class_path` adds extra namespace. Since it is special only when explicitly specifying `model-name`, it is modified to change the value only when `model-name`is specified. Follow up of #30729
* | | Merge pull request #30813 from y-yagi/remove_unused_secrets_ymlRyuta Kamizono2017-10-262-36/+0
|\ \ \ | | | | | | | | Remove unused `secrets.yml` template
| * | | Remove unused `secrets.yml` templateyuuji.yaginuma2017-10-062-36/+0
| | | | | | | | | | | | | | | | | | | | `secrets.yml` no longer used since #30067. Together, removed `app_secret` method that only used in `secrets.yml`
* | | | Merge pull request #30978 from y-yagi/change_vendor_path_to_app_rootGeorge Claghorn2017-10-241-2/+2
|\ \ \ \ | | | | | | | | | | Change `VENDOR_PATH` to `APP_ROOT` in `bin/yarn`
| * | | | Change `VENDOR_PATH` to `APP_ROOT` in `bin/yarn`yuuji.yaginuma2017-10-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable was initially used to hold the vendor directory. https://github.com/rails/rails/commit/3dac36b Therefore, the variable name `VENDOR_PATH` was appropriate. However, `package.json` is now placed in the root of the project. https://github.com/rails/rails/commit/8e9e943 Therefore, like other bin scripts, I think the variable name `APP_ROOT` is appropriate. https://github.com/rails/rails/blob/2c845f6b03ddf2aa233b00385d24d769a4a34fa6/railties/lib/rails/generators/rails/app/templates/bin/setup.tt#L5 https://github.com/rails/rails/blob/2c845f6b03ddf2aa233b00385d24d769a4a34fa6/railties/lib/rails/generators/rails/app/templates/bin/update.tt#L5
* | | | | add _ for unused last argRenan Gurgel2017-10-241-1/+1
| | | | |
* | | | | Space between { and | missing.Renan Gurgel2017-10-231-1/+1
|/ / / / | | | | | | | | Improve a code style recommendation following Rubocop instructions https://codeclimate.com/github/rails/rails/issues
* | | | Avoid slicing from Thor's original HWIAAkira Matsuda2017-10-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because `options` here is not AS::HWIA but an instance of Thor::CoreExt::HWIA that looks very similar to ours but behaves slightly different, we need to keep this object be an instance of Thor::CoreExt::HWIA. Since Ruby 2.5 has Hash#slice that returns a new Hash instance now, we need to avoid calling `slice` on this tricky object.
* | | | [Railties] require_relative => requireAkira Matsuda2017-10-2173-111/+111
| | | | | | | | | | | | | | | | This basically reverts 618268b4b9382f4bcf004a945fe2d85c0bd03e32
* | | | Improve out-of-box experience with System tests including ↵Guillermo Iguaran2017-10-181-0/+2
| | | | | | | | | | | | | | | | chromedriver-helper by default
* | | | redis-rb 4.0 supportJeremy Daer2017-10-081-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | * Use `gem 'redis', '~> 4.0'` for new app Gemfiles * Loosen Action Cable redis-rb dep to `>= 3.3, < 5` * Bump redis-namespace for looser Redis version dep * Avoid using the underlying `redis.client` directly * Use `Redis.new` instead of `Redis.connect`
* / / Implement H2 Early Hints for Railseileencodes2017-10-041-1/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When puma/puma#1403 is merged Puma will support the Early Hints status code for sending assets before a request has finished. While the Early Hints spec is still in draft, this PR prepares Rails to allowing this status code. If the proxy server supports Early Hints, it will send H2 pushes to the client. This PR adds a method for setting Early Hints Link headers via Rails, and also automatically sends Early Hints if supported from the `stylesheet_link_tag` and the `javascript_include_tag`. Once puma supports Early Hints the `--early-hints` argument can be passed to the server to enable this or set in the puma config with `early_hints(true)`. Note that for Early Hints to work in the browser the requirements are 1) a proxy that can handle H2, and 2) HTTPS. To start the server with Early Hints enabled pass `--early-hints` to `rails s`. This has been verified to work with h2o, Puma, and Rails with Chrome. The commit adds a new option to the rails server to enable early hints for Puma. Early Hints spec: https://tools.ietf.org/html/draft-ietf-httpbis-early-hints-04 [Eileen M. Uchitelle, Aaron Patterson]
* | Deprecate secret_token, long since usurped by secret_key_base.Kasper Timm Hansen2017-09-281-0/+6
| | | | | | | | | | | | | | | | | | | | See the changelog entry. Remove `secrets.secret_token` from the bug report templates, since we don't accept bug reports for Rails versions that don't support a `secret_key_base`. [ claudiob & Kasper Timm Hansen ]
* | Merge pull request #30729 from yalab/nested_scaffoldAaron Patterson2017-09-274-10/+39
|\ \ | | | | | | Nested scaffold should be fine
| * | scaffold nested name controller should be fine.yalab2017-09-274-10/+39
| | |
* | | Merge pull request #30614 from kami-zh/yarn-on-bin-updateJavan Makhmali2017-09-271-0/+5
|\ \ \ | |/ / |/| | Align `bin/update`'s Yarn usage with `bin/setup`
| * | Install JavaScript dependencies on updatekami-zh2017-09-161-0/+5
| | |
* | | Respect quiet option in all process of `rails new` commandyuuji.yaginuma2017-09-252-16/+16
| | | | | | | | | | | | | | | If specify the `quiet` option, expect that no status will be shown. However, some process show status. This suppresses all status output.
* | | Merge pull request #30693 from yhirano55/refactor_css_scaffold_generatorKasper Timm Hansen2017-09-241-3/+3
|\ \ \ | | | | | | | | Refactor Css::Generators::ScaffoldGenerator
| * | | Refactor Css::Generators::ScaffoldGeneratorYoshiyuki Hirano2017-09-251-3/+3
| | | | | | | | | | | | | | | | | | | | * define source_root by source_root method * it don't create file, but copy it.