aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Indentation >>Akira Matsuda2019-03-131-3/+3
| |
* | Fix rubocop violationsyuuji.yaginuma2019-03-131-1/+1
| |
* | Add test for runner command with `environment` optionyuuji.yaginuma2019-03-131-0/+4
| |
* | Add additional ERB DummyCompiler testsCliff Pruitt2019-03-121-0/+54
| | | | | | | | This adds a few additional tests to the commits by eileencodes (https://github.com/rails/rails/pull/35497) and rafaelfranca (https://github.com/rails/rails/commit/cfa22f1a4b5e8b95ee01a432168de2f831b3f788). The additional tests cover several more ERB tag formatting cases such as multiline tags, conditional statements that result in duplicate keys, and multiple erb statements on a single line.
* | overriden -> overridden [ci skip]Sharang Dashputre2019-03-121-1/+1
| |
* | Do not generate dummy string when the tag used is not the <%=Rafael Mendonça França2019-03-112-1/+5
| |
* | Merge pull request #34955 from bogdanvlviv/follow-up-33962Kasper Timm Hansen2019-03-112-3/+5
|\ \ | | | | | | Add `config.credentials.content_path` and `config.credentials.key_path` to the guide
| * | Add `config.credentials.content_path` and `config.credentials.key_path` to ↵bogdanvlviv2019-01-172-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | the guide - Fix some typos Follow up #33962
* | | [ci skip] Improve `encrypted` commands USAGEKasper Timm Hansen2019-03-111-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This streamlines the lovely foundation Bogdan added. Mainly to add guidance around encryption keys and remove some backticks. Finally it adds some mention of how to access these files from Ruby in apps. [ Kasper Timm Hansen & bogdanvlviv ]
* | | Merge pull request #34965 from bogdanvlviv/improve-rails-encrypted--helpKasper Timm Hansen2019-03-112-0/+23
|\ \ \ | | | | | | | | Improve output of `rails encrypted(:edit/:show) --help`
| * | | Improve output of `rails encrypted(:edit/:show) --help`bogdanvlviv2019-01-172-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | With these simple examples, It will be easier for users to figure out how to use these commands. Related to 68479d09ba6bbd583055672eb70518c1586ae534
* | | | Merge pull request #35568 from prathamesh-sonpatki/server_squishRyuta Kamizono2019-03-111-1/+1
|\ \ \ \ | | | | | | | | | | Squish the deprecation messages across the codebase
| * | | | Squish the deprecation messages across the codebasePrathamesh Sonpatki2019-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sample example -> Before: prathamesh@Prathameshs-MacBook-Pro-2 blog *$ rails server thin DEPRECATION WARNING: Passing the Rack server name as a regular argument is deprecated and will be removed in the next Rails version. Please, use the -u option instead. After: prathamesh@Prathameshs-MacBook-Pro-2 squish_app *$ rails server thin DEPRECATION WARNING: Passing the Rack server name as a regular argument is deprecated and will be removed in the next Rails version. Please, use the -u option instead.
* | | | | Merge pull request #35569 from prathamesh-sonpatki/env-varsKasper Timm Hansen2019-03-112-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Mention `environment variable` instead of just `environment`
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 03:38:36 +0000