aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix announce scriptRafael Mendonça França2019-03-221-2/+5
* Fix release templateRafael Mendonça França2019-03-211-2/+2
* Fix server restart test on Puma 3.12.1yuuji.yaginuma2019-03-222-4/+4
* Fix document formatting of Database configuration classes [ci skip]yuuji.yaginuma2019-03-213-35/+35
* Address rubocop offencesRyuta Kamizono2019-03-212-9/+9
* Merge pull request #35685 from XrXr/attribute-forwardingGannon McGibbon2019-03-202-0/+24
|\
| * Document option forwarding in ActiveRecord::Base.attributeAlan Wu2019-03-202-0/+24
* | Merge pull request #35546 from rails/bulk-inserts-with-indexKasper Timm Hansen2019-03-203-139/+165
|\ \
| * | [ci skip] Documentation pass for insert_all etc.Kasper Timm Hansen2019-03-201-105/+107
| * | Bulk Insert: Reuse indexes for unique_byKasper Timm Hansen2019-03-203-64/+88
| |/
* | Merge pull request #35661 from jhawthorn/lookup_context_validationEileen M. Uchitelle2019-03-204-3/+19
|\ \ | |/ |/|
| * Don't compact formatsJohn Hawthorn2019-03-192-6/+1
| * Avoid assigning [nil] to formatsJohn Hawthorn2019-03-191-1/+1
| * Improve "raises on invalid format assignment" testJohn Hawthorn2019-03-181-2/+2
| * Rename invalid_types to invalid_valuesJohn Hawthorn2019-03-181-3/+3
| * Use symbol for mail preview format, not stringJohn Hawthorn2019-03-181-1/+1
| * Raise in LookupContext#formats= on invalid formatJohn Hawthorn2019-03-182-0/+13
| * Make uniq in LookupContext#formats=John Hawthorn2019-03-182-1/+3
| * Ignore nil in LookupContext#formats=John Hawthorn2019-03-182-0/+6
* | Merge pull request #35677 from bogdanvlviv/mention-process_middleware.action_...Kasper Timm Hansen2019-03-201-1/+10
|\ \
| * | Add mention about `process_middleware.action_dispatch` in the guide [ci skip]bogdanvlviv2019-03-201-1/+10
* | | Merge pull request #35679 from y-yagi/make_aliases_of_database_option_workYuji Yaginuma2019-03-205-2/+32
|\ \ \ | |/ / |/| |
| * | Make aliases of `database` option in generators workyuuji.yaginuma2019-03-205-2/+32
|/ /
* | Merge pull request #35649 from andrehjr/fix-override-of-cookies-controller-specsRafael França2019-03-192-1/+14
|\ \
| * | Don't override @set_cookies on CookieJar#update_cookies_from_jar'André Luis Leal Cardoso Junior2019-03-172-1/+14
* | | Merge pull request #35595 from shioyama/generated_attribute_methods_namespace...Rafael França2019-03-192-4/+5
|\ \ \
| * | | Give GeneratedAttributeMethods module a nameChris Salzberg2019-03-132-4/+5
* | | | Merge pull request #35675 from larouxn/revert-35656-revert-34277-remove-javas...Rafael França2019-03-192-4/+0
|\ \ \ \
| * | | | Revert "Revert "Remove `javascripts` and `javascript_engine` options for gene...Nicholas La Roux2019-03-202-4/+0
|/ / / /
* | | | Fix test broken by 04ae0b0b5e594e0bb99c5cd608921745977bcdcdRafael Mendonça França2019-03-191-3/+4
* | | | Merge pull request #35670 from jhawthorn/re_add_template_updated_atRafael França2019-03-192-6/+13
|\ \ \ \
| * | | | Re-add Template#updated_at as deprecatedJohn Hawthorn2019-03-192-6/+13
|/ / / /
* | | | Merge pull request #35656 from larouxn/revert-34277-remove-javascripts-javasc...Rafael França2019-03-192-0/+4
|\ \ \ \
| * | | | Revert "Remove `javascripts` and `javascript_engine` options for generators"Nicholas La Roux2019-03-192-0/+4
* | | | | Merge pull request #35664 from jeremyevans/remove-roflscalingRafael França2019-03-193-85/+26
|\ \ \ \ \
| * | | | | Remove roflscaling constantsJeremy Evans2019-03-192-15/+0
| * | | | | Remove roflscalingJeremy Evans2019-03-183-70/+26
| | |_|_|/ | |/| | |
* | | | | Merge pull request #35662 from jhawthorn/fallback_resolver_no_virtual_pathAaron Patterson2019-03-192-8/+32
|\ \ \ \ \
| * | | | | Remove virtual_path from fallback templatesJohn Hawthorn2019-03-182-8/+32
| |/ / / /
* | | | | Merge pull request #35660 from kamipo/sanitize_as_sql_commentRyuta Kamizono2019-03-205-8/+15
|\ \ \ \ \
| * | | | | Extract `sanitize_as_sql_comment` from SQL visitor into connectionRyuta Kamizono2019-03-195-8/+15
| |/ / / /
* | | | | Merge pull request #35669 from cpruitt/update-mime-type-regexpAaron Patterson2019-03-192-1/+19
|\ \ \ \ \
| * | | | | Update regular expression for checking valid MIME typeCliff Pruitt2019-03-192-1/+19
* | | | | | Instrument middleware processingDaniel Schierbeck2019-03-192-7/+57
|/ / / / /
* | | | | Merge pull request #35358 from tjwallace/patch-1Eileen M. Uchitelle2019-03-191-0/+3
|\ \ \ \ \
| * | | | | Add documentation for the resource(s) :param optionJeff Wallace2019-02-211-0/+3
* | | | | | update_at/on note for ActiveRecord::Relation.update_all (#35461)Orhan Toy2019-03-191-2/+4
* | | | | | Merge pull request #35604 from jhawthorn/validate_mime_typesEileen M. Uchitelle2019-03-194-4/+45
|\ \ \ \ \ \
| * | | | | | Raise exception when building invalid mime typeJohn Hawthorn2019-03-144-4/+45
* | | | | | | Merge pull request #35620 from RTJ/masterEileen M. Uchitelle2019-03-191-1/+3
|\ \ \ \ \ \ \