railties 5.2.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25be2ea21e6618d4a5c4925a8e2bc17a1085268558eddf1fbac80bfe19c08b08
-  data.tar.gz: 1ff96ab5e5d5822bbbc11b87e3acd71ae326fc18e24c1f8173c9393cd61a8746
+  metadata.gz: 1adfe379d94049a35a1306f22a5d1368e3b88455d57bb1e4764b845f7ec7e0c5
+  data.tar.gz: 1ff026a5d1cc46e2cb543b15568fb2f12915d468a3c3723efd2daa18d70fc04a
 SHA512:
-  metadata.gz: 1585f8b3b3ea57f8350b894e6129b09bdfc518c4bbce249ca048fa832585334d4238e654bec9c6eecb4c3c6f9459299e70f2ea0a07704d8118e2c508eac9176c
-  data.tar.gz: 73b84a73871f51ae45113565928eec4321119c0aa8260498cee99c534d35325c94197033d5a8f0451fdd859e4a2c43f8a20119e72b2586ddb56b465da0516380
+  metadata.gz: 1b297610d901f515027eb7bb31b3bf912437ccc0643276ba5b166216fe41f8f6e74b42783002d8bd1a904fa512b18ffbcb258375d019299918a21c5b6c220cf6
+  data.tar.gz: 9b1c0e55db347c811b93edb2e68dee00b99cd476e917de5e138c09faa4eaaaa1df3a374bc54b09934895c22993080e327d530129ba4163f209cd42d438deaabe

data/CHANGELOG.md

@@ -1,167 +1,371 @@
-## Rails 5.2.0 (April 09, 2018) ##
+## Rails 6.1.0 (December 09, 2020) ##
 
-*   Fix minitest rails plugin.
+*   Added `Railtie#server` hook called when Rails starts a server.
+    This is useful in case your application or a library needs to run
+    another process next to the Rails server. This is quite common in development
+    for instance to run the Webpack or the React server.
 
-    The custom reporters are added only if needed.
+    It can be used like this:
 
-    This will fix conflicts with others plugins.
+    ```ruby
+      class MyRailtie < Rails::Railtie
+        server do
+          WebpackServer.run
+        end
+      end
+    ```
 
-    *Kevin Robatel*
+    *Edouard Chin*
 
-*   Deprecate `after_bundle` callback in Rails plugin templates.
+*   Remove deprecated `rake dev:cache` tasks.
 
-    *Yuji Yaginuma*
+    *Rafael Mendonça França*
 
-*   `rails new` and `rails plugin new` get `Active Storage` by default.
-     Add ability to skip `Active Storage` with `--skip-active-storage`
-     and do so automatically when `--skip-active-record` is used.
+*   Remove deprecated `rake routes` tasks.
 
-    *bogdanvlviv*
+    *Rafael Mendonça França*
 
-*   Gemfile for new apps: upgrade redis-rb from ~> 3.0 to 4.0.
+*   Remove deprecated `rake initializers` tasks.
 
-    *Jeremy Daer*
+    *Rafael Mendonça França*
 
-*   Add `mini_magick` to default `Gemfile` as comment.
+*   Remove deprecated support for using the `HOST` environment variable to specify the server IP.
 
-    *Yoshiyuki Hirano*
+    *Rafael Mendonça França*
 
-*   Derive `secret_key_base` from the app name in development and test environments.
+*   Remove deprecated `server` argument from the rails server command.
 
-    Spares away needless secret configs.
+    *Rafael Mendonça França*
 
-    *DHH*, *Kasper Timm Hansen*
+*   Remove deprecated `SOURCE_ANNOTATION_DIRECTORIES` environment variable support from `rails notes`.
 
-*   Support multiple versions arguments for `gem` method of Generators.
+    *Rafael Mendonça França*
 
-    *Yoshiyuki Hirano*
+*   Remove deprecated `connection` option in the `rails dbconsole` command.
 
-*   Add `--skip-yarn` option to the plugin generator.
+    *Rafael Mendonça França*
 
-    *bogdanvlviv*
+*   Remove depreated `rake notes` tasks.
 
-*   Optimize routes indentation.
+    *Rafael Mendonça França*
 
-    *Yoshiyuki Hirano*
+*   Return a 405 Method Not Allowed response when a request uses an unknown HTTP method.
 
