aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #32523 from kaspth/enumerable-index-with-extensionKasper Timm Hansen2018-05-214-1/+70
|\
| * [ci skip] Add documentation/changelog entry.Kasper Timm Hansen2018-05-212-0/+30
| * Add Enumerable#index_with.Kasper Timm Hansen2018-05-212-1/+40
* | Merge pull request #32946 from coryjb/patch-1Kasper Timm Hansen2018-05-211-1/+1
|\ \ | |/ |/|
| * Exception wording changeCory Becker2018-05-211-1/+1
* | Rename exception variable to error.Kasper Timm Hansen2018-05-211-2/+2
|/
* Merge pull request #32923 from yahonda/bump_sqlite3_version_to_38Ryuta Kamizono2018-05-215-32/+17
|\
| * Bump minimum SQLite version to 3.8Yasuo Honda2018-05-215-32/+17
* | Enable `Lint/StringConversionInInterpolation` rubocop ruleRyuta Kamizono2018-05-214-4/+7
|/
* `SqlTypeMetadata` is :nodoc: class [ci skip]Ryuta Kamizono2018-05-211-0/+1
* Add test case that configure `config.action_view.finalize_compiled_template_m...yuuji.yaginuma2018-05-201-0/+17
* Rollback correctly restore initial record id after double saveRyuta Kamizono2018-05-192-1/+2
* Merge pull request #32911 from eugeneius/finalize_transaction_record_stateRyuta Kamizono2018-05-193-15/+54
|\
| * Finalize transaction record state after real transactionEugene Kenny2018-05-193-15/+54
|/
* Merge pull request #32900 from ttanimichi/app-update-skip-yarnRafael França2018-05-184-3/+25
|\
| * Don't generate yarn's contents in `app:update` task if it's skippedTsukuru Tanimichi2018-05-164-3/+25
* | Merge pull request #32925 from Linuus/fix/actioncontroller-params-fetch-docsRafael França2018-05-181-1/+3
|\ \
| * | Fix documentation for ActionController::Params#fetchLinus Marton2018-05-181-1/+3
* | | Raise a better exception when a invalid depreation behavior is setRafael Mendonça França2018-05-182-0/+12
|/ /
* | 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