RubyGems - railties - Versions diffs - 6.1.6.1 → 7.0.0.alpha1 - Mend

railties 6.1.6.1 → 7.0.0.alpha1

Files changed (151) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e57c446c28cf1a0037c9d57ad1d25adac9e02081282799d44ccf27224f74bcd6
-  data.tar.gz: 7b1ed0cb23743f29cceaa99ae4bdc27d59c482b02e2c99245b7eb3ce455e42b4
+  metadata.gz: 809add07149bc6a8fc6bd9e1848b4237e6a39642319d686c0e5e7c1ff005a0fe
+  data.tar.gz: 3676fc831492d4e660fe82b657b25630373e1176d5dfc0d6375857aa0de0d0cd
 SHA512:
-  metadata.gz: b5d96ce1e21ed475cf967fba65c7942ae8a43affefeb8d3a501f501c13e28bb6ff0f4364e79611bcd12281c2e0a13b87299fc8a52d1fb7bb63f96a17e179ff92
-  data.tar.gz: 653876085464dab816850e20fb3cbef1500a8c5d0dc3e7b77f565b2550005945120066bac77e8897b2add9751c542edfd9de375b34126a4f85dc26f45474a7d4
+  metadata.gz: 136de74c284cec25a993107e665b70f0732116b770c0ca3081b2b9f6a2366046d318d0153da438b557485aadb18ab0850c7135c20ef662154418e1690a0f8788
+  data.tar.gz: a6ad192510bd25f054e931fcbb7ef7fa3c34cbc90a9445d7b8ca173c9c2f58b5ffd40e33b10ddb27d7cdf5cf026ebb5e2a9cd7e6637804d291e922310fc795c8

data/CHANGELOG.md CHANGED Viewed

@@ -1,489 +1,165 @@
-## Rails 6.1.6.1 (July 12, 2022) ##
+## Rails 7.0.0.alpha1 (September 15, 2021) ##
-*   No changes.
+*   New and upgraded Rails apps no longer generate `config/initializers/application_controller_renderer.rb`
+    or `config/initializers/cookies_serializer.rb`
-## Rails 6.1.5.1 (April 26, 2022) ##
-*   No changes.
-## Rails 6.1.5 (March 09, 2022) ##
-*   In `zeitwerk` mode, setup the `once` autoloader first, and the `main` autoloader after it.
-    This order plays better with shared namespaces.
-    *Xavier Noria*
-*   Handle paths with spaces when editing credentials.
+    The default value for `cookies_serializer` (`:json`) has been moved to `config.load_defaults("7.0")`.
+    The new framework defaults file sets the serializer to `:marshal`.
     *Alex Ghiculescu*
