Skip to content

Commit

Permalink
Fix a few typos [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
robin850 committed Apr 5, 2015
1 parent 0eab204 commit 9cc41c3
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
6 changes: 3 additions & 3 deletions actionpack/lib/action_controller/metal/url_for.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ module ActionController
# In addition to <tt>AbstractController::UrlFor</tt>, this module accesses the HTTP layer to define
# url options like the +host+. In order to do so, this module requires the host class
# to implement +env+ which needs to be Rack-compatible and +request+
# which is either instance of +ActionDispatch::Request+ or an object
# that responds to <tt>host</tt>, <tt>optional_port</tt>, <tt>protocol</tt> and
# <tt>symbolized_path_parameter</tt> methods.
# which is either an instance of +ActionDispatch::Request+ or an object
# that responds to the +host+, +optional_port+, +protocol+ and
# +symbolized_path_parameter+ methods.
#
# class RootUrl
# include ActionController::UrlFor
Expand Down
8 changes: 4 additions & 4 deletions activemodel/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@

cat = Cat.new
cat.assign_attributes(name: "Gorby", status: "yawning")
cat.name # => 'Gorby'
cat.status => 'yawning'
cat.name # => 'Gorby'
cat.status # => 'yawning'
cat.assign_attributes(status: "sleeping")
cat.name # => 'Gorby'
cat.status => 'sleeping'
cat.name # => 'Gorby'
cat.status # => 'sleeping'

*Bogdan Gusiev*

Expand Down
12 changes: 7 additions & 5 deletions guides/source/upgrading_ruby_on_rails.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,18 +77,20 @@ See [#17227](https://github.com/rails/rails/pull/17227) for more details.

### ActiveJob jobs now inherent from ApplicationJob by default

In Rails 4.2 an ActiveJob inherents from `ActiveJob::Base`. In Rails 5.0 this
behaviour has changed to now inherent from `ApplicationJob`.
In Rails 4.2 an ActiveJob inherits from `ActiveJob::Base`. In Rails 5.0 this
behavior has changed to now inherit from `ApplicationJob`.

When upgrading from Rails 4.2 to Rails 5.0 you need to create a file
`application_job.rb` in `app/jobs/` and add the following content:
When upgrading from Rails 4.2 to Rails 5.0 you need to create an
`application_job.rb` file in `app/jobs/` and add the following content:

```
class ApplicationJob < ActiveJob::Base
end
```

See [#19034](https://github.com/rails/rails/pull/19034) for more details
Then make sure that all your job classes inherit from it.

See [#19034](https://github.com/rails/rails/pull/19034) for more details.

Upgrading from Rails 4.1 to Rails 4.2
-------------------------------------
Expand Down

0 comments on commit 9cc41c3

Please sign in to comment.