aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Update release notes about legacy `mysql` adaptereileencodes2016-06-291-2/+4
|/ / /
* | | Update Rails 5 upgrade guideseileencodes2016-06-291-4/+133
* | | Merge pull request #24991 from maclover7/actioncable-npm-docsVipul A M2016-06-291-0/+68
|\ \ \ | |/ / |/| |
| * | Add documentation about Action Cable npm packageJon Moss2016-05-261-0/+68
* | | Merge pull request #25574 from alexcameron89/action_view_baseJon Moss2016-06-291-6/+6
|\ \ \
| * | | [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 typo & add link in PolymorphicRoutesAlex Kitchens2016-06-291-2/+2
* | | | Merge pull request #25559 from kmcphillips/masterSean Griffin2016-06-294-10/+36
|\ \ \ \
| * | | | Do not specal case inspecting associated arrays of over 10 elements, preventi...Kevin McPhillips2016-06-294-10/+36
|/ / / /
* | | | Don't attempt to clear active connections unless we'ere connectedSean Griffin2016-06-291-1/+1
* | | | Remove unused `ActiveRecord::Base.connection_id`Sean Griffin2016-06-295-28/+9
|/ / /
* | | 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]yuuji.yaginuma2016-06-291-1/+1
* | | | Merge pull request #25562 from vipulnsward/select-html-options-testRafael França2016-06-281-1/+10
|\ \ \ \
| * | | | - Added select tag test for verifying passing html options to f.select helperVipul A M2016-06-281-1/+10
| |/ / /
* | | | 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 correctlyRyuta Kamizono2016-06-162-1/+17
* | | | Merge pull request #25544 from piotrj/pj-issue-25488Rafael França2016-06-282-1/+21
|\ \ \ \
| * | | | Fix setting route's to in a scopePiotr Jakubowski2016-06-282-1/+21
* | | | | Fix adding implicitly rendered template digests to ETagsJavan Makhmali2016-06-283-11/+43
|/ / / /
* | | | Make client test run individually.Kasper Timm Hansen2016-06-281-1/+3
* | | | Add dup leftover from 26710ab.Kasper Timm Hansen2016-06-281-1/+1
* | | | Revert "Merge pull request #25131 from javierhonduco/javierhonduco/clone_dept...Matthew Draper2016-06-291-3/+0
* | | | Default to frozen string literals in TagHelper.Kasper Timm Hansen2016-06-281-5/+7
* | | | 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.Vipul A M2016-06-284-14/+13
| | |_|/ | |/| |
* | | | Merge pull request #25551 from vipulnsward/25543-follow-upKasper Timm Hansen2016-06-281-1/+1
|\ \ \ \
| * | | | Expand list of void elements to match spec from https://html.spec.whatwg.org/...Vipul A M2016-06-281-1/+1
| |/ / /
* | | | 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 cre...Vipul A M2016-06-281-1/+1
|/ / /
* | | 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 typesBenjamin Fleischer2016-05-231-3/+3
* | | | Merge pull request #25192 from vipulnsward/25185-default-key-lengthAaron Patterson2016-06-283-9/+7
|\ \ \ \
| * | | | We default to using aes-256-cbc as our verification/signing cipher. It can ac...Vipul A M2016-06-273-9/+7
|/ / / /
* | | | Merge pull request #25545 from derekprior/dp-simple-format-docsVipul A M2016-06-271-4/+5
|\ \ \ \
| * | | | Document `simple_format` handling of `\r`Derek Prior2016-06-271-4/+5
|/ / / /
* | | | 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) #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::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]Ryuta Kamizono2016-06-271-1/+0
|/ / / /
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-06-263-6/+151
|\ \ \ \
| * | | | 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
| * | | | [ci skip] When instance_reader is false, attribute can still be assigned by t...Prathamesh Sonpatki2016-06-151-1/+2