aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2017-02-09 08:11:06 -0500
committerGitHub <noreply@github.com>2017-02-09 08:11:06 -0500
commit2b4d145f31eb2edfbfc5b0c8c65efc07321d4378 (patch)
treeaaec661282b65b26ab7cbcceb41b374e363f0ab0 /guides
parentae39b1a03d0a859be9d5342592c8936f89fcbacf (diff)
parent58b4448678f8017ad0def8e2f279c8ab88d14d1c (diff)
downloadrails-2b4d145f31eb2edfbfc5b0c8c65efc07321d4378.tar.gz
rails-2b4d145f31eb2edfbfc5b0c8c65efc07321d4378.tar.bz2
rails-2b4d145f31eb2edfbfc5b0c8c65efc07321d4378.zip
Merge pull request #27952 from dijonkitchen/patch-1
Fix wording
Diffstat (limited to 'guides')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 8a3b3b84b4..a9ec34098a 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -703,7 +703,7 @@ There are a few major changes related to JSON handling in Rails 4.1.
MultiJSON has reached its [end-of-life](https://github.com/rails/rails/pull/10576)
and has been removed from Rails.
-If your application currently depend on MultiJSON directly, you have a few options:
+If your application currently depends on MultiJSON directly, you have a few options:
1. Add 'multi_json' to your Gemfile. Note that this might cease to work in the future