-*   Optimize indentation for generator actions.
+    Fixes #38998.
 
-    *Yoshiyuki Hirano*
+    *Loren Norman*
 
-*   Skip unused components when running `bin/rails` in Rails plugin.
+*   Make railsrc file location xdg-specification compliant
 
-    *Yoshiyuki Hirano*
+    `rails new` will now look for the default `railsrc` file at
+    `$XDG_CONFIG_HOME/rails/railsrc` (or `~/.config/rails/railsrc` if
+    `XDG_CONFIG_HOME` is not set).  If this file does not exist, `rails new`
+    will fall back to `~/.railsrc`.
 
-*   Add `git_source` to `Gemfile` for plugin generator.
+    The fallback behaviour means this does not cause any breaking changes.
 
-    *Yoshiyuki Hirano*
+    *Nick Wolf*
 
-*   Add `--skip-action-cable` option to the plugin generator.
+*   Change the default logging level from :debug to :info to avoid inadvertent exposure of personally
+    identifiable information (PII) in production environments.
 
-    *bogdanvlviv*
+    *Eric M. Payne*
 
-*   Deprecate support for using a `Rails::Application` subclass to start Rails server.
+*   Automatically generate abstract class when using multiple databases.
 
-    *Yuji Yaginuma*
+    When generating a scaffold for a multiple database application, Rails will now automatically generate the abstract class for the database when the database argument is passed. This abstract class will include the connection information for the writing configuration and any models generated for that database will automatically inherit from the abstract class.
 
-*   Add `ruby x.x.x` version to `Gemfile` and create `.ruby-version`
-    root file containing the current Ruby version when new Rails applications are
-    created.
+    Usage:
 
-    *Alberto Almagro*
+    ```bash
+    $ bin/rails generate scaffold Pet name:string --database=animals
+    ```
 
-*   Support `-` as a platform-agnostic way to run a script from stdin with
-    `rails runner`
+    Will create an abstract class for the animals connection.
 
-    *Cody Cutrer*
+    ```ruby
+    class AnimalsRecord < ApplicationRecord
+      self.abstract_class = true
 
-*   Add `bootsnap` to default `Gemfile`.
+      connects_to database: { writing: :animals }
+    end
+    ```
 
-    *Burke Libbey*
+    And generate a `Pet` model that inherits from the new `AnimalsRecord`:
 
-*   Properly expand shortcuts for environment's name running the `console`
-    and `dbconsole` commands.
+    ```ruby
+    class Pet < AnimalsRecord
+    end
+    ```
 
-    *Robin Dupret*
+    If you already have an abstract class and it follows a different pattern than Rails defaults, you can pass a parent class with the database argument.
 
-*   Passing the environment's name as a regular argument to the
-    `rails dbconsole` and `rails console` commands is deprecated.
-    The `-e` option should be used instead.
+    ```bash
+    $ bin/rails generate scaffold Pet name:string --database=animals --parent=SecondaryBase
+    ```
 
-    Previously:
+    This will ensure the model inherits from the `SecondaryBase` parent instead of `AnimalsRecord`
 
-        $ bin/rails dbconsole production
+    ```ruby
+    class Pet < SecondaryBase
+    end
+    ```
 
-    Now:
+    *Eileen M. Uchitelle*, *John Crepezzi*
 
-        $ bin/rails dbconsole -e production
+*   Accept params from url to prepopulate the Inbound Emails form in Rails conductor.
 
-    *Robin Dupret*, *Kasper Timm Hansen*
+    *Chris Oliver*
 
-*   Allow passing a custom connection name to the `rails dbconsole`
-    command when using a 3-level database configuration.
+*   Create a new rails app using a minimal stack.
 
-        $ bin/rails dbconsole -c replica
+      `rails new cool_app --minimal`
 
-    *Robin Dupret*, *Jeremy Daer*
+    All the following are excluded from your minimal stack:
 
-*   Skip unused components when running `bin/rails app:update`.
+    - action_cable
+    - action_mailbox
+    - action_mailer
+    - action_text
+    - active_job
+    - active_storage
+    - bootsnap
+    - jbuilder
+    - spring
+    - system_tests
+    - turbolinks
+    - webpack
 
