aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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-2174-115/+115
| | | | | | | | This basically reverts 618268b4b9382f4bcf004a945fe2d85c0bd03e32
* | Merge pull request #30579 from ↵Sean Griffin2017-10-181-0/+47
|\ \ | | | | | | | | | | | | bogdanvlviv/fix_ar_internal_metadata_for_a_test_database Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create wrong ar_internal_metadata's data for a test database.
| * | `ActiveRecord::Tasks::DatabaseTasks.load_schema` has always to establish ↵bogdanvlviv2017-10-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | database connection When load schema from `structure.sql`, database connection isn't established. `ActiveRecord::Tasks::DatabaseTasks.load_schema` has to establish database connection since it executes ``` ActiveRecord::InternalMetadata.create_table ActiveRecord::InternalMetadata[:environment] = environment ```
| * | Fix `bin/rails db:setup` and `bin/rails db:test:prepare` create wrong ↵bogdanvlviv2017-10-151-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ar_internal_metadata's data for a test database. Before: ``` $ RAILS_ENV=test rails dbconsole > SELECT * FROM ar_internal_metadata; key|value|created_at|updated_at environment|development|2017-09-11 23:14:10.815679|2017-09-11 23:14:10.815679 ``` After: ``` $ RAILS_ENV=test rails dbconsole > SELECT * FROM ar_internal_metadata; key|value|created_at|updated_at environment|test|2017-09-11 23:14:10.815679|2017-09-11 23:14:10.815679 ``` Fixes #26731.
* | | Improve out-of-box experience with System tests including ↵Guillermo Iguaran2017-10-182-0/+4
| | | | | | | | | | | | chromedriver-helper by default
* | | Merge pull request #30911 from y-yagi/remove_unnecessary_allow_failure_trueRyuta Kamizono2017-10-181-1/+1
|\ \ \ | | | | | | | | Remove unnecessary `allow_failure: true` option
| * | | Remove unnecessary `allow_failure: true` optionyuuji.yaginuma2017-10-181-1/+1
| |/ / | | | | | | | | | | | | `routes` task always returns zero to status, so status is not to non-zeno. Ref: https://github.com/rails/rails/blob/b1867c480dd5476948ff0492ea2f91e2c2fcb04b/railties/lib/rails/tasks/routes.rake#L30
* / / Fix typo in `allow_failure` argument [ci skip]yuuji.yaginuma2017-10-181-1/+1
|/ / | | | | | | Ref: https://github.com/rails/rails/blob/3be123ba26cad461a80d7d680819e71c1388a241/railties/test/isolation/abstract_unit.rb#L243
* | Fix test name for daemon option testyuuji.yaginuma2017-10-141-2/+2
| | | | | | | | | | | | | | In this test file, "server option" refers to the server used to start Rails(e.g. `puma`, `thin`). But this test, "server option" is not specified. Therefore, I think that it is incorrect that `server_option` is included in the test name.
* | Added test case for starting rails with daemon option, this should set the ↵Pierre Hedkvist2017-10-131-0/+12
| | | | | | | | option[:daemonize] to true, otherwise the option[:daemonize] will be set to false
* | Fix "warning: assigned but unused variable - message"yuuji.yaginuma2017-10-121-2/+1
| | | | | | | | Ruby 2.5 warns about this. Ref: https://travis-ci.org/rails/rails/jobs/286338999
* | Merge pull request #30595 from bogdanvlviv/use-railties-rails-commandMatthew Draper2017-10-106-249/+207
|\ \ | | | | | | Improve railties' tests
| * | Improve RakeTest#test_db_test_prepare_when_using_sql_formatbogdanvlviv2017-10-081-3/+1
| | | | | | | | | | | | | | | - Remove redundant setting `RAILS_ENV` for `db:test:prepare`. `db:test:prepare` doesn't require it.
| * | Invoke rails command inside the railties' test app with ↵bogdanvlviv2017-10-083-16/+12
| | | | | | | | | | | | | | | | | | TestHelpers::Generation#rails See #30520
| * | Remove redundant execution of `Dir.chdir(app_path) { }` in railties' testsbogdanvlviv2017-10-084-230/+194
| | |
* | | Merge pull request #30832 from y-yagi/simplify_console_testRyuta Kamizono2017-10-101-16/+3
|\ \ \ | | | | | | | | Simplify parse arguments in `ConsoleTest`
| * | | Simplify parse arguments in `ConsoleTest`yuuji.yaginuma2017-10-081-16/+3
| |/ / | | | | | | | | | | | | If need a parse result of arguments, can obtain it by creating an instance of the command.
* / / redis-rb 4.0 supportJeremy Daer2017-10-082-1/+5
|/ / | | | | | | | | | | | | | | * 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`
* / Remove needless setup from `InfoTest`yuuji.yaginuma2017-10-071-13/+0
|/ | | | | | The `abstract_unit` loads `rails/all`. Therefore, `Rails` is definitely defined. Also, since `Info` is autoloaded, do not need to explicitly load the file. https://github.com/rails/rails/blob/3ede539357acc91e377611cea9dd5f30678e7b2a/railties/lib/rails.rb#L29
* Implement H2 Early Hints for Railseileencodes2017-10-042-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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]
* Fix "warning: method redefined; discarding old test_scaffold_plural_names"yuuji.yaginuma2017-09-301-2/+2
| | | | | | | | | | | | Since warning was issued due to duplication of test names, fix the test name to a meaningful name. This fixes following warnings: ``` railties/test/generators/named_base_test.rb:141: warning: method redefined; discarding old test_scaffold_plural_names railties/test/generators/named_base_test.rb:62: warning: previous definition of test_scaffold_plural_names was here ```
* Deprecate secret_token, long since usurped by secret_key_base.Kasper Timm Hansen2017-09-282-0/+32
| | | | | | | | | | 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-276-10/+75
|\ | | | | Nested scaffold should be fine
| * scaffold nested name controller should be fine.yalab2017-09-276-10/+75
| |
* | 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
| |
* | Remove unused fixturesyuuji.yaginuma2017-09-263-7/+0
| | | | | | | | `about_yml_plugins` is no longer used since 82b9b15
* | Merge pull request #30700 from y-yagi/respect_quiet_optionKasper Timm Hansen2017-09-253-17/+22
|\ \ | | | | | | Respect quiet option in all process of `rails new` command
| * | Respect quiet option in all process of `rails new` commandyuuji.yaginuma2017-09-253-17/+22
| | | | | | | | | | | | | | | If specify the `quiet` option, expect that no status will be shown. However, some process show status. This suppresses all status output.
* | | Fix cookies/session tests broken after merging key rotation.Kasper Timm Hansen2017-09-252-35/+31
|/ / | | | | | | | | | | | | | | | | | | | | | | Based on, yet closes https://github.com/rails/rails/pull/30708 Fix the session test by properly truncating the legacy encryption key for cbc encryption. Borrowed straight from 👆. Fix the cookies test a little differently than the PR. Basically keep every config within the config block. [ Michael Coyne & Kasper Timm Hansen ]
* | Skip complex cookie tests for now; I'll deal with them tomorrow.Kasper Timm Hansen2017-09-242-0/+6
| |
* | 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.
* | | Add key rotation cookies middlewareMichael Coyne2017-09-241-0/+1
| | | | | | | | | | | | | | | | | | Using the action_dispatch.cookies_rotations interface, key rotation is now possible with cookies. Thus the secret_key_base as well as salts, ciphers, and digests, can be rotated without expiring sessions.
* | | Add key rotation message Encryptor and VerifierMichael Coyne2017-09-232-1/+147
|/ / | | | | | | | | | | Both classes now have a rotate method where new instances are added for each call. When decryption or verification fails the next rotation instance is tried.
* | Use `TOPLEVEL_BINDING` in rails runner commandyuuji.yaginuma2017-09-222-2/+14
| | | | | | | | | | | | | | | | | | Binding to capture the local scope. This means that if a constant with same name as constant specified by the user exists in local scope, constant defined in local will use. This is different from what the user expects. Therefore, fixed to use top-level binding instead of local scope. Fixes #30644
* | Merge pull request #30657 from yhirano55/fix_restful_wordingRyuta Kamizono2017-09-201-1/+1
|\ \ | | | | | | Use RESTful instead of restful
| * | Use RESTful instead of restfulYoshiyuki Hirano2017-09-201-1/+1
| | |
* | | Use credentials in `storage.yml` templateyuuji.yaginuma2017-09-201-1/+1
| | | | | | | | | | | | Follow up of #30650
* | | Use credentials, not secrets, for Active Storage (#30650)Claudio B2017-09-192-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to #30067: > This PR will deprecate secrets.yml* and instead adopt > config/credentials.yml.enc to signify what these secrets are specifically > for: Keeping API keys, database passwords, and any other integration > credentials in one place. [ci skip] since only comments are being edited.
* | | Use the default Capybara registered puma server configurationThomas Walpole2017-09-181-1/+1
|/ /
* | Add `mini_magick` to default `Gemfile` as commentYoshiyuki Hirano2017-09-172-0/+7
| | | | | | | | | | | | * If we want to transform image on ActiveStorage, we should bundle `mini_magick`. * I've added comment block to default `Gemfile` to be easier to install this.
* | Merge pull request #30609 from y-yagi/add_tests_for_credentials_commandKasper Timm Hansen2017-09-171-0/+19
|\ \ | | | | | | Add tests for credentials command