aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23221 from vipulnsward/23209-fix-missin_source_typeRafael França2016-01-246-0/+26
|\ | | | | Add missing source_type if provided on hmt which belongs to an sti re…
| * Add missing source_type if provided on hmt which belongs to an sti recordVipul A M2016-01-246-0/+26
| | | | | | | | Fixes #23209
* | Merge pull request #23051 from prathamesh-sonpatki/fix-collection-cache-keyRafael França2016-01-242-0/+7
|\ \ | | | | | | Fix AR::Relation#cache_key to remove select scope added by user
| * | Fix AR::Relation#cache_key to remove select scope added by userPrathamesh Sonpatki2016-01-242-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We don't need the select scope added by user as we only want to max timestamp and size of the collection. So we already know which columns to select. - Additionally having user defined columns in select scope blows the cache_key method with PostGreSQL because it needs all `selected` columns in the group_by clause or aggregate function. - Fixes #23038.
* | | Revert "Merge pull request #23218 from karlfreeman/bump_mail"Rafael Mendonça França2016-01-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 62aa850fee2070ec3e2d9e4f925dfd7790d27b5e, reversing changes made to 8c1f248c58ba65a786ae295def325c8982e7f431. There is no reason to disallow mail 2.5 so we don't need to bump the version constraint since people are still able to use mail 2.6 and get all the memory saving that was pointed in the pull request description.
* | | Merge pull request #23185 from droptheplot/actioncable-custom-channelsKasper Timm Hansen2016-01-241-3/+5
|\ \ \ | |/ / |/| | ActionCable: Allow adding custom paths for channels
| * | Rename channels_path var and fix channel_paths method for ActionCable configSergey Novikov2016-01-231-5/+5
| | |
| * | Allow adding custom paths for action_cable channelsSergey Novikov2016-01-221-2/+4
| | |
* | | Merge pull request #23218 from karlfreeman/bump_mailSantiago Pastorino2016-01-241-1/+1
|\ \ \ | | | | | | | | Bump mail gem constraint from [~> 2.5, >= 2.5.4] to ~> 2.6
| * | | Bump mail gem constraint from [~> 2.5, >= 2.5.4] to ~> 2.6Karl Freeman2016-01-241-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | Mails downstream dependency (Mime-types) has been shown to decrease memory usage significantly in its 3.0 release. This memory decrease will be a big win for users upgrading to Rails 5. Lets nudge users to upgrade Mail alongside Rails.
* | | Merge pull request #23081 from ↵Kasper Timm Hansen2016-01-242-2/+13
|\ \ \ | | | | | | | | | | | | | | | | prathamesh-sonpatki/fix-cache-key-for-queries-with-offset Fix ActiveRecord::Relation#cache_key for relations with no results
| * | | Fix ActiveRecord::Relation#cache_key for relations with no resultsPrathamesh Sonpatki2016-01-222-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - When relations return no result or 0 result then cache_key should handle it gracefully instead of blowing up trying to access `result[:size]` and `result[:timestamp]`. - Fixes #23063.
* | | | Merge pull request #23212 from vipulnsward/bin-railsKasper Timm Hansen2016-01-249-95/+96
|\ \ \ \ | | | | | | | | | | Be consistent in testing outputs from railties test and use /bin/rails
| * | | | Be consistent in testing outputs from railties test and use /bin/rails ↵Vipul A M2016-01-249-95/+96
| | |/ / | |/| | | | | | | | | | | | | | | | | | everywhere(the default behaviour now) instead of mix of /bin/rake /bin/rails everywhere [Ryo Hashimoto & Vipul A M]
* | | | Merge pull request #23152 from matthewd/actioncable-concurrentDavid Heinemeier Hansson2016-01-2427-106/+385
|\ \ \ \ | | | | | | | | | | Eliminate the EventMachine dependency
| * | | | Ditch the EM error logging helperMatthew Draper2016-01-243-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're no longer doing our work in the EM event loop, so errors are quite unlikely, and if they do occur, they're not really our responsibility to handle.
| * | | | Import the relevant portions of faye-websocketMatthew Draper2016-01-2414-44/+332
| | | | | | | | | | | | | | | | | | | | (as adapted to use concurrent-ruby / nio4r instead of eventmachine)
| * | | | Using a hacked faye-websocket, drop EventMachineMatthew Draper2016-01-2417-69/+70
| | | | |
* | | | | Merge pull request #23213 from Ferdy89/docs_format_contraints_with_globJon Moss2016-01-241-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Update the exception of format constraint in routes
| * | | | | Update the exception of format constraint in routesFernando Seror2016-01-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per https://github.com/rails/rails/issues/20264 [ci skip]
* | | | | | Put test-case dependent helper Class inside the test caseAkira Matsuda2016-01-243-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | This fixes :warning: previous definition of download was here
* | | | | | :warning: mismatched indentations at 'end' with 'unless'Akira Matsuda2016-01-242-4/+4
| | | | | |
* | | | | | Test files has to be named *_test.rbAkira Matsuda2016-01-242-0/+0
| | | | | |
* | | | | | Merge pull request #23179 from ↵Matthew Draper2016-01-2511-44/+64
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | prathamesh-sonpatki/pare-back-default-index-option-to-references Pare back default `index` option for the migration generator
| * | | | | Pare back default `index` option for the migration generatorPrathamesh Sonpatki2016-01-2411-44/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Using `references` or `belongs_to` in migrations will always add index for the referenced column by default, without adding `index:true` option to generated migration file. - Users can opt out of this by passing `index: false`. - Legacy migrations won't be affected by this change. They will continue to run as they were before. - Fixes #18146
* | | | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 03:44:47 +0000