-    If the initial app generation skipped Action Cable, Active Record etc.,
-    the update task honors those skips too.
+    *Haroon Ahmed*, *DHH*
 
-    *Yuji Yaginuma*
+*   Add default ENV variable option with BACKTRACE to turn off backtrace cleaning when debugging framework code in the
+    generated config/initializers/backtrace_silencers.rb.
 
-*   Make Rails' test runner work better with minitest plugins.
+      `BACKTRACE=1 ./bin/rails runner "MyClass.perform"`
 
-    By demoting the Rails test runner to just another minitest plugin —
-    and thereby not eager loading it — we can co-exist much better with
-    other minitest plugins such as pride and minitest-focus.
+    *DHH*
 
-    *Kasper Timm Hansen*
+*   The autoloading guide for Zeitwerk mode documents how to autoload classes
+    during application boot in a safe way.
 
-*   Load environment file in `dbconsole` command.
+    *Haroon Ahmed*, *Xavier Noria*
 
-    Fixes #29717.
+*   The `classic` autoloader starts its deprecation cycle.
 
-    *Yuji Yaginuma*
+    New Rails projects are strongly discouraged from using `classic`, and we recommend that existing projects running on `classic` switch to `zeitwerk` mode when upgrading. Please check the [_Upgrading Ruby on Rails_](https://guides.rubyonrails.org/upgrading_ruby_on_rails.html) guide for tips.
 
-*   Add `rails secrets:show` command.
+    *Xavier Noria*
 
-    *Yuji Yaginuma*
+*   Adds `rails test:all` for running all tests in the test directory.
 
-*   Allow mounting the same engine several times in different locations.
+    This runs all test files in the test directory, including system tests.
 
-    Fixes #20204.
+    *Niklas Häusele*
 
-    *David Rodríguez*
+*   Add `config.generators.after_generate` for processing to generated files.
 
-*   Clear screenshot files in `tmp:clear` task.
+    Register a callback that will get called right after generators has finished.
 
     *Yuji Yaginuma*
 
-*   Add `railtie.rb` to the plugin generator
+*   Make test file patterns configurable via Environment variables
 
-    *Tsukuru Tanimichi*
+    This makes test file patterns configurable via two environment variables:
+     `DEFAULT_TEST`, to configure files to test, and `DEFAULT_TEST_EXCLUDE`,
+    to configure files to exclude from testing.
 
-*   Deprecate `capify!` method in generators and templates.
+    These values were hardcoded before, which made it difficult to add
+    new categories of tests that should not be executed by default (e.g:
+    smoke tests).
 
-    *Yuji Yaginuma*
+    *Jorge Manrubia*
 
-*   Allow irb options to be passed from `rails console` command.
+*   No longer include `rake rdoc` task when generating plugins.
 
-    Fixes #28988.
+    To generate docs, use the `rdoc lib` command instead.
 
-    *Yuji Yaginuma*
+    *Jonathan Hefner*
+
+*   Allow relative paths with trailing slashes to be passed to `rails test`.
+
+    *Eugene Kenny*
+
+*   Add `rack-mini-profiler` gem to the default `Gemfile`.
+
+    `rack-mini-profiler` displays performance information such as SQL time and flame graphs.
+    It's enabled by default in development environment, but can be enabled in production as well.
+    See the gem [README](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md) for information on how to enable it in production.
+
+    *Osama Sayegh*
+
+*   `rails stats` will now count TypeScript files toward JavaScript stats.
+
+    *Joshua Cody*
+
+*   Run `git init` when generating plugins.
+
+    Opt out with `--skip-git`.
+
+    *OKURA Masafumi*
+
+*   Add benchmark generator.
+
+    Introduce benchmark generator to benchmark Rails applications.
+
+      `rails generate benchmark opt_compare`
+
+    This creates a benchmark file that uses [`benchmark-ips`](https://github.com/evanphx/benchmark-ips).
+    By default, two code blocks can be benchmarked using the `before` and `after` reports.
+
+    You can run the generated benchmark file using:
+      `ruby script/benchmarks/opt_compare.rb`
+
+    *Kevin Jalbert*, *Gannon McGibbon*
+
+*   Cache compiled view templates when running tests by default.
+
+    When generating a new app without `--skip-spring`, caching classes is
+    disabled in `environments/test.rb`. This implicitly disables caching
+    view templates too. This change will enable view template caching by
+    adding this to the generated `environments/test.rb`:
+
+    ```ruby
+    config.action_view.cache_template_loading = true
+    ```
+
+    *Jorge Manrubia*
+
+*   Introduce middleware move operations.
+
+    With this change, you no longer need to delete and reinsert a middleware to
+    move it from one place to another in the stack:
+
+    ```ruby
+    config.middleware.move_before ActionDispatch::Flash, Magical::Unicorns
+    ```
+
+    This will move the `Magical::Unicorns` middleware before
+    `ActionDispatch::Flash`. You can also move it after with:
+
+    ```ruby
+    config.middleware.move_after ActionDispatch::Flash, Magical::Unicorns
+    ```
+
+    *Genadi Samokovarov*
+
+*   Generators that inherit from NamedBase respect `--force` option.
+
+    *Josh Brody*
+
+*   Allow configuration of eager_load behaviour for rake environment:
+
+        config.rake_eager_load
+
+    Defaults to `false` as per previous behaviour.
+
+    *Thierry Joyal*
+
+*   Ensure Rails migration generator respects system-wide primary key config.
+
+    When rails is configured to use a specific primary key type:
+
+    ```ruby
+    config.generators do |g|
+      g.orm :active_record, primary_key_type: :uuid
+    end
+    ```
+
+    Previously:
+
+    ```bash
+    $ bin/rails g migration add_location_to_users location:references
+    ```
+
+    The references line in the migration would not have `type: :uuid`.
+    This change causes the type to be applied appropriately.
+
+    *Louis-Michel Couture*, *Dermot Haughey*
+
+*   Deprecate `Rails::DBConsole#config`.
+
+    `Rails::DBConsole#config` is deprecated without replacement. Use `Rails::DBConsole.db_config.configuration_hash` instead.
+
+    *Eileen M. Uchitelle*, *John Crepezzi*
+
+*   `Rails.application.config_for` merges shared configuration deeply.
+
+    ```yaml
+    # config/example.yml
+    shared:
+      foo:
+        bar:
+          baz: 1
+    development:
+      foo:
+        bar:
+          qux: 2
+    ```
+
+    ```ruby
+    # Previously
+    Rails.application.config_for(:example)[:foo][:bar] #=> { qux: 2 }
+
+    # Now
+    Rails.application.config_for(:example)[:foo][:bar] #=> { baz: 1, qux: 2 }
+    ```
+
+    *Yuhei Kiriyama*
+
+*   Remove access to values in nested hashes returned by `Rails.application.config_for` via String keys.
+
+    ```yaml
+    # config/example.yml
+    development:
+      options:
+        key: value
+    ```
+
+    ```ruby
+    Rails.application.config_for(:example).options
+    ```
+
+    This used to return a Hash on which you could access values with String keys. This was deprecated in 6.0, and now doesn't work anymore.
+
+    *Étienne Barrié*
+
+*   Configuration files for environments (`config/environments/*.rb`) are
+    now able to modify `autoload_paths`, `autoload_once_paths`, and
+    `eager_load_paths`.
+
+    As a consequence, applications cannot autoload within those files. Before, they technically could, but changes in autoloaded classes or modules had no effect anyway in the configuration because reloading does not reboot.
+
+    Ways to use application code in these files:
+
+    * Define early in the boot process a class that is not reloadable, from which the application takes configuration values that get passed to the framework.
+
+        ```ruby
+        # In config/application.rb, for example.
+        require "#{Rails.root}/lib/my_app/config"
+
+        # In config/environments/development.rb, for example.
+        config.foo = MyApp::Config.foo
+        ```
+
+    * If the class has to be reloadable, then wrap the configuration code in a `to_prepare` block:
+
+        ```ruby
+        config.to_prepare do
+          config.foo = MyModel.foo
+        end
+        ```
 
-*   Added a shared section to `config/database.yml` that will be loaded for all environments.
+      That assigns the latest `MyModel.foo` to `config.foo` when the application boots, and each time there is a reload. But whether that has an effect or not depends on the configuration point, since it is not uncommon for engines to read the application configuration during initialization and set their own state from them. That process happens only on boot, not on reloads, and if that is how `config.foo` worked, resetting it would have no effect in the state of the engine.
 
-    *Pierre Schambacher*
+    *Allen Hsu* & *Xavier Noria*
 
-*   Namespace error pages' CSS selectors to stop the styles from bleeding into other pages
-    when using Turbolinks.
+*   Support using environment variable to set pidfile.
 
-    *Jan Krutisch*
+    *Ben Thorner*
 
 
-Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/railties/CHANGELOG.md) for previous changes.
+Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/railties/CHANGELOG.md) for previous changes.

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2018 David Heinemeier Hansson
+Copyright (c) 2004-2020 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/RDOC_MAIN.rdoc

