aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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`
| * | | | | Mention `environment variable` instead of just `environment`Prathamesh Sonpatki2019-03-112-4/+4
| |/ / / /
* / / / / Use the -u switch for the `rails server` bannerPrathamesh Sonpatki2019-03-111-1/+1
|/ / / / | | | | | | | | | | | | | | | | - Because just passing the server argument to this command is deprecated in https://github.com/rails/rails/pull/32058
* | | | Merge pull request #35121 from utilum/warning_tried_to_create_proc_without_blockKasper Timm Hansen2019-03-101-2/+2
|\ \ \ \ | | | | | | | | | | Ruby 2.7 warning: creating a Proc without a block
| * | | | Ruby 2.7 warning: creating a Proc without a blockutilum2019-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of [Revision 66772]( https://bugs.ruby-lang.org/projects/ruby-trunk/repository/trunk/revisions/66772) `Proc.new` without giving a block emits `warning: tried to create Proc object without a block`. This commit fixes cases where Rails test suit tickles this warning. See CI logs: https://travis-ci.org/rails/rails/jobs/487205819#L1161-L1190 https://travis-ci.org/rails/rails/jobs/487205821#L1154-1159 https://travis-ci.org/rails/rails/jobs/487205821#L1160-L1169 https://travis-ci.org/rails/rails/jobs/487205821#L1189 https://travis-ci.org/rails/rails/jobs/487254404#L1307-L1416 https://travis-ci.org/rails/rails/jobs/487254405#L1174-L1191
* | | | | Fix links in gemspec and docs from http to https.Abhay Nikam2019-03-092-4/+4
| | | | |
* | | | | Merge pull request #35529 from ↵Ryuta Kamizono2019-03-092-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | abhaynikam/35492-follow-up-to-updates-links-to-https Updated links from http to https in guides, docs, etc
| * | | | | Updated links from http to https in guides, docs, etcAbhay Nikam2019-03-092-2/+2
| | | | | |
* | | | | | [ci skip] Minor documentation fixes for consistencyShailesh Kalamkar2019-03-091-1/+1
| | | | | |
* | | | | | Don't lock the webpacker gem by its patch versionSharang Dashputre2019-03-091-1/+1
| | | | | |
* | | | | | Fix "DEPRECATION WARNING: ActionView::Template#initialize requires a locals ↵yuuji.yaginuma2019-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter" Ref: #35411
* | | | | | Merge pull request #35538 from sharang-d/use-latest-webpackerGuillermo Iguaran2019-03-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use the latest stable release of webpacker
| * | | | | | Use the latest stable release of webpackerSharang Dashputre2019-03-091-1/+1
| |/ / / / /
* | | | | | Minor text changes to the db:seed:replant testsSharang Dashputre2019-03-091-2/+2
| | | | | |
* | | | | | moves a require to the file that needs itXavier Noria2019-03-082-1/+2
| | | | | |
* | | | | | Allow autoloader inflectors to be swaped outJean Boussier2019-03-083-2/+13
|/ / / / /
* | | | | Merge pull request #35522 from gmcgibbon/rails_db_system_change_versioningKasper Timm Hansen2019-03-082-5/+30
|\ \ \ \ \ | | | | | | | | | | | | Add version awareness to rails db:system:change
| * | | | | Add version awareness to rails db:system:changeGannon McGibbon2019-03-082-5/+30
| | | | | |
* | | | | | Build assets automatically if necessaryyuuji.yaginuma2019-03-081-0/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | In CI, these are unnecessary because done by preprocessing. To test locally, you need to do it manually. If assets not exist, it will fail when a run specific test, so force to build those only when necessary.
* | | | | Load YAML for rake tasks without parsing ERBeileencodes2019-03-063-12/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a new method that loads the YAML for the database config without parsing the ERB. This may seem odd but bear with me: When we added the ability to have rake tasks for multiple databases we started looping through the configurations to collect the namespaces so we could do `rake db:create:my_second_db`. See #32274. This caused a problem where if you had `Rails.config.max_threads` set in your database.yml it will blow up because the environment that defines `max_threads` isn't loaded during `rake -T`. See #35468. We tried to fix this by adding the ability to just load the YAML and ignore ERB all together but that caused a bug in GitHub's YAML loading where if you used multi-line ERB the YAML was invalid. That led us to reverting some changes in #33748. After trying to resolve this a bunch of ways `@tenderlove` came up with replacing the ERB values so that we don't need to load the environment but we also can load the YAML. This change adds a DummyCompiler for ERB that will replace all the values so we can load the database yaml and create the rake tasks. Nothing else uses this method so it's "safe". DO NOT use this method in your application. Fixes #35468
* | | | | Allow `truncate` for SQLite3 adapter and add `rails db:seed:replant` (#34779)Bogdan2019-03-041-1/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add `ActiveRecord::Base.connection.truncate` for SQLite3 adapter. SQLite doesn't support `TRUNCATE TABLE`, but SQLite3 adapter can support `ActiveRecord::Base.connection.truncate` by using `DELETE FROM`. `DELETE` without `WHERE` uses "The Truncate Optimization", see https://www.sqlite.org/lang_delete.html. * Add `rails db:seed:replant` that truncates database tables and loads the seeds Closes #34765
* | | | | Correctly escape ERB tagyuuji.yaginuma2019-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | Ref: https://travis-ci.org/rails/rails/jobs/501220262#L1194
* | | | | Add an example about how to load images under app/javascript/imagesGuillermo Iguaran2019-03-031-0/+8
| |_|_|/ |/| | | | | | | Similarly to https://github.com/rails/webpacker/pull/1976
* | | | Preparing for 6.0.0.beta2 releaseRafael Mendonça França2019-02-252-1/+3
| | | |
* | | | Depend on bootsnap 1.4.1Rafael Mendonça França2019-02-251-1/+1
| | | | | | | | | | | | | | | | This is needed to fix #35278.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 14:35:13 +0000