Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge pull request #21791 from sonalkr132/persistence-doc | Arthur Nogueira Neves | 2016-01-27 | 1 | -8/+9 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Improvement in ActiveRecord::Persistence doc [ci skip] | Aditya Prakash | 2015-10-17 | 1 | -8/+9 | |
* | | | | | | | | | | | Merge pull request #23278 from eldano/fix_doc | Vipul A M | 2016-01-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix doc [ci skip] | Daniel Gomez de Souza | 2016-01-27 | 1 | -1/+1 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #23277 from rails/revert-23152-actioncable-concurrent | David Heinemeier Hansson | 2016-01-27 | 27 | -385/+106 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Revert "Eliminate the EventMachine dependency" | David Heinemeier Hansson | 2016-01-27 | 27 | -385/+106 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge pull request #23275 from aditya-kapoor/remove-dups | प्रथमेश Sonpatki | 2016-01-27 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | remove duplication section [ci skip] | Aditya Kapoor | 2016-01-27 | 1 | -4/+0 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | doc typo | Akira Matsuda | 2016-01-27 | 1 | -2/+2 | |
* | | | | | | | | | | INSERT INTO schema_migrations in 1 SQL | Akira Matsuda & Naoto Koshikawa | 2016-01-27 | 2 | -10/+13 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | add a skip for failing test | Aaron Patterson | 2016-01-26 | 1 | -1/+2 | |
* | | | | | | | | | fix permitted? conditional for `render` calls | Aaron Patterson | 2016-01-26 | 2 | -3/+17 | |
* | | | | | | | | | Merge pull request #23242 from maclover7/fix-error-sec | Aaron Patterson | 2016-01-26 | 2 | -9/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix sanitizer tests | Jon Moss | 2016-01-26 | 1 | -3/+3 | |
| * | | | | | | | | | Fix undefined error for `ActionController::Parameters` | Jon Moss | 2016-01-26 | 1 | -6/+3 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | clear view path cache between tests | Aaron Patterson | 2016-01-26 | 1 | -0/+5 | |
* | | | | | | | | | Merge pull request #23256 from pauloancheta/master | Rafael França | 2016-01-26 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | reflect mapping to match initialize | Paulo Ancheta | 2016-01-25 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #23228 from claudiob/no-em | Claudio B | 2016-01-25 | 3 | -7/+6 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | [ci skip] Don’t explicitly mention EventMachine | claudiob | 2016-01-25 | 3 | -7/+6 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #23251 from kamipo/update_gemfile_lock | Sean Griffin | 2016-01-25 | 1 | -32/+32 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Update `Gemfile.lock` | Ryuta Kamizono | 2016-01-26 | 1 | -32/+32 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge branch '5-0-beta-sec' | Aaron Patterson | 2016-01-25 | 32 | -41/+168 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | bumping version | Aaron Patterson | 2016-01-25 | 11 | -11/+11 | |
| * | | | | | | | | | fix version update task to deal with .beta1.1 | Aaron Patterson | 2016-01-25 | 1 | -1/+1 | |
| * | | | | | | | | | Eliminate instance level writers for class accessors | Aaron Patterson | 2016-01-22 | 6 | -8/+9 | |
| * | | | | | | | | | allow :file to be outside rails root, but anything else must be inside the ra... | Aaron Patterson | 2016-01-22 | 9 | -16/+93 | |
| * | | | | | | | | | Don't short-circuit reject_if proc | Andrew White | 2016-01-22 | 2 | -2/+25 | |
| * | | | | | | | | | stop caching mime types globally | Aaron Patterson | 2016-01-22 | 1 | -2/+16 | |
| * | | | | | | | | | use secure string comparisons for basic auth username / password | Aaron Patterson | 2016-01-22 | 2 | -1/+13 | |
* | | | | | | | | | | Merge pull request #23226 from vipulnsward/20808-fix | Jon Moss | 2016-01-25 | 4 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix nodoc to internal class error document some of them | Vipul A M | 2016-01-25 | 4 | -1/+5 | |
* | | | | | | | | | | | Merge pull request #23161 from schneems/schneems/fix-mysql-internalmetadata | Richard Schneeman | 2016-01-25 | 2 | -9/+36 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | [close #23009] Limit key length | schneems | 2016-01-21 | 2 | -9/+36 | |
* | | | | | | | | | | | | Merge pull request #23208 from vipulnsward/testing-pass-2 | Jon Moss | 2016-01-25 | 1 | -14/+14 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Pass 2 over testing guide | Vipul A M | 2016-01-23 | 1 | -14/+14 | |
* | | | | | | | | | | | | | Merge pull request #23229 from vipulnsward/23221-also-verify-count | Kasper Timm Hansen | 2016-01-25 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | When verifying size of relation, also verify count is ok. | Vipul A M | 2016-01-25 | 1 | -0/+1 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #23210 from sachin21/change_permission | Yves Senn | 2016-01-25 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Change permission to readonly | Satoshi Ohmori | 2016-01-23 | 1 | -0/+0 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #23221 from vipulnsward/23209-fix-missin_source_type | Rafael França | 2016-01-24 | 6 | -0/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Add missing source_type if provided on hmt which belongs to an sti record | Vipul A M | 2016-01-24 | 6 | -0/+26 | |
* | | | | | | | | | | | | | Merge pull request #23051 from prathamesh-sonpatki/fix-collection-cache-key | Rafael França | 2016-01-24 | 2 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix AR::Relation#cache_key to remove select scope added by user | Prathamesh Sonpatki | 2016-01-24 | 2 | -0/+7 | |
* | | | | | | | | | | | | | | Revert "Merge pull request #23218 from karlfreeman/bump_mail" | Rafael Mendonça França | 2016-01-24 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge pull request #23185 from droptheplot/actioncable-custom-channels | Kasper Timm Hansen | 2016-01-24 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Rename channels_path var and fix channel_paths method for ActionCable config | Sergey Novikov | 2016-01-23 | 1 | -5/+5 | |
| * | | | | | | | | | | | | | Allow adding custom paths for action_cable channels | Sergey Novikov | 2016-01-22 | 1 | -2/+4 | |
* | | | | | | | | | | | | | | Merge pull request #23218 from karlfreeman/bump_mail | Santiago Pastorino | 2016-01-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Bump mail gem constraint from [~> 2.5, >= 2.5.4] to ~> 2.6 | Karl Freeman | 2016-01-24 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | |