aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ActionCable: use find method when unsubscribingRichard Machielse2017-09-261-1/+1
* 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
|/ /
* | mocha 1.3.0Akira Matsuda2017-09-252-3/+3
* | Unneeded Mocha stubs for Kernel#systemAkira Matsuda2017-09-251-2/+0
* | Extract `integer_like_primary_key_type` to ease to handle it for adaptersRyuta Kamizono2017-09-254-17/+18
* | Merge pull request #30615 from yhirano55/update_form_helpers_guideRyuta Kamizono2017-09-251-7/+11
|\ \
| * | Update Form Helpers guide to fix example codes [ci skip]Yoshiyuki Hirano2017-09-171-7/+11
* | | Merge pull request #30698 from bogdanvlviv/remove-unused-variables-from-relea...Ryuta Kamizono2017-09-251-1/+0
|\ \ \
| * | | Remove unused variable `gem_version` from `tasks/release.rb`bogdanvlviv2017-09-241-1/+0
* | | | Fix `test_should_sanitize_illegal_style_properties` failureRyuta Kamizono2017-09-251-2/+2
* | | | Skip complex cookie tests for now; I'll deal with them tomorrow.Kasper Timm Hansen2017-09-242-0/+6
* | | | Fix RotationConfiguration test and remove nil-kind rotates.Kasper Timm Hansen2017-09-242-29/+8
* | | | Fix "warning: `*' interpreted as argument prefix"Ryuta Kamizono2017-09-251-2/+2
* | | | Merge pull request #30693 from yhirano55/refactor_css_scaffold_generatorKasper Timm Hansen2017-09-241-3/+3
|\ \ \ \
| * | | | Refactor Css::Generators::ScaffoldGeneratorYoshiyuki Hirano2017-09-251-3/+3
* | | | | [ci skip] Attempt a new explanation for rotations.Kasper Timm Hansen2017-09-244-81/+60
* | | | | Use new rotation signature in cookies.Kasper Timm Hansen2017-09-243-73/+25
* | | | | Remove advanced key generator rotations from verifier/encryptor.Kasper Timm Hansen2017-09-243-198/+66
* | | | | Infer options from the primary verifier.Kasper Timm Hansen2017-09-243-12/+27
* | | | | [ci skip] RotationConfiguration is an implementation detail, not public API.Kasper Timm Hansen2017-09-242-8/+5
| |/ / / |/| | |
* | | | Merge pull request #29716 from mikeycgto/active-support-key-rotatorKasper Timm Hansen2017-09-2420-253/+975
|\ \ \ \
| * | | | Add key rotation cookies middlewareMichael Coyne2017-09-2411-248/+396
| * | | | Add key rotation message Encryptor and VerifierMichael Coyne2017-09-2310-5/+579
* | | | | [ci skip] Fix the with order and explain it.Kasper Timm Hansen2017-09-241-3/+8
* | | | | Merge pull request #30593 from BigChief45/guides/action-mailer-parameterizedKasper Timm Hansen2017-09-241-29/+48
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update Action Mailer Basics [skip ci]Jaime Alvarez2017-09-241-29/+48
* | | | | Merge pull request #30668 from yhirano55/fix_api_guideRyuta Kamizono2017-09-241-1/+0
|\ \ \ \ \
| * | | | | Fix rails middleware list in api_app guide [ci skip]Yoshiyuki Hirano2017-09-241-1/+0
* | | | | | Merge pull request #30689 from yhirano55/fix_email_in_active_support_instrume...Sean Griffin2017-09-231-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix email in Active Support Instrumentation [ci skip]Yoshiyuki Hirano2017-09-241-2/+2
|/ / / / /
* | | | | Merge pull request #30688 from y-yagi/make_bang_verion_work_with_inheritable_...Sean Griffin2017-09-232-1/+14
|\ \ \ \ \
| * | | | | Make bang version work with `InheritableOptions`yuuji.yaginuma2017-09-232-1/+14
| | |_|_|/ | |/| | |
* | | | | Move integer-like primary key normalization to `new_column_definition`Ryuta Kamizono2017-09-236-38/+28
* | | | | Adding legacy primary key should be compatibleRyuta Kamizono2017-09-232-0/+70
* | | | | Merge pull request #30686 from metaskills/sqlserver-1as1fixSean Griffin2017-09-221-1/+1
|\ \ \ \ \
| * | | | | Ensure `1 AS one` for SQL Server with calculations.Ken Collins2017-09-221-1/+1
|/ / / / /