aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Depend on Zeitwerk 1.4.2Xavier Noria2019-03-232-3/+3
* Merge pull request #35683 from Kukunin/masterRyuta Kamizono2019-03-232-7/+38
|\
| * Fix unintended autosave on has_one through associationSergiy Kukunin2019-03-222-7/+38
* | Merge pull request #35719 from shailesh-kalamkar/fix-change-log-typoRichard Schneeman2019-03-221-1/+1
|\ \
| * | [ci skip] Fixed typoShailesh Kalamkar2019-03-231-1/+1
|/ /
* | Update comment for how secret key is calculatedJohn Hawthorn2019-03-221-1/+2
* | Merge pull request #35713 from gmcgibbon/drop_nsec_in_job_argument_assertionsGannon McGibbon2019-03-223-0/+73
|\ \
| * | Drop microseconds in job argument assertionsGannon McGibbon2019-03-223-0/+73
* | | Merge pull request #35715 from jhawthorn/changelog_for_cves_6_0John Hawthorn2019-03-222-2/+21
|\ \ \
| * | | Update CHANGELOGs for 6.0.0.beta3 releaseJohn Hawthorn2019-03-222-2/+21
* | | | Merge pull request #35710 from alimi/as-changelog-typoJohn Hawthorn2019-03-221-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix AS CHANGELOG typoAli Ibrahim2019-03-221-1/+1
|/ / /
* | | Merge pull request #35707 from localhostdotdev/fix-rails-guides-generation-in...Rafael França2019-03-221-1/+1
|\ \ \
| * | | Fix rails guides generationlocalhostdotdev2019-03-221-1/+1
* | | | Merge pull request #35705 from alimi/instrumenter-block-optionalEileen M. Uchitelle2019-03-224-4/+29
|\ \ \ \ | |_|/ / |/| | |
| * | | Update instrumentation guides w/optional blockAli Ibrahim2019-03-221-0/+11
| * | | Update CHANGELOG and docsAli Ibrahim2019-03-222-3/+11
| * | | Update AS::Notifications::Instrumenter#instrumentAli Ibrahim2019-03-222-1/+7
|/ / /
* | | Merge pull request #35617 from mattyoho/add-annotation-support-to-relationsEileen M. Uchitelle2019-03-2238-19/+645
|\ \ \
| * | | Add Relation#annotate for SQL commentingMatt Yoho2019-03-2138-19/+645
* | | | Merge pull request #35695 from jhawthorn/render_templateRafael França2019-03-227-42/+43
|\ \ \ \
| * | | | Prefer render template: in testsJohn Hawthorn2019-03-217-42/+43
* | | | | 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
|\ \ \ \