aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Permit opening a blob in a custom tempdirGeorge Claghorn2018-05-175-9/+26
* Merge pull request #32921 from joshsusser/masterRafael França2018-05-173-2/+62
|\
| * Generate getter and setter methods in mixinJosh Susser2018-05-173-2/+62
* | Fix markdown [ci skip]Rafael Mendonça França2018-05-171-1/+1
|/
* Merge pull request #32908 from anniecodes/fix-time-random-stringRafael França2018-05-174-0/+28
|\
| * Fix user_input_in_time_zone to coerce non valid string into nilAnnie-Claude Côté2018-05-163-0/+27
| * Add missing require for string to timezone conversionAnnie-Claude Côté2018-05-161-0/+1
* | Fix formatting of author credit [ci skip]Ryuta Kamizono2018-05-171-1/+1
* | Merge pull request #32916 from lucfranken/patch-1Ryuta Kamizono2018-05-171-1/+1
|\ \
| * | Active storage: Image variant options not correctlucfranken2018-05-171-1/+1
|/ /
* | Remove unused `require "active_support/core_ext/string/filters"`Ryuta Kamizono2018-05-171-2/+0
* | Add ActiveStorage::Previewer#tempdirGeorge Claghorn2018-05-161-1/+5
* | Add missing block parametersGeorge Claghorn2018-05-162-2/+2
* | Demonstrate ActiveStorage::Blob#open in the Active Storage guideGeorge Claghorn2018-05-161-42/+9
* | Add ActiveStorage::Blob#openGeorge Claghorn2018-05-168-12/+81
* | Don't expose `SingularAssociation#replace` which is internal APIRyuta Kamizono2018-05-163-47/+44
|/
* Remove :nodoc: from the methods which is added the doc [ci skip]Ryuta Kamizono2018-05-151-4/+4
* Merge pull request #32724 from nikolai-b/add_math_testRyuta Kamizono2018-05-152-9/+83
|\
| * Add math testsNikolai B2018-05-142-9/+83
|/
* Merge pull request #32837 from ttanimichi/app-update-skip-springYuji Yaginuma2018-05-143-1/+17
|\
| * Don't generate `config/spring.rb` in `app:update` task when spring isn't loadedTsukuru Tanimichi2018-05-133-1/+17
* | Merge pull request #32876 from wata727/add_available_transformationsGeorge Claghorn2018-05-131-0/+3
|\ \
| * | Add available transformations to docs [ci skip]wata_mac2018-05-131-0/+3
* | | Fix `CustomCops/AssertNot` to allow it to have failure messageRyuta Kamizono2018-05-1345-143/+143
* | | Merge pull request #32878 from eugeneius/rm_rollback_active_record_stateRyuta Kamizono2018-05-131-14/+1
|\ \ \
| * | | Remove ActiveRecord::Transactions#rollback_active_record_state!Eugene Kenny2018-05-131-14/+1
| |/ /
* | | Merge pull request #32862 from eugeneius/callback_rollbackRyuta Kamizono2018-05-132-7/+13
|\ \ \ | |/ / |/| |
| * | Don't clear transaction state after manual rollbackEugene Kenny2018-05-102-7/+13
* | | Pass the error instance as the second parameter of block executed by `discard...yuuji.yaginuma2018-05-124-3/+9
* | | Merge pull request #32843 from ttanimichi/remove_unused_remove_fileYuji Yaginuma2018-05-121-4/+0
|\ \ \
| * | | Remove unused `remove_file` methodTsukuru Tanimichi2018-05-081-4/+0
* | | | Merge pull request #32874 from tylerhunt/remove_render_text_docsEileen M. Uchitelle2018-05-111-1/+0
|\ \ \ \
| * | | | Remove reference to old `:text` rendering optionTyler Hunt2018-05-111-1/+0
|/ / / /
* | | | `becomes` should clear the mutation tracker which is created in `after_initia...Ryuta Kamizono2018-05-114-3/+14
* | | | Merge pull request #32849 from anthonycrumley/oxford-commasMatthew Draper2018-05-1134-115/+115
|\ \ \ \
| * | | | Added a lot of Oxford commasAnthony Crumley2018-05-1034-115/+115
|/ / / /
* | | | Merge pull request #32859 from assain/fix-typo-activesupport-instrumentation-...George Claghorn2018-05-091-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | [ci skip] fix typo in active_support_instrumentation.md guideAssain2018-05-101-1/+1
|/ / /
* | | Merge pull request #32835 from trezona-lecomte/ar_dirty_doc_fixClaudio B2018-05-081-20/+58
|\ \ \
| * | | Fix ActiveRecord::AttributeMethods::Dirty documentation [ci skip]Kieran Trezona-le Comte2018-05-071-20/+58
| | |/ | |/|
* | | Merge pull request #32833 from ryandav/activestorage_blob_set_content_typeGeorge Claghorn2018-05-085-9/+49
|\ \ \ | |_|/ |/| |
| * | Add option to ActiveStorage::Blob to set extract_content_type_from_ioRyan Davidson2018-05-085-9/+49
* | | Fix named route parameter example [ci skip]yuuji.yaginuma2018-05-081-5/+5
* | | Merge pull request #32842 from tjschuck/remove_extra_requiresRyuta Kamizono2018-05-081-2/+0
|\ \ \
| * | | Remove leftover requiresT.J. Schuck2018-05-071-2/+0
|/ / /
* | | Merge pull request #32840 from rakio1234/patch-1Vipul A M2018-05-071-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix output in routing.md [ci skip]Yuta Uchida2018-05-071-1/+1
|/ /
* | Skip `bootsnap` contents in `app:update` task if `bootsnap` is not usedyuuji.yaginuma2018-05-072-0/+14
* | Remove `test_match_p` since Rails 6 requires Ruby 2.4.1 or newerRyuta Kamizono2018-05-071-24/+0
|/
* restores original intention in constants guide, reworded [ci skip]Xavier Noria2018-05-061-4/+6