Skip to content

Commit

Permalink
Merge pull request #9632 from senny/unify_the_changelogs
Browse files Browse the repository at this point in the history 
Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip]
  • Loading branch information
@carlosantoniodasilva
carlosantoniodasilva committed Mar 9, 2013
2 parents 2357fa8 + a58e660 commit ca35454
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 36 deletions.
4 changes: 2 additions & 2 deletions actionmailer/CHANGELOG.md
View file
Expand Up @@ -21,15 +21,15 @@
*Olek Janiszewski* *Olek Janiszewski*


* Eager loading made to use relation's `in_clause_length` instead of host's one. * Eager loading made to use relation's `in_clause_length` instead of host's one.
Fix #8474 Fixes #8474.


*Boris Staal* *Boris Staal*


* Explicit multipart messages no longer set the order of the MIME parts. * Explicit multipart messages no longer set the order of the MIME parts.
*Nate Berkopec* *Nate Berkopec*


* Do not render views when mail() isn't called. * Do not render views when mail() isn't called.
Fix #7761 Fixes #7761.


*Yves Senn* *Yves Senn*


Expand Down
22 changes: 11 additions & 11 deletions actionpack/CHANGELOG.md
View file
Expand Up @@ -252,12 +252,12 @@
Client-IP and Remote-Addr headers, in that order. Document the rationale Client-IP and Remote-Addr headers, in that order. Document the rationale
for that decision, and describe the options that can be passed to the for that decision, and describe the options that can be passed to the
RemoteIp middleware to change it. RemoteIp middleware to change it.
Fix #7979 Fixes #7979.


*André Arko*, *Steve Klabnik*, *Alexey Gaziev* *André Arko*, *Steve Klabnik*, *Alexey Gaziev*


* Do not append second slash to `root_url` when using `trailing_slash: true` * Do not append second slash to `root_url` when using `trailing_slash: true`
Fix #8700 Fixes #8700.


Before: Before:


Expand Down Expand Up @@ -285,7 +285,7 @@


* Do not append `charset=` parameter when `head` is called with a * Do not append `charset=` parameter when `head` is called with a
`:content_type` option. `:content_type` option.
Fix #8661. Fixes #8661.


*Yves Senn* *Yves Senn*


Expand Down Expand Up @@ -443,15 +443,15 @@


* Render every partial with a new `ActionView::PartialRenderer`. This resolves * Render every partial with a new `ActionView::PartialRenderer`. This resolves
issues when rendering nested partials. issues when rendering nested partials.
Fix #8197. Fixes #8197.


*Yves Senn* *Yves Senn*


* Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`. This is a list * Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`. This is a list
of mime types where template text is not html escaped by default. It prevents `Jack & Joe` of mime types where template text is not html escaped by default. It prevents `Jack & Joe`
from rendering as `Jack & Joe` for the whitelisted mime types. The default whitelist from rendering as `Jack & Joe` for the whitelisted mime types. The default whitelist
contains `text/plain`. contains `text/plain`.
Fix #7976. Fixes #7976.


*Joost Baaij* *Joost Baaij*


Expand All @@ -467,7 +467,7 @@
check_box("post", "comment_ids", { multiple: true, index: "foo" }, 1) check_box("post", "comment_ids", { multiple: true, index: "foo" }, 1)
# => <input name=\"post[foo][comment_ids][]\" type=\"hidden\" value=\"0\" /><input id=\"post_foo_comment_ids_1\" name=\"post[foo][comment_ids][]\" type=\"checkbox\" value=\"1\" /> # => <input name=\"post[foo][comment_ids][]\" type=\"hidden\" value=\"0\" /><input id=\"post_foo_comment_ids_1\" name=\"post[foo][comment_ids][]\" type=\"checkbox\" value=\"1\" />


Fix #8108. Fixes #8108.


*Daniel Fox, Grant Hutchins & Trace Wax* *Daniel Fox, Grant Hutchins & Trace Wax*


Expand All @@ -490,7 +490,7 @@
*Josh Peek* *Josh Peek*


* `assert_template` can be used to assert on the same template with different locals * `assert_template` can be used to assert on the same template with different locals
Fix #3675. Fixes #3675.


*Yves Senn* *Yves Senn*


Expand All @@ -501,7 +501,7 @@
* Accept `:remote` as symbolic option for `link_to` helper. *Riley Lynch* * Accept `:remote` as symbolic option for `link_to` helper. *Riley Lynch*


* Warn when the `:locals` option is passed to `assert_template` outside of a view test case * Warn when the `:locals` option is passed to `assert_template` outside of a view test case
Fix #3415. Fixes #3415.


