aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Using a hacked faye-websocket, drop EventMachineMatthew Draper2016-01-2417-69/+70
|
* Merge pull request #23217 from matthewd/adapter-testsMatthew Draper2016-01-2417-37/+389
|\ | | | | ActionCable Adapter tests
| * Add tests for the ActionCable adaptersMatthew Draper2016-01-249-0/+236
| |
| * Allow subscription adapters to be shut downMatthew Draper2016-01-244-14/+40
| |
| * Add Async and Inline adaptersMatthew Draper2016-01-242-0/+44
| | | | | | | | | | Just like their ActiveJob equivalents, these only work within the current process.
| * Normalize on no arguments for the success callbackMatthew Draper2016-01-242-2/+2
| |
| * Split internal subscriber tracking from Postgres adapterMatthew Draper2016-01-243-24/+70
| |
* | Merge pull request #23216 from prathamesh-sonpatki/fix-23137Matthew Draper2016-01-242-1/+9
|\ \ | |/ |/| Rails::Generators::Actions#gem should work even if frozen string is passed as argument
| * Rails::Generators::Actions#gem should work even if frozen string is passed ↵Prathamesh Sonpatki2016-01-242-1/+9
|/ | | | | | as argument - Fixes #23137.
* Add environment back to db:structure:loadAndrew White2016-01-231-1/+1
| | | | | | Because of the changes in #22967 the assumption in #18907 is no longer true because the internal metadata feature for Active Record requires a working environment.
* Merge pull request #23102 from yui-knk/foreign_type_to_singular_associationEileen M. Uchitelle2016-01-233-3/+3
|\ | | | | Define `:foreign_type` as a valid option in `SingularAssociation`
| * Define `:foreign_type` as a valid option in `SingularAssociation`yui-knk2016-01-193-3/+3
| | | | | | | | | | `:foreign_type` is a valid option for `belongs_to` and `has_one` so remove this to `SingularAssociation`.
* | Use the database type to deserialize enumSean Griffin2016-01-234-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | This fixes incorrect assumptions made by e991c7b that we can assume the DB is already casting the value for us. The enum type needs additional information to perform casting, and needs a subtype. I've opted not to call `super` in `cast`, as we have a known set of types which we accept there, and the subtype likely doesn't accept them (symbol -> integer doesn't make sense) Close #23190
* | Document scoping issue with Time.use_zoneAndrew White2016-01-231-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Time.use_zone method will only affect ActiveSupport::TimeWithZone instances created inside of the block passed to Time.use_zone. This could be confusing when fetching a model and then reading the attribute before the block and it not changing afterwards because Active Record caches the conversion from the database value. Since changing the behavior of Active Record to recreate the value on every attribute read is an expensive operation the best we can do is to document the issue. Fixes #23195. [ci skip]
* | Merge pull request #23206 from joyvuu-dave/action_cable_api_fixKasper Timm Hansen2016-01-232-1/+13
|\ \ | | | | | | prevent --skip-action-cable from erroring when --api option is used
| * | prevent --skip-action-cable from erroring when --api option is usedDave Riddle2016-01-222-1/+13
|/ /
* | Merge pull request #23207 from y-yagi/fix_path_of_actioncable_configप्रथमेश Sonpatki2016-01-231-2/+2
|\ \ | | | | | | fix path of Action Cable configuration file [ci skip]
| * | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 09:38:00 +0000