aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Add note about release notes in upgrade guideeileencodes2016-06-291-0/+2
| | | | | | | | | | | | | | | | | | | | It's useful to have a link to the release notes in the upgrade guide for a clearer view of what changed in Rails.
* | | | Update release notes about legacy `mysql` adaptereileencodes2016-06-291-2/+4
|/ / / | | | | | | | | | Make release notes about legacy `mysql` adapter clearer.
* | | Update Rails 5 upgrade guideseileencodes2016-06-291-4/+133
| | | | | | | | | | | | | | | Adds missing upgrade items to the upgrade guides for Rails 5. Fixes some typos and whitespace as well.
* | | Merge pull request #24991 from maclover7/actioncable-npm-docsVipul A M2016-06-291-0/+68
|\ \ \ | |/ / |/| | Add documentation about Action Cable npm package
| * | Add documentation about Action Cable npm packageJon Moss2016-05-261-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | Sorry, forgot to include in my main PR :( [ci skip] [Jon Moss, Zach Schneider]
* | | Merge pull request #25574 from alexcameron89/action_view_baseJon Moss2016-06-291-6/+6
|\ \ \ | | | | | | | | [ci skip] Update formatting in ActionView::Base documentation
| * | | [ci skip] Update formatting in ActionView::Base documentationAlex Kitchens2016-06-291-6/+6
| | | |
* | | | Merge pull request #25572 from alexcameron89/polymorphic_routesJon Moss2016-06-291-2/+2
|\| | | | | | | | | | | [ci skip] Fix grammar & add link in PolymorphicRoutes
| * | | [ci skip] Fix typo & add link in PolymorphicRoutesAlex Kitchens2016-06-291-2/+2
| | | |
* | | | Merge pull request #25559 from kmcphillips/masterSean Griffin2016-06-294-10/+36
|\ \ \ \ | | | | | | | | | | Do not inspect array of over 10 elements
| * | | | Do not specal case inspecting associated arrays of over 10 elements, ↵Kevin McPhillips2016-06-294-10/+36
|/ / / / | | | | | | | | | | | | preventing infinite looping in some cases.
* | | | Don't attempt to clear active connections unless we'ere connectedSean Griffin2016-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Right now with this middleware we are likely always connected, but I'm hoping to change that soon. This is an easy change to pull out on its own.
* | | | Remove unused `ActiveRecord::Base.connection_id`Sean Griffin2016-06-295-28/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | This method appears to have been partially used in connection pool caching, but it was introduced without much reasoning or any tests. One edge case test was added later on, but it was focused on implementation details. This method is no longer used outside of tests, and as such is removed.
* | | Merge pull request #25567 from y-yagi/update_description_of_test_orderVipul A M2016-06-291-1/+1
|\ \ \ | | | | | | | | update description of `test_order` [ci skip]
| * | | update description of `test_order` [ci skip]yuuji.yaginuma2016-06-291-1/+1
| | | | | | | | | | | | | | | | Follow up to 5f777e4b5ee2e3e8e6fd0e2a208ec2a4d25a960d
* | | | Merge pull request #25562 from vipulnsward/select-html-options-testRafael França2016-06-281-1/+10
|\ \ \ \ | | | | | | | | | | Add coverage for #25529
| * | | | - Added select tag test for verifying passing html options to f.select helperVipul A M2016-06-281-1/+10
| |/ / / | | | | | | | | | | | | - Renamed test to be more descriptive
* | | | Merge pull request #25364 from kamipo/fix_serialize_for_date_typeRafael França2016-06-282-1/+17
|\ \ \ \ | |/ / / |/| | | Fix `Type::Date#serialize` to return a date object correctly
| * | | Fix `Type::Date#serialize` to return a date object correctlyRyuta Kamizono2016-06-162-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently `Type::Date#serialize` does not cast a value to a date object. It should be cast to a date object for finding by date column correctly working. Fixes #25354.
* | | | Merge pull request #25544 from piotrj/pj-issue-25488Rafael França2016-06-282-1/+21
|\ \ \ \ | | | | | | | | | | Fix setting route's to in a scope
| * | | | Fix setting route's to in a scopePiotr Jakubowski2016-06-282-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #25488 97d7dc4 introduced a regression that resulted in ArgumentError when to was in options of the scope and not of particular route.
* | | | | Fix adding implicitly rendered template digests to ETagsJavan Makhmali2016-06-283-11/+43
|/ / / / | | | | | | | | | | | | Signed-off-by: Jeremy Daer <jeremydaer@gmail.com>
* | | | Make client test run individually.Kasper Timm Hansen2016-06-281-1/+3
| | | | | | | | | | | | | | | | Require our dependency and forgo the core ext version.
* | | | Add dup leftover from 26710ab.Kasper Timm Hansen2016-06-281-1/+1
| | | |
* | | | Revert "Merge pull request #25131 from ↵Matthew Draper2016-06-291-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javierhonduco/javierhonduco/clone_depth_to_1" This reverts commit acf0bb3f4945f6fda4ac7170b3a0f8fa3becc8f5, reversing changes made to c5b766a9a20c9dd5bf09e69a7c508f369c2eeea3. Travis can only build a commit it can clone; without any clone depth, all branch builds error as soon as there's a newer commit present.
* | | | Default to frozen string literals in TagHelper.Kasper Timm Hansen2016-06-281-5/+7
| | | | | | | | | | | | | | | | Removes littering `freeze` calls with Ruby 2.3's magic comment.
* | | | Merge pull request #25555 from vipulnsward/boolean-attributes-updateRafael França2016-06-284-14/+13
|\ \ \ \ | | | | | | | | | | Bring Boolean Attributes list for AV Tags helper upto speed with current spec
| * | | | Bring Boolean Attributes list for AV Tags helper upto speed with current spec.Vipul A M2016-06-284-14/+13
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is based on https://github.com/kangax/html-minifier/blob/6b2d4536d82819143b468b41a89c700b6c61631f/src/htmlminifier.js#L197 and spec from https://www.w3.org/TR/html51/single-page.html. Couple of other changes to tests due to support update: - autobuffer has been dropped in favour of preload attribute, ref: https://msdn.microsoft.com/en-us/library/ff974743(v=vs.85).aspx - pubdate attribute has been dropped from spec, ref: https://www.w3.org/html/wg/tracker/issues/185
* | | | Merge pull request #25551 from vipulnsward/25543-follow-upKasper Timm Hansen2016-06-281-1/+1
|\ \ \ \ | | | | | | | | | | Expand list of void elements to match spec
| * | | | Expand list of void elements to match spec from ↵Vipul A M2016-06-281-1/+1
| |/ / / | | | | | | | | | | | | https://html.spec.whatwg.org/multipage/syntax.html#void-elements
* | | | Merge pull request #25554 from vipulnsward/25543-freeze-stringKasper Timm Hansen2016-06-281-1/+1
|\ \ \ \ | |/ / / |/| | | Freeze string for default content for tag_strings, which later goes on to build a new one
| * | | Freeze string for default content for tag_strings, which later goes on to ↵Vipul A M2016-06-281-1/+1
|/ / / | | | | | | | | | create new content. This should also be inline with content being passed should not be mutable
* | | Merge pull request #25123 from bf4/remove_problematic_mime_testRafael França2016-06-271-3/+3
|\ \ \ | | | | | | | | Modifies mime-registration test not to interfere with real mime types
| * | | Modifies mime-registration test not to interfere with real mime typesBenjamin Fleischer2016-05-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests introduced in https://github.com/rails/rails/pull/23816/files#diff-384a5a15d8d53de799fb6541688ea5f9R153 register the JSON API media type `application/vnd.api+json` with `Mime[:json]`. The JSON API media type should not be registered with `Mime[:json]`, as discussed in #23712. Moreover, since the actual mime type used in the test is incidental, I've changed this to a valid, but fictional `applcation/vnd.rails+json`. These tests were causing failures in https://github.com/rails/rails/pull/25050#issuecomment-221092934 where `Mime[:jsonapi]` is being added, so that JSON API request params are parsed with the JSONAPI gem.
* | | | Merge pull request #25192 from vipulnsward/25185-default-key-lengthAaron Patterson2016-06-283-9/+7
|\ \ \ \ | | | | | | | | | | Fix default key length on cipher
| * | | | We default to using aes-256-cbc as our verification/signing cipher. It can ↵Vipul A M2016-06-273-9/+7
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accept key lengths of 128, 192 or 256-bit, whereas currently we were providing twice the acceptable value. ruby < 2.4 allowed accepting these values, as extra key bits were ignored. Since https://github.com/ruby/ruby/commit/ce635262f53b760284d56bb1027baebaaec175d1 this now has a strict checking on key length. Default to key length 32 bytes, to match the compatible length for aes-256-cbc Fixes #25185
* | | | Merge pull request #25545 from derekprior/dp-simple-format-docsVipul A M2016-06-271-4/+5
|\ \ \ \ | | | | | | | | | | Document `simple_format` handling of `\r`
| * | | | Document `simple_format` handling of `\r`Derek Prior2016-06-271-4/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | `simple_format` handles `\r\n` and `\r` but previously did not document this behavior. The handling is done with a `gsub` in `split_paragraphs`. [ci skip]
* | | | Merge pull request #25543 from marekkirejczyk/tag_builder_25195Kasper Timm Hansen2016-06-276-63/+364
|\ \ \ \ | | | | | | | | | | New syntax for tag helpers i.e. tag.br instead of tag('br') #25195
| * | | | New syntax for tag helpers i.e. tag.br instead of tag(br) #25195Marek2016-06-276-63/+364
|/ / / /
* | | | Clearify CHANGELOG for #23011 [ci skip]Godfrey Chan2016-06-272-4/+8
| | | |
* | | | Add #16917 to 5.0.0 release notesGodfrey Chan2016-06-271-0/+7
| | | |
* | | | Merge pull request #25536 from alexcameron89/update-transactionsJon Moss2016-06-271-4/+4
|\ \ \ \ | | | | | | | | | | [ci skip] Clarify DDL term in ActiveRecord::Transactions
| * | | | [ci skip] Clarify DDL term in ActiveRecord::TransactionsAlex Kitchens2016-06-271-4/+4
|/ / / /
* | | | Fix Action Cable README [ci skip]Rafael Mendonça França2016-06-261-5/+14
| | | |
* | | | Merge pull request #25534 from kamipo/remove_conflict_lineRafael França2016-06-261-1/+0
|\ \ \ \ | | | | | | | | | | Remove conflict line [ci skip]
| * | | | Remove conflict line [ci skip]Ryuta Kamizono2016-06-271-1/+0
|/ / / /
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-06-263-6/+151
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: actioncable/README.md
| * | | | Fix and make example generic in README as well [ci skip]Vipul A M2016-06-151-3/+3
| | | | |
| * | | | Make log tags example for ACa more generic and not BC specific [ci skip]Vipul A M2016-06-151-3/+4
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 14:07:32 +0000