*Yves Senn* *Yves Senn*


Expand All @@ -525,12 +525,12 @@


* Rename internal variables on `ActionController::TemplateAssertions` to prevent * Rename internal variables on `ActionController::TemplateAssertions` to prevent
naming collisions. `@partials`, `@templates` and `@layouts` are now prefixed with an underscore. naming collisions. `@partials`, `@templates` and `@layouts` are now prefixed with an underscore.
Fix #7459. Fixes #7459.


*Yves Senn* *Yves Senn*


* `resource` and `resources` don't modify the passed options hash. * `resource` and `resources` don't modify the passed options hash.
Fix #7777. Fixes #7777.


*Yves Senn* *Yves Senn*


Expand Down Expand Up @@ -594,7 +594,7 @@
*Guillermo Iguaran* *Guillermo Iguaran*


* Log now displays the correct status code when an exception is raised. * Log now displays the correct status code when an exception is raised.
Fix #7646. Fixes #7646.


*Yves Senn* *Yves Senn*


Expand Down
33 changes: 17 additions & 16 deletions activerecord/CHANGELOG.md
View file
Expand Up @@ -120,7 +120,7 @@
*Yves Senn* *Yves Senn*


* Assigning "0.0" to a nullable numeric column does not make it dirty. * Assigning "0.0" to a nullable numeric column does not make it dirty.
Fix #9034. Fixes #9034.


Example: Example:


Expand Down Expand Up @@ -555,17 +555,17 @@
*Marc-André Lafortune* *Marc-André Lafortune*


* Serialized attributes can be serialized in integer columns. * Serialized attributes can be serialized in integer columns.
Fix #8575. Fixes #8575.


*Rafael Mendonça França* *Rafael Mendonça França*


* Keep index names when using `alter_table` with sqlite3. * Keep index names when using `alter_table` with sqlite3.
Fix #3489. Fixes #3489.


*Yves Senn* *Yves Senn*


* Add ability for postgresql adapter to disable user triggers in `disable_referential_integrity`. * Add ability for postgresql adapter to disable user triggers in `disable_referential_integrity`.
Fix #5523. Fixes #5523.


*Gary S. Weaver* *Gary S. Weaver*


Expand All @@ -588,7 +588,7 @@
*Matthew Robertson* *Matthew Robertson*


* Recognize migrations placed in directories containing numbers and 'rb'. * Recognize migrations placed in directories containing numbers and 'rb'.
Fix #8492 Fixes #8492.


*Yves Senn* *Yves Senn*


Expand Down Expand Up @@ -646,13 +646,13 @@


* Fix performance problem with `primary_key` method in PostgreSQL adapter when having many schemas. * Fix performance problem with `primary_key` method in PostgreSQL adapter when having many schemas.
Uses `pg_constraint` table instead of `pg_depend` table which has many records in general. Uses `pg_constraint` table instead of `pg_depend` table which has many records in general.
Fix #8414 Fixes #8414.


*kennyj* *kennyj*


* Do not instantiate intermediate Active Record objects when eager loading. * Do not instantiate intermediate Active Record objects when eager loading.
These records caused `after_find` to run more than expected. These records caused `after_find` to run more than expected.
Fix #3313 Fixes #3313.


*Yves Senn* *Yves Senn*


Expand All @@ -673,12 +673,13 @@


* Fix dirty attribute checks for `TimeZoneConversion` with nil and blank * Fix dirty attribute checks for `TimeZoneConversion` with nil and blank
datetime attributes. Setting a nil datetime to a blank string should not datetime attributes. Setting a nil datetime to a blank string should not
result in a change being flagged. Fix #8310 result in a change being flagged.
Fixes #8310.


*Alisdair McDiarmid* *Alisdair McDiarmid*


* Prevent mass assignment to the type column of polymorphic associations when using `build` * Prevent mass assignment to the type column of polymorphic associations when using `build`
Fix #8265 Fixes #8265.


*Yves Senn* *Yves Senn*


Expand Down Expand Up @@ -731,7 +732,7 @@
*Bogdan Gusiev* *Bogdan Gusiev*


* `:counter_cache` option for `has_many` associations to support custom named counter caches. * `:counter_cache` option for `has_many` associations to support custom named counter caches.
Fix #7993 Fixes #7993.


*Yves Senn* *Yves Senn*


Expand All @@ -755,7 +756,7 @@
*Nikita Afanasenko* *Nikita Afanasenko*


