aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Use `execute_batch2` rather than `execute_batch` to fix performance ↵Ryuta Kamizono2019-04-043-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regression for fixture loading d8d6bd5 makes fixture loading to bulk statements by using `execute_batch` for sqlite3 adapter. But `execute_batch` is slower and it caused the performance regression for fixture loading. In sqlite3 1.4.0, it have new batch method `execute_batch2`. I've confirmed `execute_batch2` is extremely faster than `execute_batch`. So I think it is worth to upgrade sqlite3 to 1.4.0 to use that method. Before: ``` % ARCONN=sqlite3 bundle exec ruby -w -Itest test/cases/associations/eager_test.rb -n test_eager_loading_too_may_ids Using sqlite3 Run options: -n test_eager_loading_too_may_ids --seed 35790 # Running: . Finished in 202.437406s, 0.0049 runs/s, 0.0049 assertions/s. 1 runs, 1 assertions, 0 failures, 0 errors, 0 skips ARCONN=sqlite3 bundle exec ruby -w -Itest -n test_eager_loading_too_may_ids 142.57s user 60.83s system 98% cpu 3:27.08 total ``` After: ``` % ARCONN=sqlite3 bundle exec ruby -w -Itest test/cases/associations/eager_test.rb -n test_eager_loading_too_may_ids Using sqlite3 Run options: -n test_eager_loading_too_may_ids --seed 16649 # Running: . Finished in 8.471032s, 0.1180 runs/s, 0.1180 assertions/s. 1 runs, 1 assertions, 0 failures, 0 errors, 0 skips ARCONN=sqlite3 bundle exec ruby -w -Itest -n test_eager_loading_too_may_ids 10.71s user 1.36s system 95% cpu 12.672 total ```
* Add test that the listen gem is included when RUBY_ENGINE is not 'ruby'Benoit Daloze2019-04-031-0/+16
| | | | | * The fix is already in master since https://github.com/rails/rails/pull/34243 * See https://github.com/rails/rails/pull/35482 for the fix in Rails 5.2
* Don't normalize `original_app_name`Ryuta Kamizono2019-04-031-2/+2
| | | | | `original_app_name` is used to show error message if giving app name is invalid, it should be shown raw app name.
* Auto-correct rubocop offencesRyuta Kamizono2019-04-031-2/+2
|
* Merge pull request #35805 from excid3/attachments-field-generatorsRafael França2019-04-0212-25/+124
|\ | | | | Add attachment and attachments field generators
| * Add attachment and attachments field generatorsChris Oliver2019-03-3012-25/+124
| |
* | Merge pull request #35768 from robertomiranda/r/rake-db-prepareEileen M. Uchitelle2019-04-022-0/+36
|\ \ | | | | | | Add db:prepare rake task.
| * | Add migration in case of db:drop assertionRoberto Miranda2019-04-021-0/+7
| | |
| * | 💇Roberto Miranda2019-04-022-2/+1
| | |
| * | Add test cases for rake db:prepareRoberto Miranda2019-04-022-0/+30
| | |
* | | Merge pull request #35703 from y-yagi/add_database_option_to_dbconsole_commandYuji Yaginuma2019-04-023-13/+42
|\ \ \ | | | | | | | | Rename `connection` option to `database` in `dbconsole` command
| * | | Rename `connection` option to `database` in `dbconsole` commandyuuji.yaginuma2019-04-023-13/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We introduced `connection` option for specifying spec with 1acd9a6464668d4d54ab30d016829f60b70dbbeb. But now we are using the `database` to specify the same value in other commands. * https://github.com/rails/rails/blob/0a0f115031b64b5335fa88543c40df4194dfb428/activerecord/lib/rails/generators/active_record/migration/migration_generator.rb#L11 * https://github.com/rails/rails/blob/0a0f115031b64b5335fa88543c40df4194dfb428/activerecord/lib/rails/generators/active_record/model/model_generator.rb#L17 The options provided to the users should be uniform. Since the term "database" is used in rake task etc, So I want to be able to use it in `dbconsole` command. Also I deprecated the `connection` option because I think that it would be confusing if there are multiple options to specify a same value.
* | | | [ci skip] Fix typo for recieve -> receiveAbhay Nikam2019-04-021-2/+2
|/ / /
* | | Add Changelog entry for #35732.Connor Shea2019-04-011-0/+6
| | |
* | | Merge pull request #35820 from sharang-d/url-to-URL-except-actionpackRyuta Kamizono2019-04-026-12/+12
|\ \ \ | | | | | | | | url -> URL where apt except inside actionpack/
| * | | url -> URL where apt except inside actionpack/Sharang Dashputre2019-04-016-12/+12
| | | |
* | | | Include final newline in generated .ruby-versionOrhan Toy2019-04-012-1/+3
|/ / /
* | | Tweaks CHANGELOGs and docs [ci skip]Ryuta Kamizono2019-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | * add leading `#` before `=>` since hash rocket is valid Ruby code * add backticks * remove trailing spaces * and more
* | | [ci skip] Fix typo directores -> directoriesAbhay Nikam2019-03-301-1/+1
| | |
* | | optimizes eager loading in :zeitwerk modeXavier Noria2019-03-302-22/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During initialization, the eager load paths of engines are unshifted into AS::Dependencies.autoload_paths. After that, the collection is frozen. (See the initializers in railties/lib/rails/engine.rb.) Hence, there is no eager load path that is not an autoload path too, and so the array difference in the deleted code is always an empty array. Just do nothing.
* | | fixes eager loading edge case in :zeitwerk modeXavier Noria2019-03-302-2/+33
| |/ |/|
* | Add rich_text field to model generatorsChris Oliver2019-03-285-11/+73
|/
* bumps Zeitwerk and BootsnapXavier Noria2019-03-262-1/+6
|
* Reword test names in credentials_test.rbSharang Dashputre2019-03-251-4/+4
|
* Cleanup guide for configuring config.disable_sandbox and related changelog ↵Vipul A M2019-03-251-2/+2
| | | | [ci skip] (#35733)
* Merge pull request #35732 from rails/webdriversGuillermo Iguaran2019-03-242-4/+4
|\ | | | | Replace chromedriver-helper with webdrivers
| * Use webdrivers instead of chromedriver-helper in new appsGuillermo Iguaran2019-03-242-4/+4
| |
* | Merge pull request #35723 from sikachu/disable-sandbox-flagGuillermo Iguaran2019-03-246-5/+52
|\ \ | |/ |/| Add config.disable_sandbox option to Rails console
| * Add config.disable_sandbox option to Rails consolePrem Sichanugrist2019-03-236-5/+52
| | | | | | | | | | | | | | | | | | | | | | A long-running `rails console --sandbox` could cause a database server to become out-of-memory as it's holding on to changes that happen on the database. Given that it's common for Ruby on Rails application with huge traffic to have separate write database and read database, we should allow the developers to disable this sandbox option to prevent someone from accidentally causing the Denial-of-Service on their server.
* | Merge pull request #35718 from ↵Yuji Yaginuma2019-03-242-2/+24
|\ \ | | | | | | | | | | | | y-yagi/add_secret_key_base_when_creating_new_credentials Add `secret_key_base` when creating new credential file
| * | Add `secret_key_base` when creating new credential fileyuuji.yaginuma2019-03-232-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | Since `secret_key_base` is expected to be included in credential file, `secret_key_base` should be included even if re-create the file. This is the same behavior as creating a new app. When env is specified, it may be unnecessary, so I added it only when not specifying env.
* | | Update comment for how secret key is calculatedJohn Hawthorn2019-03-221-1/+2
|/ / | | | | | | | | | | | | This updates the comment to reflect how the secret key is generated since 4c743587ad6a31908503ab317e37d70361d49e66 Fixes #35717
* / Update CHANGELOGs for 6.0.0.beta3 releaseJohn Hawthorn2019-03-221-1/+11
|/
* Fix server restart test on Puma 3.12.1yuuji.yaginuma2019-03-221-2/+2
| | | | | | | | | | | Since https://github.com/puma/puma/pull/1700, the default host is correctly used. So `localhost` is used instead of `0.0.0.0`. As a result, the log output on restart is changed, and the restart test fails on Puma 3.12.1. https://travis-ci.org/rails/rails/jobs/509239592#L2303-L2305 Specify binding explicitly to avoid being affected by Puma changes.
* Merge pull request #35661 from jhawthorn/lookup_context_validationEileen M. Uchitelle2019-03-201-1/+1
|\ | | | | Validate types assigned to LookupContext#formats=
| * Use symbol for mail preview format, not stringJohn Hawthorn2019-03-181-1/+1
| |
* | Make aliases of `database` option in generators workyuuji.yaginuma2019-03-203-0/+30
| | | | | | | | | | | | | | | | | | | | | | Thor automatically adds `-` if aliases do not start with `-`. https://github.com/erikhuda/thor/blob/0879c1773d188902d54f95174f33961ac33111f8/lib/thor/parser/options.rb#L53 But Thor follows a convention of one-dash-one-letter options. So, even if `-` is added to `db`, it does not work. https://github.com/erikhuda/thor/blob/0879c1773d188902d54f95174f33961ac33111f8/lib/thor/parser/options.rb#L4 Follow up #34021.
* | Revert "Revert "Remove `javascripts` and `javascript_engine` options for ↵Nicholas La Roux2019-03-201-2/+0
| | | | | | | | generators""
* | Merge pull request #35656 from ↵Rafael França2019-03-191-0/+2
|\ \ | | | | | | | | | | | | larouxn/revert-34277-remove-javascripts-javascripts_engine-options-for-generators Revert "Remove `javascripts` and `javascript_engine` options for generators"
| * | Revert "Remove `javascripts` and `javascript_engine` options for generators"Nicholas La Roux2019-03-191-0/+2
| |/
* / Fix database configuration when adding another config leveleileencodes2019-03-181-0/+2
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is kind of hard to explain but if you have a database config with another level like this: ``` development: primary: database: "my db" variables: statement_timeout: 1000 ``` the database configurations code would chooke on the `variables` level because it didn't know what to do with it. We'd see the following error: ``` lib/active_record/database_configurations.rb:72:in `block in find_db_config': undefined method `env_name' for [nil]:Array (NoMethodError) ``` The problem here is that Rails does correctly identify this as not a real configuration but returns `[nil]` along with the others. We need to make sure to flatten the array and remove all the `nil`'s before returning the `configurations` objects. Fixes #35646
* Added release notes for changes in Railties [ci skip] (#35622)प्रथमेश Sonpatki2019-03-181-2/+2
| | | [Alex Kitchens, Prathamesh Sonpatki]
* Add -e/--environment option to `rails initializers`yuuji.yaginuma2019-03-163-2/+29
| | | | This allows specifying the environment as would any other rails commands.
* Engines are reloaded in Zeitwerk mode [closes #35618]Xavier Noria2019-03-151-14/+19
|
* Properly expand the environment's name in all commandsyuuji.yaginuma2019-03-157-12/+48
| | | | | | | | | | | | | Since 3777701f1380f3814bd5313b225586dec64d4104, the environment's name is automatically expanded in console and dbconsole commands. In order to match the behavior between the commands, fixes it to have the same behavior of all the commands. This behavior is defined in `EnvironmentArgument`. Since `EnvironmentArgument` also defines the environment option, it is reused. However, since desc was not content that can be used in all comments, fixed desc to be defined for each command.
* Make application work without tmp directoryyuuji.yaginuma2019-03-142-0/+4
| | | | | | | | | | | | The tmp directory is added to version control in the newly created application. This was added in Rails 5.0.0(https://github.com/rails/rails/commit/f06ce4c12a396795a3b2c1812951d9277bcb3a82). However, applications created before that are not guaranteed to have the tmp directory. If the tmp directory does not exist, writing to the key file raise error. This is a bit incompatible. So I fixed that create the directory before writing a key.
* Fix secret_key_base for Railtieseileencodes2019-03-132-0/+2
| | | | | | This was missed in the security fix for local dev. CI doesn't have a tmp directory in the apps built for testing so these end up failing. This adds the secret_key_base so we don't need to generate one.
* Merge tag 'v6.0.0.beta3'eileencodes2019-03-135-4/+45
|\ | | | | | | v6.0.0.beta3 release
| * Prep releaseeileencodes2019-03-112-1/+6
| | | | | | | | | | | | | | * Update RAILS_VERSION * Bundle * rake update_versions * rake changelog:header
| * Fix possible dev mode RCEAaron Patterson2019-03-103-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | If the secret_key_base is nil in dev or test generate a key from random bytes and store it in a tmp file. This prevents the app developers from having to share / checkin the secret key for dev / test but also maintains a key between app restarts in dev/test. [CVE-2019-5420] Co-Authored-By: eileencodes <eileencodes@gmail.com> Co-Authored-By: John Hawthorn <john@hawthorn.email>