@@ -1,48 +1,55 @@
-== Welcome to \Rails
+= Welcome to \Rails
+
+== What's \Rails
 
 \Rails is a web-application framework that includes everything needed to
 create database-backed web applications according to the
-{Model-View-Controller (MVC)}[http://en.wikipedia.org/wiki/Model-view-controller]
+{Model-View-Controller (MVC)}[https://en.wikipedia.org/wiki/Model-view-controller]
 pattern.
 
 Understanding the MVC pattern is key to understanding \Rails. MVC divides your
-application into three layers, each with a specific responsibility.
+application into three layers: Model, View, and Controller, each with a specific responsibility.
+
+== Model layer
 
-The <em>Model layer</em> represents your domain model (such as Account, Product,
-Person, Post, etc.) and encapsulates the business logic that is specific to
+The <em><b>Model layer</b></em> represents the domain model (such as Account, Product,
+Person, Post, etc.) and encapsulates the business logic specific to
 your application. In \Rails, database-backed model classes are derived from
-ActiveRecord::Base. Active Record allows you to present the data from
+<tt>ActiveRecord::Base</tt>. {Active Record}[link:files/activerecord/README_rdoc.html] allows you to present the data from
 database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in its {README}[link:files/activerecord/README_rdoc.html].
-Although most \Rails models are backed by a database, models can also be ordinary
+methods. Although most \Rails models are backed by a database, models can also be ordinary
 Ruby classes, or Ruby classes that implement a set of interfaces as provided by
-the Active Model module. You can read more about Active Model in its {README}[link:files/activemodel/README_rdoc.html].
+the {Active Model}[link:files/activemodel/README_rdoc.html] module.
 
-The <em>Controller layer</em> is responsible for handling incoming HTTP requests and
+== Controller layer
+
+The <em><b>Controller layer</b></em> is responsible for handling incoming HTTP requests and
 providing a suitable response. Usually this means returning \HTML, but \Rails controllers
 can also generate XML, JSON, PDFs, mobile-specific views, and more. Controllers load and
 manipulate models, and render view templates in order to generate the appropriate HTTP response.
 In \Rails, incoming requests are routed by Action Dispatch to an appropriate controller, and
-controller classes are derived from ActionController::Base. Action Dispatch and Action Controller
-are bundled together in Action Pack. You can read more about Action Pack in its
-{README}[link:files/actionpack/README_rdoc.html].
+controller classes are derived from <tt>ActionController::Base</tt>. Action Dispatch and Action Controller
+are bundled together in {Action Pack}[link:files/actionpack/README_rdoc.html].
+
+== View layer
 
-The <em>View layer</em> is composed of "templates" that are responsible for providing
+The <em><b>View layer</b></em> is composed of "templates" that are responsible for providing
 appropriate representations of your application's resources. Templates can
 come in a variety of formats, but most view templates are \HTML with embedded
 Ruby code (ERB files). Views are typically rendered to generate a controller response,
-or to generate the body of an email. In \Rails, View generation is handled by Action View.
-You can read more about Action View in its {README}[link:files/actionview/README_rdoc.html].
-
-Active Record, Active Model, Action Pack, and Action View can each be used independently outside \Rails.
-In addition to that, \Rails also comes with Action Mailer ({README}[link:files/actionmailer/README_rdoc.html]), a library
-to generate and send emails; Active Job ({README}[link:files/activejob/README_md.html]), a
-framework for declaring jobs and making them run on a variety of queueing
-backends; Action Cable ({README}[link:files/actioncable/README_md.html]), a framework to
-integrate WebSockets with a \Rails application;
-Active Storage ({README}[link:files/activestorage/README_md.html]), a library to attach cloud
-and local files to \Rails applications;
-and Active Support ({README}[link:files/activesupport/README_rdoc.html]), a collection
+or to generate the body of an email. In \Rails, View generation is handled by {Action View}[link:files/actionview/README_rdoc.html].
+
+== Frameworks and libraries
+
+{Active Record}[link:files/activerecord/README_rdoc.html], {Active Model}[link:files/activemodel/README_rdoc.html],
+{Action Pack}[link:files/actionpack/README_rdoc.html], and {Action View}[link:files/actionview/README_rdoc.html] can each be used independently outside \Rails.
+In addition to that, \Rails also comes with {Action Mailer}[link:files/actionmailer/README_rdoc.html], a library
+to generate and send emails; {Action Mailbox}[link:files/actionmailbox/README_md.html], a library to receive emails within a Rails application;
+{Active Job}[link:files/activejob/README_md.html], a framework for declaring jobs and making them run on a variety of queueing
+backends; {Action Cable}[link:files/actioncable/README_md.html], a framework to
+integrate WebSockets with a \Rails application; {Active Storage}[link:files/activestorage/README_md.html],
+a library to attach cloud and local files to \Rails applications; {Action Text}[link:files/actiontext/README_md.html], a library to handle rich text content;
+and {Active Support}[link:files/activesupport/README_rdoc.html], a collection
 of utility classes and standard library extensions that are useful for \Rails,
 and may also be used independently outside \Rails.
 
@@ -61,7 +68,7 @@ and may also be used independently outside \Rails.
 3. Change directory to +myapp+ and start the web server:
 
     $ cd myapp
-    $ rails server
+    $ bin/rails server
 
    Run with <tt>--help</tt> or <tt>-h</tt> for options.
 
@@ -70,18 +77,17 @@ and may also be used independently outside \Rails.
 5. Follow the guidelines to start developing your application. You may find the following resources handy:
 
    * The \README file created within your application.
-   * {Getting Started with \Rails}[http://guides.rubyonrails.org/getting_started.html].
-   * {Ruby on \Rails Guides}[http://guides.rubyonrails.org].
-   * {The API Documentation}[http://api.rubyonrails.org].
-   * {Ruby on \Rails Tutorial}[https://www.railstutorial.org/book].
+   * {Getting Started with \Rails}[https://guides.rubyonrails.org/getting_started.html].
+   * {Ruby on \Rails Guides}[https://guides.rubyonrails.org].
+   * {The API Documentation}[https://api.rubyonrails.org].
 
 == Contributing
 
 We encourage you to contribute to Ruby on \Rails! Please check out the
-{Contributing to Ruby on \Rails guide}[http://guides.rubyonrails.org/contributing_to_ruby_on_rails.html] for guidelines about how to proceed. {Join us!}[http://contributors.rubyonrails.org]
+{Contributing to Ruby on \Rails guide}[https://guides.rubyonrails.org/contributing_to_ruby_on_rails.html] for guidelines about how to proceed. {Join us!}[http://contributors.rubyonrails.org]
 
 Trying to report a possible security vulnerability in \Rails? Please
-check out our {security policy}[http://rubyonrails.org/security/] for
+check out our {security policy}[https://rubyonrails.org/security/] for
 guidelines about how to proceed.
 
 Everyone interacting in \Rails and its sub-projects' codebases, issue trackers, chat rooms, and mailing lists is expected to follow the \Rails {code of conduct}[http://rubyonrails.org/conduct/].

data/README.rdoc

@@ -17,7 +17,7 @@ The latest version of Railties can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/5-2-stable/railties
+* https://github.com/rails/rails/tree/master/railties
 
 == License
 
@@ -29,7 +29,7 @@ Railties is released under the MIT license:
 
 API documentation is at
 
-* http://api.rubyonrails.org
+* https://api.rubyonrails.org
 
 Bug reports can be filed for the Ruby on Rails project here:
 
@@ -37,4 +37,4 @@ Bug reports can be filed for the Ruby on Rails project here:
 
 Feature requests should be discussed on the rails-core mailing list here:
 
-* https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core
+* https://discuss.rubyonrails.org/c/rubyonrails-core