aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Test for nil, people not likely to assign it false.Kasper Timm Hansen2017-09-281-2/+2
* | | Merge pull request #30709 from mikeycgto/actiondispatch-use-aead-encrypted-co...Kasper Timm Hansen2017-09-282-3/+28
|\ \ \
| * | | Fixes for use_authenticated_cookie_encryptionMichael Coyne2017-09-272-3/+28
* | | | Deprecate secret_token, long since usurped by secret_key_base.Kasper Timm Hansen2017-09-285-2/+44
* | | | Merge pull request #30736 from bogdanvlviv/fix-activestorage-package_json_ver...Ryuta Kamizono2017-09-281-1/+1
|\ \ \ \
| * | | | Set version in activestorage/package.json in proper format.bogdanvlviv2017-09-271-1/+1
* | | | | Merge pull request #30695 from mikker/add-asserts-enqueued-emails-withGeorge Claghorn2017-09-273-0/+92
|\ \ \ \ \
| * | | | | Add assert_enqueued_email_with to ActionMailer::TestHelperMikkel Malmberg2017-09-273-0/+92
* | | | | | Merge pull request #30471 from dylanahsmith/remove-redundant-trackerAaron Patterson2017-09-272-24/+10
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | activerecord: Remove a redundant mutation trackerDylan Thacker-Smith2017-08-302-24/+10
* | | | | | Merge pull request #30729 from yalab/nested_scaffoldAaron Patterson2017-09-276-10/+75
|\ \ \ \ \ \
| * | | | | | scaffold nested name controller should be fine.yalab2017-09-276-10/+75
* | | | | | | Merge pull request #30614 from kami-zh/yarn-on-bin-updateJavan Makhmali2017-09-271-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Install JavaScript dependencies on updatekami-zh2017-09-161-0/+5
* | | | | | | | Add newlines before/after the `git_source` in bug report templatesRyuta Kamizono2017-09-2711-0/+22
* | | | | | | | Merge pull request #30728 from y-yagi/ensure_transform_keys_of_hwida_to_retur...Ryuta Kamizono2017-09-273-0/+16
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Ensure `HashWithIndifferentAccess#transform_keys` to return `HashWithIndiffer...yuuji.yaginuma2017-09-273-0/+16
* | | | | | | | Add test case for `arel_attribute` with a custom tableRyuta Kamizono2017-09-272-1/+5
|/ / / / / / /
* | | | | | | Merge pull request #30725 from cheerful/record-milliseconds-in-postgres-times...Sean Griffin2017-09-265-2/+81
|\ \ \ \ \ \ \
| * | | | | | | `Postgres::OID::Range` serializes to a `Range`, quote in `Quoting`Thomas Cannon2017-09-265-2/+81
|/ / / / / / /
* | | | | | | Include `ActionDispatch::DrawOnce` in `ActiveSupport::TestCase`Ryuta Kamizono2017-09-271-1/+1
* | | | | | | Remove unused code that was copied from actionpackRyuta Kamizono2017-09-271-52/+1
| |_|_|/ / / |/| | | | |
* | | | | | Remove unused `cached_columns` and `time_related_columns_on_topic` in `Attrib...Ryuta Kamizono2017-09-271-8/+0
* | | | | | Merge pull request #30726 from bogdanvlviv/improve-bug_report_templatesRyuta Kamizono2017-09-2711-0/+11
|\ \ \ \ \ \
| * | | | | | Change :github git source for bug report templatesbogdanvlviv2017-09-2711-0/+11
* | | | | | | Don't generate `foreign_type` if `options[:polymorphic]` is not givenRyuta Kamizono2017-09-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #30713 from yhirano55/add_a_space_to_refinery_cmsJavan Makhmali2017-09-261-1/+1
|\ \ \ \ \ \
| * | | | | | Add an space to RefineryCMS in Engine guide [ci skip]Yoshiyuki Hirano2017-09-261-1/+1
* | | | | | | Treat `Set` as an `Array` in `Relation#where`Sean Griffin2017-09-263-0/+19
* | | | | | | Merge pull request #30550 from tgxworld/fix_memoization_preloadSean Griffin2017-09-264-15/+13
|\ \ \ \ \ \ \
| * | | | | | | PERF: Partially recover some performance when preloading.Guo Xiang Tan2017-09-264-15/+13
* | | | | | | | Merge pull request #30724 from hupfis/patch-1Matthew Draper2017-09-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix typo in 'find_in_batches' examplehupfis2017-09-261-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #30721 from yalab/fix_rake_installMatthew Draper2017-09-261-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Fixed broken `bundle exec rake install`yalab2017-09-261-0/+2
|/ / / / / / /
* / / / / / / Fix indentation in CHANGELOG [ci skip]Ryuta Kamizono2017-09-261-3/+3
|/ / / / / /
* | | | | | Merge pull request #30715 from y-yagi/remove_unused_fixturesRyuta Kamizono2017-09-263-7/+0
|\ \ \ \ \ \
| * | | | | | Remove unused fixturesyuuji.yaginuma2017-09-263-7/+0
|/ / / / / /
* | | | | | [ci skip] Don't mention unrotatable secret_key_base.Kasper Timm Hansen2017-09-251-18/+20
* | | | | | Merge pull request #30705 from frodsan/use-digest-thread-safeMatthew Draper2017-09-262-2/+2
|\ \ \ \ \ \
| * | | | | | Preload digest/sha2 to avoid thread safe error.Francesco Rodriguez2017-09-252-2/+2
* | | | | | | Merge pull request #30700 from y-yagi/respect_quiet_optionKasper Timm Hansen2017-09-253-17/+22
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Respect quiet option in all process of `rails new` commandyuuji.yaginuma2017-09-253-17/+22
| |/ / / / /
* | | | | | Merge pull request #30703 from dixpac/fix_minor_code_climate_issueKasper Timm Hansen2017-09-251-1/+1
|\ \ \ \ \ \
| * | | | | | Fix minor CodeClimate issuedixpac2017-09-251-1/+1
| |/ / / / /
* | | | | / Fix cookies/session tests broken after merging key rotation.Kasper Timm Hansen2017-09-253-37/+34
| |_|_|_|/ |/| | | |
* | | | | Merge pull request #30704 from ydakuka/new-fixesRyuta Kamizono2017-09-252-3/+3
|\ \ \ \ \
| * | | | | new missing backquotes [ci skip]Yauheni Dakuka2017-09-252-3/+3
* | | | | | Merge pull request #30706 from tgxworld/fix_preload_memoizationRyuta Kamizono2017-09-251-6/+5
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | PERF: Restore memoization when preloading associations.Guo Xiang Tan2017-09-251-6/+5
|/ / / / /