aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | rm changelog for unreleased changes fixesVipul A M2016-01-221-4/+0
* | | | | | | | | | | Merge pull request #23180 from y-yagi/remove_per_form_csrf_tokens_initializer...Andrew White2016-01-222-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | remove `per_form_csrf_tokens` initializer from Rails APIyuuji.yaginuma2016-01-222-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23174 from JuanitoFatas/followup-skip-action-cableKasper Timm Hansen2016-01-222-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove action_cable_meta_tag when skip action_cableJuanitoFatas2016-01-222-0/+4
* | | | | | | | | | | Merge pull request #23175 from maclover7/add-ac-appgen-testKasper Timm Hansen2016-01-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add `config/cable.yml` to list of default files in Rails generatorJon Moss2016-01-211-0/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #23080 from prathamesh-sonpatki/fix-cache-key-for-loaded-e...Matthew Draper2016-01-222-1/+11
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix ActiveRecord::Relation#cache_key for loaded empty collectionPrathamesh Sonpatki2016-01-162-1/+11
* | | | | | | | | | Merge pull request #23167 from maclover7/fix-21032Rafael França2016-01-213-1/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix `ActionController::Parameters#==` bugJon Moss2016-01-213-1/+15
* | | | | | | | | | | Merge pull request #23078 from y-yagi/add_application_mailer_rb_to_mountable_...Rafael França2016-01-214-1/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | allow symbol to end of string in `wrap_in_modules`yuuji.yaginuma2016-01-162-5/+5
| * | | | | | | | | | | add application_mailer.rb to template of mountable engineyuuji.yaginuma2016-01-153-0/+11
* | | | | | | | | | | | Merge pull request #23165 from shakib609/fix-23157Jon Moss2016-01-211-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | [ci skip] fix #23157Shakib Hossain2016-01-221-0/+5
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Use bind parameters for ranges in where clausesSean Griffin2016-01-212-2/+36
* | | | | | | | | | | | Merge pull request #23164 from vipulnsward/warning-from-renderers-testKasper Timm Hansen2016-01-211-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | - Fix warning introduced in https://github.com/vipulnsward/rails/commit/77acc...Vipul A M2016-01-221-1/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #23156 from plentz/patch-1Guillermo Iguaran2016-01-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | updating secrets.yml template to use rails command instead of rakeDiego Plentz2016-01-211-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #23154 from sealocal/improve-docs-for-respond-toप्रथमेश Sonpatki2016-01-211-4/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | remove doc reference to ActionController::MimeResponds#respond_tosealocal2016-01-201-3/+0
| * | | | | | | | | | | document simple example of ActionController::MimeResponds#respond_tosealocal2016-01-201-1/+9
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #23149 from maclover7/fix-23142Santiago Pastorino2016-01-214-1/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Re-add ActionController::ApiRenderingJon Moss2016-01-204-1/+39
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #23150 from alxndr/guides-tweakJon Moss2016-01-201-3/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | insert newlines into code samplesAlexander2016-01-201-3/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #23140 from rails/fix-search-for-custom-routesAaron Patterson2016-01-202-14/+83
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix marking of custom routes for JourneyAndrew White2016-01-202-14/+83
* | | | | | | | | | | Merge pull request #17573 from zerothabhishek/masterGodfrey Chan2016-01-205-10/+18
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Response etags to always be weak: Prefixed W/ to value returned by ActionDisp...abhishek2016-01-205-10/+18
* | | | | | | | | | | | Merge pull request #23147 from maclover7/update-rf-commentRafael França2016-01-201-4/+5
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Small doc update per RF [ci skip]Jon Moss2016-01-201-4/+5
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #23135 from maclover7/add-22950-changelogJon Moss2016-01-201-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add CHANGELOG.md entry for #22950Jon Moss2016-01-201-0/+8
* | | | | | | | | | | | | Merge pull request #23139 from gsamokovarov/after-create-update-destroy-commi...Rafael França2016-01-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix the API documentation layout of after_*_commitGenadi Samokovarov2016-01-201-3/+3
|/ / / / / / / / / / / /
* / / / / / / / / / / / Revert "Remove literal? check to fix issue with prefixed optionals"eileencodes2016-01-202-13/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #23130 from vipulnsward/html_safe_to_rawRafael França2016-01-2012-43/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | html_safe is not supposed to be public API for AV. This change removes usage ...Vipul A M2016-01-2012-43/+43
* | | | | | | | | | | | Merge pull request #23129 from Amit-Thawait/masterप्रथमेश Sonpatki2016-01-201-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Pluralize counter_cache column name in example [ci skip]Amit Thawait2016-01-201-4/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #22950 from maclover7/adapterize-storage-actioncableMatthew Draper2016-01-2028-74/+347
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix code review commentsJon Moss2016-01-1815-55/+53
| * | | | | | | | | | | Add em-hiredis and redis as default Gems for new applicationsJon Moss2016-01-182-0/+20
| * | | | | | | | | | | Small PostgreSQL adapter refactors / cleanupJon Moss2016-01-182-15/+16
| * | | | | | | | | | | ActionCable::StorageAdapter ==> ActionCable::SubscriptionAdapterJon Moss2016-01-1811-21/+23
| * | | | | | | | | | | All Redis deps are now optional, Postgres --> PostgreSQL adapterJon Moss2016-01-187-15/+17
| * | | | | | | | | | | config_opts => cable, per @kaspthJon Moss2016-01-183-6/+7