* Use query cache/uncache when using `DATABASE_URL`. * Use query cache/uncache when using `DATABASE_URL`.
Fix #6951. Fixes #6951.


*kennyj* *kennyj*


Expand All @@ -764,7 +765,7 @@
*Henrik Nyh* *Henrik Nyh*


* The `create_table` method raises an `ArgumentError` when the primary key column is redefined. * The `create_table` method raises an `ArgumentError` when the primary key column is redefined.
Fix #6378 Fixes #6378.


*Yves Senn* *Yves Senn*


Expand Down Expand Up @@ -874,7 +875,7 @@
*Alexey Muranov* *Alexey Muranov*


* The postgres adapter now supports tables with capital letters. * The postgres adapter now supports tables with capital letters.
Fix #5920 Fixes #5920.


*Yves Senn* *Yves Senn*


Expand All @@ -896,7 +897,7 @@
*Francesco Rodriguez* *Francesco Rodriguez*


* Fix `reset_counters` crashing on `has_many :through` associations. * Fix `reset_counters` crashing on `has_many :through` associations.
Fix #7822. Fixes #7822.


*lulalala* *lulalala*


Expand Down Expand Up @@ -971,7 +972,7 @@
*Guillermo Iguaran* *Guillermo Iguaran*


* Fix the return of querying with an empty hash. * Fix the return of querying with an empty hash.
Fix #6971. Fixes #6971.


User.where(token: {}) User.where(token: {})


Expand All @@ -987,7 +988,7 @@


* Fix creation of through association models when using `collection=[]` * Fix creation of through association models when using `collection=[]`
on a `has_many :through` association from an unsaved model. on a `has_many :through` association from an unsaved model.
Fix #7661. Fixes #7661.


*Ernie Miller* *Ernie Miller*


Expand Down
14 changes: 7 additions & 7 deletions railties/CHANGELOG.md
View file
Expand Up @@ -39,13 +39,13 @@
*Amparo Luna* *Amparo Luna*


* Fixes database.yml when creating a new rails application with '.' * Fixes database.yml when creating a new rails application with '.'
Fix #8304 Fixes #8304.


*Jeremy W. Rowe* *Jeremy W. Rowe*


* Restore Rails::Engine::Railties#engines with deprecation to ensure * Restore Rails::Engine::Railties#engines with deprecation to ensure
compatibility with gems such as Thinking Sphinx compatibility with gems such as Thinking Sphinx
Fix #8551 Fixes #8551.


*Tim Raymond* *Tim Raymond*


Expand Down Expand Up @@ -119,7 +119,7 @@


* Environment name can be a start substring of the default environment names * Environment name can be a start substring of the default environment names
(production, development, test). For example: tes, pro, prod, dev, devel. (production, development, test). For example: tes, pro, prod, dev, devel.
Fix #8628. Fixes #8628.


*Mykola Kyryk* *Mykola Kyryk*


Expand All @@ -129,7 +129,7 @@


* Quote column names in generates fixture files. This prevents * Quote column names in generates fixture files. This prevents
conflicts with reserved YAML keywords such as 'yes' and 'no' conflicts with reserved YAML keywords such as 'yes' and 'no'
Fix #8612. Fixes #8612.


*Yves Senn* *Yves Senn*


Expand Down Expand Up @@ -162,19 +162,19 @@
* Add `db` to list of folders included by `rake notes` and `rake notes:custom`. *Antonio Cangiano* * Add `db` to list of folders included by `rake notes` and `rake notes:custom`. *Antonio Cangiano*


* Engines with a dummy app include the rake tasks of dependencies in the app namespace. * Engines with a dummy app include the rake tasks of dependencies in the app namespace.
Fix #8229 Fixes #8229.


*Yves Senn* *Yves Senn*


* Add `sqlserver.yml` template file to satisfy `-d sqlserver` being passed to `rails new`. * Add `sqlserver.yml` template file to satisfy `-d sqlserver` being passed to `rails new`.
Fix #6882 Fixes #6882.


*Robert Nesius* *Robert Nesius*


* Rake test:uncommitted finds git directory in ancestors *Nicolas Despres* * Rake test:uncommitted finds git directory in ancestors *Nicolas Despres*


* Add dummy app Rake tasks when `--skip-test-unit` and `--dummy-path` is passed to the plugin generator. * Add dummy app Rake tasks when `--skip-test-unit` and `--dummy-path` is passed to the plugin generator.
Fix #8121 Fixes #8121.


*Yves Senn* *Yves Senn*


Expand Down

0 comments on commit ca35454

Please sign in to comment.