aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Create MissingExactTemplate exception with separate templateVinicius Stock2018-04-207-20/+37
* 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
* | | Invoke `load_schema` in `_default_attributes`Ryuta Kamizono2018-02-062-0/+8
* | | Use Redis#mget for RedisCacheStore#fetch_multifatkodima2018-02-052-0/+16
* | | Add missing instrumentation to RedisCacheStore#read_multifatkodima2018-02-057-18/+25
* | | Don't output information on drop if not verboseeileencodes2018-02-051-1/+1
* | | Add ability to turn off verbose for database taskseileencodes2018-02-051-3/+7
* | | Redis cache store: consolidate serializationJeremy Daer2018-02-041-17/+21
* | | RedisCacheStore: fix `#write_multi` mset serializationfatkodima2018-02-042-1/+18
* | | Make test runner work with AR test toolyuuji.yaginuma2018-02-041-0/+7
* | | Prefer `@connection.abandon_results!` than `@connection.next_result while @co...Ryuta Kamizono2018-02-041-1/+1
* | | Add nodoc to `migrations_paths` and `migration_context` in `AbstractAdapter`Ryuta Kamizono2018-02-041-2/+2
* | | Merge pull request #31878 from timdiggins/corrections-to-31755Ryuta Kamizono2018-02-041-6/+6
|\ \ \
| * | | Correct capitalization of "Rails" in the guide text.Tim Diggins2018-02-031-6/+6
|/ / /
* | | Merge pull request #28171 from sorra/fresh-thread-tagged-loggingRyuta Kamizono2018-02-031-1/+2
|\ \ \
| * \ \ Merge branch 'master' into fresh-thread-tagged-loggingDongqing Hu2017-02-2610-9/+65
| |\ \ \
| * | | | Improve test for TaggedLogging "keeps each tag in their own thread"Dongqing Hu2017-02-261-1/+2
* | | | | Add nodoc to `CredentialsGenerator` and `MasterKeyGenerator` [ci skip]yuuji.yaginuma2018-02-032-2/+2
* | | | | Merge pull request #31868 from y-yagi/fix-build-failures-on-travisEileen M. Uchitelle2018-02-021-1/+1
|\ \ \ \ \
| * | | | | Avoid bundle clean before cachingyuuji.yaginuma2018-02-021-1/+1
* | | | | | Merge pull request #31276 from freeletics/fix-generators-listEileen M. Uchitelle2018-02-023-18/+5
|\ \ \ \ \ \
| * | | | | | Removed "private" generators from command list.Wojciech Wnętrzak2018-02-023-18/+5
|/ / / / / /
* | | | | | Merge pull request #31854 from huacnlee/allow-more-options-for-service-urlGeorge Claghorn2018-02-012-2/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | |