Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Doc: fixes typo `cache:` -> `compress:` | Joseph Page | 2018-02-12 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #31971 from ydakuka/patch-1 | Rafael França | 2018-02-12 | 1 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Change structure of AS core extensions [ci skip] | Yauheni Dakuka | 2018-02-12 | 1 | -9/+9 | |
|/ / / / / / / / / | ||||||
* / / / / / / / / | Add test to make sure pick works in a NullRelation | Rafael Mendonça França | 2018-02-12 | 1 | -0/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #31968 from wojtodzio/fix-activestorage-blob-includes | Rafael França | 2018-02-12 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Use full class names when including concerns to avoid collisions | Wojtek Wrona | 2018-02-12 | 1 | -1/+3 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #31953 from jameslovejoy/improve-wording-getting-started | Eileen M. Uchitelle | 2018-02-12 | 1 | -13/+13 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Improve wording in getting started guide | James Lovejoy | 2018-02-09 | 1 | -13/+13 | |
* | | | | | | | | | Merge pull request #31962 from ydakuka/patch-1 | Ryuta Kamizono | 2018-02-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove parentheses [ci skip] | Yauheni Dakuka | 2018-02-12 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Add missing require | George Claghorn | 2018-02-11 | 1 | -0/+2 | |
* | | | | | | | | | Merge pull request #31957 from claudiob/force-master-key | Yuji Yaginuma | 2018-02-12 | 2 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Respect --force option for config/master.key | claudiob | 2018-02-11 | 2 | -1/+7 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #31133 from mohsen-alizadeh/sanitize_empty_and_nil_paramet... | Matthew Draper | 2018-02-11 | 2 | -0/+16 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | add test case to relation select | Mohsen Alizadeh | 2017-12-03 | 1 | -0/+15 | |
| * | | | | | | | | | sanitize empty and nil parameters to select | Mohsen Alizadeh | 2017-11-12 | 1 | -0/+1 | |
* | | | | | | | | | | Unused core_ext | Akira Matsuda | 2018-02-11 | 1 | -1/+0 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #31949 from rails/remove-move | Claudio B | 2018-02-09 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove warning from 4 years ago [ci skip] | claudiob | 2018-02-09 | 1 | -2/+0 | |
* | | | | | | | | | | Fix formatting of `pick` [ci skip] | yuuji.yaginuma | 2018-02-10 | 1 | -1/+1 | |
* | | | | | | | | | | Make sure assert_recognizes can still find routes mounted after engines | Rafael Mendonça França | 2018-02-09 | 2 | -4/+12 | |
* | | | | | | | | | | Add Relation#pick as short-hand for single-value plucks (#31941) | David Heinemeier Hansson | 2018-02-09 | 2 | -0/+28 | |
* | | | | | | | | | | Merge pull request #31927 from mrreynolds/patch-2 | Eileen M. Uchitelle | 2018-02-09 | 1 | -0/+8 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Document :combine_options | Robert Glaser | 2018-02-08 | 1 | -0/+8 | |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #31942 from yhirano55/use_heredoc_with_credentials_template | Yuji Yaginuma | 2018-02-09 | 2 | -4/+16 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Use heredoc with credentials template | Yoshiyuki Hirano | 2018-02-09 | 2 | -4/+16 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #31934 from fatkodima/fix-has_many_through-dumping | Ryuta Kamizono | 2018-02-09 | 2 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fix marshaling of models with `has_many :through` associations | fatkodima | 2018-02-08 | 2 | -2/+8 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #31919 from bogdanvlviv/fix-test_counter_cache_with_touch_... | Ryuta Kamizono | 2018-02-09 | 1 | -1/+3 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix `test_counter_cache_with_touch_and_lock_version` failure | bogdanvlviv | 2018-02-07 | 1 | -1/+3 | |
* | | | | | | | | | | Merge pull request #31925 from composerinteralia/semicolon | Eileen M. Uchitelle | 2018-02-08 | 1 | -12/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove password anecdotes from guides [ci skip] | Daniel Colson | 2018-02-07 | 1 | -12/+0 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Add docs on how to configure Active Storage | claudiob | 2018-02-08 | 1 | -0/+35 | |
* | | | | | | | | | | Add missing require | yuuji.yaginuma | 2018-02-08 | 1 | -0/+1 | |
* | | | | | | | | | | Do not add master key when `RAILS_MASTER_KEY` env specified (#31922) | Yuji Yaginuma | 2018-02-08 | 4 | -2/+27 | |
* | | | | | | | | | | Merge pull request #31918 from huacnlee/fix/blob-service-url-for-string-filename | George Claghorn | 2018-02-07 | 3 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Fix `blob.service_url` for supports string or nil `:filename` option. | Jason Lee | 2018-02-08 | 3 | -1/+13 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #31923 from jdelStrother/duration-deserialization | Rafael França | 2018-02-07 | 2 | -0/+14 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix yaml deserialization of ActiveSupport::Duration | Jonathan del Strother | 2018-02-07 | 2 | -0/+14 | |
* | | | | | | | | | | Bump `minitest-server` | yuuji.yaginuma | 2018-02-07 | 1 | -2/+2 | |
| |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Revert "✂️" | Ryuta Kamizono | 2018-02-07 | 1 | -1/+2 | |
* | | | | | | | | | ✂️ | schneems | 2018-02-06 | 1 | -2/+1 | |
* | | | | | | | | | Merge pull request #31914 from utilum/bump_em-socksify | Matthew Draper | 2018-02-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Update em-socksify to the latest version | utilum | 2018-02-06 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #31912 from robin850/upgrade-sdoc-1-0 | Matthew Draper | 2018-02-07 | 2 | -11/+5 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Refer to a stable release of SDoc | Robin Dupret | 2018-02-06 | 2 | -11/+5 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #31880 from rmacklin/publish-activestorage-source-in-addit... | Javan Makhmali | 2018-02-06 | 3 | -3/+13 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Include source code in published activestorage npm package | Richard Macklin | 2018-02-06 | 3 | -3/+13 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #31240 from PHedkvist/sys_test_mobile_guide | Eileen M. Uchitelle | 2018-02-06 | 1 | -0/+28 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Example of mobile configuration for system test in guide [ci skip] | Pierre Hedkvist | 2017-12-04 | 1 | -0/+28 |