aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ / / /
* | | | Prevent extra `column_for` for `change_column_{default,null,comment}`Ryuta Kamizono2017-09-231-7/+4
* | | | `index_name` should be quotedRyuta Kamizono2017-09-221-1/+1
* | | | Return nil if table comment is blankRyuta Kamizono2017-09-222-2/+2
* | | | Merge pull request #30677 from alecspopa/masterRyuta Kamizono2017-09-222-0/+32
|\ \ \ \
| * | | | Implement change_table_comment and change_column_comment for MySql AdapterAlecs Popa2017-09-222-0/+32
* | | | | Merge pull request #30683 from y-yagi/fix_30644Ryuta Kamizono2017-09-222-2/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use `TOPLEVEL_BINDING` in rails runner commandyuuji.yaginuma2017-09-222-2/+14
| |/ / /
* | | | Merge pull request #24199 from meinac/fix_invert_add_indexRyuta Kamizono2017-09-213-2/+13
|\ \ \ \
| * | | | Use algorithm while removing index with db:rollbackMehmet Emin İNAÇ2017-09-213-2/+13
| |/ / /
* | | | Merge pull request #30671 from y-yagi/fix_interpreted_as_argument_prefixRyuta Kamizono2017-09-211-5/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Fix "warning: `*' interpreted as argument prefix"yuuji.yaginuma2017-09-211-5/+5
|/ / /
* | | Merge pull request #30669 from yhirano55/update_link_in_asset_pipeline_guideRyuta Kamizono2017-09-211-1/+1
|\ \ \
| * | | Update link in The Asset Pipeline guide [ci skip]Yoshiyuki Hirano2017-09-211-1/+1
| |/ /
* | | Merge pull request #30619 from jagthedrummer/jeremy/instrumentation-payload-n...Eileen M. Uchitelle2017-09-203-4/+83
|\ \ \ | |/ / |/| |
| * | Update payload names for `sql.active_record` to be more descriptive.Jeremy Green2017-09-203-4/+83
* | | Merge pull request #30548 from chumakoff/update_autosave_guidesEileen M. Uchitelle2017-09-201-4/+4
|\ \ \
| * | | Update Rails Guides about :autosave optionAnton Chumakov2017-09-201-4/+4
* | | | Add missing word [ci skip]George Claghorn2017-09-201-1/+1
* | | | Flesh out ActiveStorage::Filename docsGeorge Claghorn2017-09-201-6/+14
|/ / /
* | | Merge pull request #30624 from bogdanvlviv/deprecate_Module_reachableSean Griffin2017-09-205-52/+23
|\ \ \
| * | | Remove mentions about `Module#reachable?` in "Active Support Core Extensions"...bogdanvlviv2017-09-171-39/+0
| * | | Remove redundant require_relative "module/anonymous" and "module/reachable"bogdanvlviv2017-09-171-3/+0
| * | | Deprecate `Module#reachable?` methodbogdanvlviv2017-09-173-10/+23
* | | | Merge pull request #30629 from yhirano55/add_scope_to_has_one_attached_macroEileen M. Uchitelle2017-09-202-0/+19
|\ \ \ \