aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix path of Action Cable configuration file [ci skip]yuuji.yaginuma2016-01-231-2/+2
| | | | This changed in #22950.
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-01-221-1/+1
|\
| * [ci skip] An internal link is an relative pathyui-knk2015-12-231-1/+1
| |
* | Merge pull request #23201 from dkniffin/patch-1Jon Moss2016-01-221-7/+7
|\ \ | | | | | | Move ApplicationCable::Channel section of readme
| * | Move ApplicationCable::Channel section of readmeDerek Kniffin2016-01-221-7/+7
|/ / | | | | I believe the paragraph starting with "This relies" belongs with the one above it.
* | Merge pull request #23126 from Gaurav2728/implement_rake_to_rails_taks_in_docJon Moss2016-01-221-43/+62
|\ \ | | | | | | Rails 5.0+ rake commands implemented in Rails Framework itself. We pr…
| * | Rails 5.0+ rake commands implemented in Rails Framework itself. We prefer to ↵Gaurav Sharma2016-01-221-43/+62
| | | | | | | | | | | | use bin/rails instead of rake [ci skip]
* | | Merge pull request #23194 from britg/patch-2Matthew Draper2016-01-231-1/+1
|\ \ \ | |/ / |/| | Use the correct reference to the redis connection
| * | Use the correct reference to the redis connectionBrit Gardner2016-01-221-1/+1
|/ / | | | | | | | | Fixes #23193 This was throwing `There was an exception - NameError(undefined local variable or method `hi_redis_conn' for #<ActionCable::SubscriptionAdapter::Redis:0x007fb1449e2b70>)` on unsubscribe.
* | Merge pull request #23177 from vipulnsward/testing-pass-1Jon Moss2016-01-221-7/+7
|\ \ | | | | | | First pass over parts of Testing guide
| * | First pass over parts of Testing guideVipul A M2016-01-221-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Grammar improvements - Consistent usage of you or we in sentences - Tests can have zero or more assertions. Its not mandatory to have one. - Example for assert_send [ci skip]
* | | Merge pull request #23182 from palkan/add-docs-tsrangeJon Moss2016-01-221-1/+5
|\ \ \ | | | | | | | | [ci skip] Add note about tsrange and timezone awareness to docs
| * | | [ci skip] Add note about tsrange and timezone awareness to docspalkan2016-01-221-1/+5
|/ / /
* | | Merge pull request #23178 from vipulnsward/rm-changelogAndrew White2016-01-221-4/+0
|\ \ \ | | | | | | | | rm changelog for unreleased changes fixes
| * | | rm changelog for unreleased changes fixesVipul A M2016-01-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Based on https://github.com/rails/rails/pull/23167/files#r50507317 [ci skip]
* | | | Merge pull request #23180 from ↵Andrew White2016-01-222-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | y-yagi/remove_per_form_csrf_tokens_initializer_from_rails_api remove `per_form_csrf_tokens` initializer from Rails API
| * | | remove `per_form_csrf_tokens` initializer from Rails APIyuuji.yaginuma2016-01-222-0/+2
|/ / / | | | | | | | | | | | | Because the form is not in the Rails API, `per_form_csrf_tokens` initializer I think unnecessary.
* | | Merge pull request #23174 from JuanitoFatas/followup-skip-action-cableKasper Timm Hansen2016-01-222-0/+4
|\ \ \ | | | | | | | | Remove action_cable_meta_tag when skip Action Cable
| * | | 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 generator
| * | | | Add `config/cable.yml` to list of default files in Rails generatorJon Moss2016-01-211-0/+1
| |/ / /
* | | | Merge pull request #23080 from ↵Matthew Draper2016-01-222-1/+11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | prathamesh-sonpatki/fix-cache-key-for-loaded-empty-collection Fix ActiveRecord::Relation#cache_key for loaded empty collection
| * | | Fix ActiveRecord::Relation#cache_key for loaded empty collectionPrathamesh Sonpatki2016-01-162-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Before this patch if we try to find cache_key of a loaded but empty collection it used to give error because of trying to call `updated_at` on `nil` value generated by `collection.max_by(&timestamp_column).public_send(timestamp_column)`. - This commit fixes above error by checking if size is greater than zero or not.
* | | | Merge pull request #23167 from maclover7/fix-21032Rafael França2016-01-213-1/+15
|\ \ \ \ | | | | | | | | | | Fix `ActionController::Parameters#==` bug
| * | | | Fix `ActionController::Parameters#==` bugJon Moss2016-01-213-1/+15
| | | | | | | | | | | | | | | | | | | | See bug #21032.
* | | | | Merge pull request #23078 from ↵Rafael França2016-01-214-1/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | y-yagi/add_application_mailer_rb_to_mountable_engine add application_mailer.rb to template of mountable engine
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since 9446e38ba47c9ca3be2ad668d8a8bea0141be6fc, generated mailer inherents from ApplicationMailer, ApplicationMailer is required in the mountable engine.
* | | | | | Merge pull request #23165 from shakib609/fix-23157Jon Moss2016-01-211-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ci skip] fix #23157
| * | | | | | [ci skip] fix #23157Shakib Hossain2016-01-221-0/+5
| | |_|_|/ / | |/| | | |
* | | | | | Use bind parameters for ranges in where clausesSean Griffin2016-01-212-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a similar case to wanting ot use bind params for limit and offset. Right now passing a range grows the amount of prepared statements in an unbounded fashion. We could avoid using prepared statements in that case, similar to what we do with arrays, but there's a known number of variants for ranges. This ends up duplicating some of the logic from Arel for how to handle potentially infinite ranges, and that behavior may be removed from Arel in the future. Fixes #23074
* | | | | | Merge pull request #23164 from vipulnsward/warning-from-renderers-testKasper Timm Hansen2016-01-211-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix warning introduced in API response fix
| * | | | | - Fix warning introduced in ↵Vipul A M2016-01-221-1/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/vipulnsward/rails/commit/77acc004efad07dfd4d4f83be14ef897968a3fd9 when fixing API responses. - render :text is deprecated, so added an assertion for it.
* | | | | Merge pull request #23156 from plentz/patch-1Guillermo Iguaran2016-01-211-1/+1
|\ \ \ \ \ | | | | | | | | | | | | updating secrets.yml template to use rails command instead of rake
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Improve Docs for ActionController::MimeResponds#respond_to
| * | | | | 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::ApiRendering
| * | | | | Re-add ActionController::ApiRenderingJon Moss2016-01-204-1/+39
| | |/ / / | |/| | | | | | | | | | | | | | | | | | - Fixes bug #23142. - Bug was occurring only with ActionController::API, because `_process_options` wasn't being run for API requests, even though it was being run for normal app requests.
* | | | | Merge pull request #23150 from alxndr/guides-tweakJon Moss2016-01-201-3/+5
|\ \ \ \ \ | |/ / / / |/| | | | insert newlines into code samples in Upgrading section of Asset Pipeline doc
| * | | | insert newlines into code samplesAlexander2016-01-201-3/+5
|/ / / / | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #23140 from rails/fix-search-for-custom-routesAaron Patterson2016-01-202-14/+83
|\ \ \ \ | | | | | | | | | | Fix marking of custom routes for Journey
| * | | | Fix marking of custom routes for JourneyAndrew White2016-01-202-14/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Mapper build_path method marks routes where path parameters are part of a path segment as custom routes by altering the regular expression, e.g: get '/foo-:bar', to: 'foo#bar' There were some edge cases where certain constructs weren't being picked up and this commit fixes those. Fixes #23069.
* | | | | Merge pull request #17573 from zerothabhishek/masterGodfrey Chan2016-01-205-10/+18
|\ \ \ \ \ | | | | | | | | | | | | Response etags to always be weak: Prefixed 'W/' to value returned by Act...
| * | | | | Response etags to always be weak: Prefixed W/ to value returned by ↵abhishek2016-01-205-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | ActionDispatch::Http::Cache::Response#etag= such that etags set in fresh_when and stale? are weak. For #17556.
* | | | | | Merge pull request #23147 from maclover7/update-rf-commentRafael França2016-01-201-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Small doc update per RF [ci skip]
| * | | | | | 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 #22950
| * | | | | | Add CHANGELOG.md entry for #22950Jon Moss2016-01-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 00:35:17 +0000