aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Doc: fixes typo `cache:` -> `compress:`Joseph Page2018-02-121-1/+1
* | | | | | | | | Merge pull request #31971 from ydakuka/patch-1Rafael França2018-02-121-9/+9
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Change structure of AS core extensions [ci skip]Yauheni Dakuka2018-02-121-9/+9
|/ / / / / / / / /
* / / / / / / / / Add test to make sure pick works in a NullRelationRafael Mendonça França2018-02-121-0/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #31968 from wojtodzio/fix-activestorage-blob-includesRafael França2018-02-121-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Use full class names when including concerns to avoid collisionsWojtek Wrona2018-02-121-1/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #31953 from jameslovejoy/improve-wording-getting-startedEileen M. Uchitelle2018-02-121-13/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve wording in getting started guideJames Lovejoy2018-02-091-13/+13
* | | | | | | | | Merge pull request #31962 from ydakuka/patch-1Ryuta Kamizono2018-02-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove parentheses [ci skip]Yauheni Dakuka2018-02-121-1/+1
|/ / / / / / / / /
* | | | | | | | | Add missing requireGeorge Claghorn2018-02-111-0/+2
* | | | | | | | | Merge pull request #31957 from claudiob/force-master-keyYuji Yaginuma2018-02-122-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Respect --force option for config/master.keyclaudiob2018-02-112-1/+7
|/ / / / / / / / /
* | | | | | | | | Merge pull request #31133 from mohsen-alizadeh/sanitize_empty_and_nil_paramet...Matthew Draper2018-02-112-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add test case to relation selectMohsen Alizadeh2017-12-031-0/+15
| * | | | | | | | | sanitize empty and nil parameters to selectMohsen Alizadeh2017-11-121-0/+1
* | | | | | | | | | Unused core_extAkira Matsuda2018-02-111-1/+0
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #31949 from rails/remove-moveClaudio B2018-02-091-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove warning from 4 years ago [ci skip]claudiob2018-02-091-2/+0
* | | | | | | | | | Fix formatting of `pick` [ci skip]yuuji.yaginuma2018-02-101-1/+1
* | | | | | | | | | Make sure assert_recognizes can still find routes mounted after enginesRafael Mendonça França2018-02-092-4/+12
* | | | | | | | | | Add Relation#pick as short-hand for single-value plucks (#31941)David Heinemeier Hansson2018-02-092-0/+28
* | | | | | | | | | Merge pull request #31927 from mrreynolds/patch-2Eileen M. Uchitelle2018-02-091-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Document :combine_optionsRobert Glaser2018-02-081-0/+8
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #31942 from yhirano55/use_heredoc_with_credentials_templateYuji Yaginuma2018-02-092-4/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use heredoc with credentials templateYoshiyuki Hirano2018-02-092-4/+16
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #31934 from fatkodima/fix-has_many_through-dumpingRyuta Kamizono2018-02-092-2/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix marshaling of models with `has_many :through` associationsfatkodima2018-02-082-2/+8
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #31919 from bogdanvlviv/fix-test_counter_cache_with_touch_...Ryuta Kamizono2018-02-091-1/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix `test_counter_cache_with_touch_and_lock_version` failurebogdanvlviv2018-02-071-1/+3
* | | | | | | | | | Merge pull request #31925 from composerinteralia/semicolonEileen M. Uchitelle2018-02-081-12/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove password anecdotes from guides [ci skip]Daniel Colson2018-02-071-12/+0
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Add docs on how to configure Active Storageclaudiob2018-02-081-0/+35
* | | | | | | | | | Add missing requireyuuji.yaginuma2018-02-081-0/+1
* | | | | | | | | | Do not add master key when `RAILS_MASTER_KEY` env specified (#31922)Yuji Yaginuma2018-02-084-2/+27
* | | | | | | | | | Merge pull request #31918 from huacnlee/fix/blob-service-url-for-string-filenameGeorge Claghorn2018-02-073-1/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix `blob.service_url` for supports string or nil `:filename` option.Jason Lee2018-02-083-1/+13
| |/ / / / / / / /
* | | | | | | | | Merge pull request #31923 from jdelStrother/duration-deserializationRafael França2018-02-072-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix yaml deserialization of ActiveSupport::DurationJonathan del Strother2018-02-072-0/+14
* | | | | | | | | | Bump `minitest-server`yuuji.yaginuma2018-02-071-2/+2
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Revert "✂️"Ryuta Kamizono2018-02-071-1/+2
* | | | | | | | | ✂️schneems2018-02-061-2/+1
* | | | | | | | | Merge pull request #31914 from utilum/bump_em-socksifyMatthew Draper2018-02-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update em-socksify to the latest versionutilum2018-02-061-1/+1
* | | | | | | | | | Merge pull request #31912 from robin850/upgrade-sdoc-1-0Matthew Draper2018-02-072-11/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Refer to a stable release of SDocRobin Dupret2018-02-062-11/+5
|/ / / / / / / / /
* | | | | | | | | Merge pull request #31880 from rmacklin/publish-activestorage-source-in-addit...Javan Makhmali2018-02-063-3/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Include source code in published activestorage npm packageRichard Macklin2018-02-063-3/+13
|/ / / / / / / / /
* | | | | | | | | Merge pull request #31240 from PHedkvist/sys_test_mobile_guideEileen M. Uchitelle2018-02-061-0/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Example of mobile configuration for system test in guide [ci skip]Pierre Hedkvist2017-12-041-0/+28