aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #23161 from schneems/schneems/fix-mysql-internalmetadataRichard Schneeman2016-01-252-9/+36
|\
| * [close #23009] Limit key lengthschneems2016-01-212-9/+36
* | Merge pull request #23208 from vipulnsward/testing-pass-2Jon Moss2016-01-251-14/+14
|\ \
| * | Pass 2 over testing guideVipul A M2016-01-231-14/+14
* | | Merge pull request #23229 from vipulnsward/23221-also-verify-countKasper Timm Hansen2016-01-251-0/+1
|\ \ \
| * | | When verifying size of relation, also verify count is ok.Vipul A M2016-01-251-0/+1
* | | | Merge pull request #23210 from sachin21/change_permissionYves Senn2016-01-251-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Change permission to readonlySatoshi Ohmori2016-01-231-0/+0
* | | | 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 recordVipul A M2016-01-246-0/+26
* | | | | 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 userPrathamesh Sonpatki2016-01-242-0/+7
* | | | | | Revert "Merge pull request #23218 from karlfreeman/bump_mail"Rafael Mendonça França2016-01-241-1/+1
* | | | | | Merge pull request #23185 from droptheplot/actioncable-custom-channelsKasper Timm Hansen2016-01-241-3/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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.6Karl Freeman2016-01-241-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #23081 from prathamesh-sonpatki/fix-cache-key-for-queries-...Kasper Timm Hansen2016-01-242-2/+13
|\ \ \ \ \ \
| * | | | | | Fix ActiveRecord::Relation#cache_key for relations with no resultsPrathamesh Sonpatki2016-01-222-2/+13
* | | | | | | 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 everyw...Vipul A M2016-01-249-95/+96
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #23152 from matthewd/actioncable-concurrentDavid Heinemeier Hansson2016-01-2427-106/+385
|\ \ \ \ \ \ \
| * | | | | | | Ditch the EM error logging helperMatthew Draper2016-01-243-11/+1
| * | | | | | | Import the relevant portions of faye-websocketMatthew Draper2016-01-2414-44/+332
| * | | | | | | 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 routesFernando Seror2016-01-231-0/+2
* | | | | | | | | Put test-case dependent helper Class inside the test caseAkira Matsuda2016-01-243-39/+39
* | | | | | | | | :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 prathamesh-sonpatki/pare-back-default-index-op...Matthew Draper2016-01-2511-44/+64
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Pare back default `index` option for the migration generatorPrathamesh Sonpatki2016-01-2411-44/+64
* | | | | | | | | Merge pull request #23217 from matthewd/adapter-testsMatthew Draper2016-01-2417-37/+389
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | 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
| * | | | | | | | 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...Prathamesh Sonpatki2016-01-242-1/+9
|/ / / / / / /
* / / / / / / Add environment back to db:structure:loadAndrew White2016-01-231-1/+1
|/ / / / / /
* | | | | | 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`yui-knk2016-01-193-3/+3
* | | | | | | Use the database type to deserialize enumSean Griffin2016-01-234-4/+19
* | | | | | | Document scoping issue with Time.use_zoneAndrew White2016-01-231-1/+17
| |_|_|/ / / |/| | | | |
* | | | | | 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 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]yuuji.yaginuma2016-01-231-2/+2
|/ / / / /