kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #20405 from manish-shrivastava/master

Browse source 
Fixed typos in rails guide
This commit is contained in:
Rafael Mendonça França 2015-06-01 12:58:51 -03:00
commit a4cf371e11
5 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activerecord/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb
View file

@ -9,7 +9,7 @@ module ActiveRecord
def changed_in_place?(raw_old_value, new_value)
# Postgres does not preserve insignificant whitespaces when
# roundtripping jsonb columns. This causes some false positives for
# round-tripping jsonb columns. This causes some false positives for
# the comparison here. Therefore, we need to parse and re-dump the
# raw value here to ensure the insignificant whitespaces are
# consistent with our encoder's output.

2
guides/source/3_1_release_notes.md
View file

@ -199,7 +199,7 @@ Railties
* jQuery is the new default JavaScript library.
* jQuery and Prototype are no longer vendored and is provided from now on by the jquery-rails and prototype-rails gems.
* jQuery and Prototype are no longer vendored and is provided from now on by the `jquery-rails` and `prototype-rails` gems.
* The application generator accepts an option `-j` which can be an arbitrary string. If passed "foo", the gem "foo-rails" is added to the `Gemfile`, and the application JavaScript manifest requires "foo" and "foo_ujs". Currently only "prototype-rails" and "jquery-rails" exist and provide those files via the asset pipeline.

2
guides/source/association_basics.md
View file

@ -435,7 +435,7 @@ end
The simplest rule of thumb is that you should set up a `has_many :through` relationship if you need to work with the relationship model as an independent entity. If you don't need to do anything with the relationship model, it may be simpler to set up a `has_and_belongs_to_many` relationship (though you'll need to remember to create the joining table in the database).
You should use `has_many :through` if you need validations, callbacks, or extra attributes on the join model.
You should use `has_many :through` if you need validations, callbacks or extra attributes on the join model.
### Polymorphic Associations

4
guides/source/kindle/welcome.html.erb
View file

@ -2,4 +2,6 @@
<h3>Kindle Edition</h3>
The Kindle Edition of the Rails Guides should be considered a work in progress. Feedback is really welcome. Please see the "Feedback" section at the end of each guide for instructions.
<div>
The Kindle Edition of the Rails Guides should be considered a work in progress. Feedback is really welcome. Please see the "Feedback" section at the end of each guide for instructions.
</div>

2
guides/source/rails_application_templates.md
View file

@ -215,7 +215,7 @@ CODE
### yes?(question) or no?(question)
These methods let you ask questions from templates and decide the flow based on the user's answer. Let's say you want to freeze rails only if the user wants to:
These methods let you ask questions from templates and decide the flow based on the user's answer. Let's say you want to Freeze Rails only if the user wants to:
```ruby
rake("rails:freeze:gems") if yes?("Freeze rails gems?")