-*   Support Psych 4 when loading secrets.
-    *Nat Morcos*
-## Rails 6.1.4.7 (March 08, 2022) ##
-*   No changes.
-## Rails 6.1.4.6 (February 11, 2022) ##
-*   No changes.
-## Rails 6.1.4.5 (February 11, 2022) ##
-*   No changes.
-## Rails 6.1.4.4 (December 15, 2021) ##
-*   No changes.
-## Rails 6.1.4.3 (December 14, 2021) ##
-*   Allow localhost with a port by default in development
-    [Fixes: #43864]
-## Rails 6.1.4.2 (December 14, 2021) ##
-*   No changes.
-## Rails 6.1.4.1 (August 19, 2021) ##
-*   No changes.
-## Rails 6.1.4 (June 24, 2021) ##
-*   Fix compatibility with `psych >= 4`.
-    Starting in Psych 4.0.0 `YAML.load` behaves like `YAML.safe_load`. To preserve compatibility
-    `Rails.application.config_for` now uses `YAML.unsafe_load` if available.
-    *Jean Boussier*
-*   Ensure `Rails.application.config_for` always cast hashes to `ActiveSupport::OrderedOptions`.
-    *Jean Boussier*
-*   Fix create migration generator with `--pretend` option.
-    *euxx*
-## Rails 6.1.3.2 (May 05, 2021) ##
-*   No changes.
-## Rails 6.1.3.1 (March 26, 2021) ##
-*   No changes.
-## Rails 6.1.3 (February 17, 2021) ##
-*   No changes.
-## Rails 6.1.2.1 (February 10, 2021) ##
-*   No changes.
-## Rails 6.1.2 (February 09, 2021) ##
-*   No changes.
-## Rails 6.1.1 (January 07, 2021) ##
-*   Allow spaces in path to Yarn binstub and only run on precompile if needed.
-    *Markus Doits*
-*   Populate ARGV for app template.
-    Fixes #40945.
-    *Jonathan Hefner*
-## Rails 6.1.0 (December 09, 2020) ##
-*   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.
-    It can be used like this:
-    ```ruby
-      class MyRailtie < Rails::Railtie
-        server do
-          WebpackServer.run
-        end
-      end
-    ```
-    *Edouard Chin*
-*   Remove deprecated `rake dev:cache` tasks.
-    *Rafael Mendonça França*
-*   Remove deprecated `rake routes` tasks.
-    *Rafael Mendonça França*
-*   Remove deprecated `rake initializers` tasks.
-    *Rafael Mendonça França*
-*   Remove deprecated support for using the `HOST` environment variable to specify the server IP.
-    *Rafael Mendonça França*
-*   Remove deprecated `server` argument from the rails server command.
-    *Rafael Mendonça França*
-*   Remove deprecated `SOURCE_ANNOTATION_DIRECTORIES` environment variable support from `rails notes`.
-    *Rafael Mendonça França*
-*   Remove deprecated `connection` option in the `rails dbconsole` command.
-    *Rafael Mendonça França*
-*   Remove depreated `rake notes` tasks.
-    *Rafael Mendonça França*
-*   Return a 405 Method Not Allowed response when a request uses an unknown HTTP method.
-    Fixes #38998.
-    *Loren Norman*
-*   Make railsrc file location xdg-specification compliant
-    `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`.
-    The fallback behaviour means this does not cause any breaking changes.
-    *Nick Wolf*
-*   Change the default logging level from :debug to :info to avoid inadvertent exposure of personally
-    identifiable information (PII) in production environments.
-    *Eric M. Payne*
-*   Automatically generate abstract class when using multiple databases.
-    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.
-    Usage:
-    ```bash
-    $ bin/rails generate scaffold Pet name:string --database=animals
-    ```
-    Will create an abstract class for the animals connection.
-    ```ruby
-    class AnimalsRecord < ApplicationRecord
-      self.abstract_class = true
-      connects_to database: { writing: :animals }
-    end
-    ```
-    And generate a `Pet` model that inherits from the new `AnimalsRecord`:
-    ```ruby
-    class Pet < AnimalsRecord
-    end
-    ```
-    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.
-    ```bash
-    $ bin/rails generate scaffold Pet name:string --database=animals --parent=SecondaryBase
-    ```
-    This will ensure the model inherits from the `SecondaryBase` parent instead of `AnimalsRecord`
-    ```ruby
-    class Pet < SecondaryBase
-    end
-    ```
-    *Eileen M. Uchitelle*, *John Crepezzi*
-*   Accept params from url to prepopulate the Inbound Emails form in Rails conductor.
-    *Chris Oliver*
-*   Create a new rails app using a minimal stack.
-      `rails new cool_app --minimal`
-    All the following are excluded from your minimal stack:
-    - action_cable
-    - action_mailbox
-    - action_mailer
-    - action_text
-    - active_job
-    - active_storage
-    - bootsnap
-    - jbuilder
-    - spring
-    - system_tests
-    - turbolinks
-    - webpack
-    *Haroon Ahmed*, *DHH*
-*   Add default ENV variable option with BACKTRACE to turn off backtrace cleaning when debugging framework code in the
-    generated config/initializers/backtrace_silencers.rb.
-      `BACKTRACE=1 ./bin/rails runner "MyClass.perform"`
-    *DHH*
-*   The autoloading guide for Zeitwerk mode documents how to autoload classes
-    during application boot in a safe way.
-    *Haroon Ahmed*, *Xavier Noria*
-*   The `classic` autoloader starts its deprecation cycle.
-    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.
+*   New applications get a dependency on the new `debug` gem, replacing `byebug`.
     *Xavier Noria*
-*   Adds `rails test:all` for running all tests in the test directory.
-    This runs all test files in the test directory, including system tests.
-    *Niklas Häusele*
-*   Add `config.generators.after_generate` for processing to generated files.
-    Register a callback that will get called right after generators has finished.
-    *Yuji Yaginuma*
-*   Make test file patterns configurable via Environment variables
-    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.
-    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).
+*   Add SSL support for postgresql in `bin/rails dbconsole`.
-    *Jorge Manrubia*
+    Fixes #43114.
-*   No longer include `rake rdoc` task when generating plugins.
+    *Michael Bayucot*
-    To generate docs, use the `rdoc lib` command instead.
+*   Add support for comments above gem declaration in Rails application templates, e.g. `gem("nokogiri", comment: "For XML")`.
-    *Jonathan Hefner*
+    *Linas Juškevičius*
-*   Allow relative paths with trailing slashes to be passed to `rails test`.
+*   The setter `config.autoloader=` has been deleted. `zeitwerk` is the only
+    available autoloading mode.
-    *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.
+    *Xavier Noria*
-    Opt out with `--skip-git`.
+*   `config.autoload_once_paths` can be configured in the body of the
+    application class defined in `config/application.rb` or in the configuration
+    for environments in `config/environments/*`.
-    *OKURA Masafumi*
+    Similarly, engines can configure that collection in the class body of the
+    engine class or in the configuration for environments.
-*   Add benchmark generator.
+    After that, the collection is frozen, and you can autoload from those paths.
+    They are managed by the `Rails.autoloaders.once` autoloader, which does not
+    reload, only autoloads/eager loads.
-    Introduce benchmark generator to benchmark Rails applications.
+    *Xavier Noria*
-      `rails generate benchmark opt_compare`
+*   During initialization, you cannot autoload reloadable classes or modules
+    like application models, unless they are wrapped in a `to_prepare` block.
+    For example, from `config/initializers/*`, or in application, engines, or
+    railties initializers.
-    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.
+    Please check the [autoloading
+    guide](https://guides.rubyonrails.org/v7.0/autoloading_and_reloading_constants.html#autoloading-when-the-application-boots)
+    for details.
-    You can run the generated benchmark file using:
-      `ruby script/benchmarks/opt_compare.rb`
+    *Xavier Noria*
-    *Kevin Jalbert*, *Gannon McGibbon*
+*   While they are allowed to have elements in common, it is no longer required
+    that `config.autoload_once_paths` is a subset of `config.autoload_paths`.
+    The former are managed by the `once` autoloader. The `main` autoloader
+    manages the latter minus the former.
-*   Cache compiled view templates when running tests by default.
+    *Xavier Noria*
-    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`:
+*   Show Rake task description if command is run with `-h`.
-    ```ruby
-    config.action_view.cache_template_loading = true
-    ```
+    Adding `-h` (or `--help`) to a Rails command that's a Rake task now outputs
+    the task description instead of the general Rake help.
-    *Jorge Manrubia*
+    *Petrik de Heus*
-*   Introduce middleware move operations.
+*   Add missing `plugin new` command to help.
-    With this change, you no longer need to delete and reinsert a middleware to
-    move it from one place to another in the stack:
+    *Petrik de Heus
-    ```ruby
-    config.middleware.move_before ActionDispatch::Flash, Magical::Unicorns
-    ```
+*   Fix `config_for` error when there's only a shared root array.
-    This will move the `Magical::Unicorns` middleware before
-    `ActionDispatch::Flash`. You can also move it after with:
+    *Loïc Delmaire*
-    ```ruby
-    config.middleware.move_after ActionDispatch::Flash, Magical::Unicorns
-    ```
+*   Raise an error in generators if an index type is invalid.
-    *Genadi Samokovarov*
+    *Petrik de Heus*
-*   Generators that inherit from NamedBase respect `--force` option.
+*   `package.json` now uses a strict version constraint for Rails JavaScript packages on new Rails apps.
-    *Josh Brody*
+    *Zachary Scott*, *Alex Ghiculescu*
-*   Allow configuration of eager_load behaviour for rake environment:
+*   Modified scaffold generator template so that running
+    `rails g scaffold Author` no longer generates tests called "creating
+    a Author", "updating a Author", and "destroying a Author".
-        config.rake_eager_load
+    Fixes #40744.
-    Defaults to `false` as per previous behaviour.
+    *Michael Duchemin*
-    *Thierry Joyal*
+*   Raise an error in generators if a field type is invalid.
-*   Ensure Rails migration generator respects system-wide primary key config.
+    *Petrik de Heus*
-    When rails is configured to use a specific primary key type:
+*   `bin/rails tmp:clear` deletes also files and directories in `tmp/storage`.
-    ```ruby
-    config.generators do |g|
-      g.orm :active_record, primary_key_type: :uuid
-    end
-    ```
+    *George Claghorn*
-    Previously:
+*   Fix compatibility with `psych >= 4`.
-    ```bash
-    $ bin/rails g migration add_location_to_users location:references
-    ```
+    Starting in Psych 4.0.0 `YAML.load` behaves like `YAML.safe_load`. To preserve compatibility
+    `Rails.application.config_for` now uses `YAML.unsafe_load` if available.
-    The references line in the migration would not have `type: :uuid`.
-    This change causes the type to be applied appropriately.
+    *Jean Boussier*
-    *Louis-Michel Couture*, *Dermot Haughey*
+*   Allow loading nested locales in engines.
-*   Deprecate `Rails::DBConsole#config`.
+    *Gannon McGibbon*
-    `Rails::DBConsole#config` is deprecated without replacement. Use `Rails::DBConsole.db_config.configuration_hash` instead.
+*   Ensure `Rails.application.config_for` always cast hashes to `ActiveSupport::OrderedOptions`.
-    *Eileen M. Uchitelle*, *John Crepezzi*
+    *Jean Boussier*
-*   `Rails.application.config_for` merges shared configuration deeply.
+*   Remove `Rack::Runtime` from the default middleware stack and deprecate
+    referencing it in middleware operations without adding it back.
-    ```yaml
-    # config/example.yml
-    shared:
-      foo:
-        bar:
-          baz: 1
-    development:
-      foo:
-        bar:
-          qux: 2
-    ```
+    *Hartley McGuire*
-    ```ruby
-    # Previously
-    Rails.application.config_for(:example)[:foo][:bar] #=> { qux: 2 }
+*   Allow adding additional authorized hosts in development via `ENV['RAILS_DEVELOPMENT_HOSTS']`.
-    # Now
-    Rails.application.config_for(:example)[:foo][:bar] #=> { baz: 1, qux: 2 }
-    ```
+    *Josh Abernathy*, *Debbie Milburn*
-    *Yuhei Kiriyama*
+*   Add app concern and test keepfiles to generated engine plugins.
-*   Remove access to values in nested hashes returned by `Rails.application.config_for` via String keys.
+    *Gannon McGibbon*
-    ```yaml
-    # config/example.yml
-    development:
-      options:
-        key: value
-    ```
+*   Stop generating a license for in-app plugins.
-    ```ruby
-    Rails.application.config_for(:example).options
-    ```
+    *Gannon McGibbon*
-    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.
+*   `rails app:update` no longer prompts you to overwrite files that are generally modified in the
+    course of developing a Rails app. See [#41083](https://github.com/rails/rails/pull/41083) for
+    the full list of changes.
-    *Étienne Barrié*
+    *Alex Ghiculescu*
-*   Configuration files for environments (`config/environments/*.rb`) are
-    now able to modify `autoload_paths`, `autoload_once_paths`, and
-    `eager_load_paths`.
+*   Change default branch for new Rails projects and plugins to `main`.
-    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.
+    *Prateek Choudhary*
-    Ways to use application code in these files:
+*   The new method `Rails.benchmark` gives you a quick way to measure and log the execution time taken by a block:
-    * 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.
+        def test_expensive_stuff
+          Rails.benchmark("test_expensive_stuff") { ... }
+        end
-        ```ruby
-        # In config/application.rb, for example.
-        require "#{Rails.root}/lib/my_app/config"
+    This functionality was available in some contexts only before.
-        # In config/environments/development.rb, for example.
-        config.foo = MyApp::Config.foo
-        ```
+    *Simon Perepelitsa*
-    * If the class has to be reloadable, then wrap the configuration code in a `to_prepare` block:
+*   Applications generated with `--skip-sprockets` no longer get `app/assets/config/manifest.js` and `app/assets/stylesheets/application.css`.
-        ```ruby
-        config.to_prepare do
-          config.foo = MyModel.foo
-        end
-        ```
+    *Cindy Gao*
-      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.
+*   Add support for stylesheets and ERB views to `rails stats`.
-    *Allen Hsu* & *Xavier Noria*
+    *Joel Hawksley*
-*   Support using environment variable to set pidfile.
+*   Allow appended root routes to take precedence over internal welcome controller.
-    *Ben Thorner*
+    *Gannon McGibbon*
-Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/railties/CHANGELOG.md) for previous changes.
+Please check [6-1-stable](https://github.com/rails/rails/blob/6-1-stable/railties/CHANGELOG.md) for previous changes.

data/MIT-LICENSE CHANGED Viewed

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2022 David Heinemeier Hansson
+Copyright (c) 2004-2021 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 CHANGED Viewed

@@ -15,21 +15,21 @@ application into three layers: Model, View, and Controller, each with a specific
 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
-<tt>ActiveRecord::Base</tt>. {Active Record}[link:files/activerecord/README_rdoc.html] 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. 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}[link:files/activemodel/README_rdoc.html] module.
+the {Active Model}[link:/files/activemodel/README_rdoc.html] module.
 == 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
+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.
+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 <tt>ActionController::Base</tt>. Action Dispatch and Action Controller
-are bundled together in {Action Pack}[link:files/actionpack/README_rdoc.html].
+are bundled together in {Action Pack}[link:/files/actionpack/README_rdoc.html].
 == View layer
@@ -37,19 +37,19 @@ The <em><b>View layer</b></em> is composed of "templates" that are responsible f
 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}[link:files/actionview/README_rdoc.html].
+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
+{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.
@@ -72,7 +72,7 @@ and may also be used independently outside \Rails.
    Run with <tt>--help</tt> or <tt>-h</tt> for options.
-4. Go to <tt>http://localhost:3000</tt> and you'll see: "Yay! You’re on \Rails!"
+4. Go to <tt>http://localhost:3000</tt>, and you'll see: "Yay! You’re on \Rails!"
 5. Follow the guidelines to start developing your application. You may find the following resources handy: