aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
Diffstat (limited to 'guides')
-rw-r--r--guides/CHANGELOG.md6
-rw-r--r--guides/source/initialization.md6
-rw-r--r--guides/source/testing.md2
-rw-r--r--guides/source/upgrading_ruby_on_rails.md2
4 files changed, 9 insertions, 7 deletions
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
index 4cd4a9d70c..2770fc73e7 100644
--- a/guides/CHANGELOG.md
+++ b/guides/CHANGELOG.md
@@ -1,16 +1,16 @@
* Change Posts to Articles in Getting Started sample application in order to
better align with the actual guides.
- * John Kelly Ferguson*
+ *John Kelly Ferguson*
* Update all Rails 4.1.0 references to 4.1.1 within the guides and code.
- * John Kelly Ferguson*
+ *John Kelly Ferguson*
* Split up rows in the Explain Queries table of the ActiveRecord Querying section
in order to improve readability.
- * John Kelly Ferguson*
+ *John Kelly Ferguson*
* Change all non-HTTP method 'post' references to 'article'.
diff --git a/guides/source/initialization.md b/guides/source/initialization.md
index 02059151b6..b81b048c35 100644
--- a/guides/source/initialization.md
+++ b/guides/source/initialization.md
@@ -98,9 +98,9 @@ configure the load path for your Gemfile's dependencies.
A standard Rails application depends on several gems, specifically:
-* abstract
* actionmailer
* actionpack
+* actionview
* activemodel
* activerecord
* activesupport
@@ -119,7 +119,7 @@ A standard Rails application depends on several gems, specifically:
* rails
* railties
* rake
-* sqlite3-ruby
+* sqlite3
* thor
* treetop
* tzinfo
@@ -703,4 +703,4 @@ the last piece of our journey in the Rails initialization process.
This high level overview will help you understand when your code is
executed and how, and overall become a better Rails developer. If you
still want to know more, the Rails source code itself is probably the
-best place to go next. \ No newline at end of file
+best place to go next.
diff --git a/guides/source/testing.md b/guides/source/testing.md
index a55466341a..09833ed78c 100644
--- a/guides/source/testing.md
+++ b/guides/source/testing.md
@@ -996,7 +996,7 @@ class UserControllerTest < ActionController::TestCase
assert_equal "You have been invited by me@example.com", invite_email.subject
assert_equal 'friend@example.com', invite_email.to[0]
- assert_match(/Hi friend@example.com/, invite_email.body)
+ assert_match(/Hi friend@example.com/, invite_email.body.to_s)
end
end
```
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index d1d24eac66..9c67391e8f 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -3,6 +3,8 @@ A Guide for Upgrading Ruby on Rails
This guide provides steps to be followed when you upgrade your applications to a newer version of Ruby on Rails. These steps are also available in individual release guides.
+--------------------------------------------------------------------------------
+
General Advice
--------------