aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Revert "Eliminate the EventMachine dependency"David Heinemeier Hansson2016-01-2727-385/+106
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #23275 from aditya-kapoor/remove-dupsप्रथमेश Sonpatki2016-01-271-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | remove duplication section [ci skip]Aditya Kapoor2016-01-271-4/+0
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | doc typoAkira Matsuda2016-01-271-2/+2
* | | | | | | | | | | INSERT INTO schema_migrations in 1 SQLAkira Matsuda & Naoto Koshikawa2016-01-272-10/+13
|/ / / / / / / / / /
* | | | | | | | | | add a skip for failing testAaron Patterson2016-01-261-1/+2
* | | | | | | | | | fix permitted? conditional for `render` callsAaron Patterson2016-01-262-3/+17
* | | | | | | | | | Merge pull request #23242 from maclover7/fix-error-secAaron Patterson2016-01-262-9/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix sanitizer testsJon Moss2016-01-261-3/+3
| * | | | | | | | | | Fix undefined error for `ActionController::Parameters`Jon Moss2016-01-261-6/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | clear view path cache between testsAaron Patterson2016-01-261-0/+5
* | | | | | | | | | Merge pull request #23256 from pauloancheta/masterRafael França2016-01-261-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | reflect mapping to match initializePaulo Ancheta2016-01-251-1/+1
* | | | | | | | | | | Merge pull request #23228 from claudiob/no-emClaudio B2016-01-253-7/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ci skip] Don’t explicitly mention EventMachineclaudiob2016-01-253-7/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #23251 from kamipo/update_gemfile_lockSean Griffin2016-01-251-32/+32
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update `Gemfile.lock`Ryuta Kamizono2016-01-261-32/+32
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '5-0-beta-sec'Aaron Patterson2016-01-2532-41/+168
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | bumping versionAaron Patterson2016-01-2511-11/+11
| * | | | | | | | | | fix version update task to deal with .beta1.1Aaron Patterson2016-01-251-1/+1
| * | | | | | | | | | Eliminate instance level writers for class accessorsAaron Patterson2016-01-226-8/+9
| * | | | | | | | | | allow :file to be outside rails root, but anything else must be inside the ra...Aaron Patterson2016-01-229-16/+93
| * | | | | | | | | | Don't short-circuit reject_if procAndrew White2016-01-222-2/+25
| * | | | | | | | | | stop caching mime types globallyAaron Patterson2016-01-221-2/+16
| * | | | | | | | | | use secure string comparisons for basic auth username / passwordAaron Patterson2016-01-222-1/+13
* | | | | | | | | | | Merge pull request #23226 from vipulnsward/20808-fixJon Moss2016-01-254-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix nodoc to internal class error document some of themVipul A M2016-01-254-1/+5
* | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \