aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #33217 from eugeneius/test_duration_preserve_partsRyuta Kamizono2018-06-281-0/+12
|\
| * Add tests for duration multiplication and divisionEugene Kenny2018-06-251-0/+12
* | Merge pull request #33234 from alpaca-tc/autoload_activejob_argumentsRyuta Kamizono2018-06-273-3/+1
|\ \
| * | Autoload ActiveJob::Argumentsalpaca-tc2018-06-271-0/+1
| * | ActiveJob::Arguments is no longer used in filealpaca-tc2018-06-272-3/+0
|/ /
* | Merge pull request #33230 from bogdanvlviv/add-changelog-entry-for-3110caecPrem Sichanugrist2018-06-271-0/+4
|\ \
| * | Add changelog entry for 3110cae [ci skip]bogdanvlviv2018-06-271-0/+4
|/ /
* | Merge pull request #33223 from rails/homogeneous-allocationAaron Patterson2018-06-265-2/+49
|\ \
| * | Fix documentation based on feedbackAaron Patterson2018-06-262-3/+7
| * | define attribute methods in `init_from_db`Aaron Patterson2018-06-261-0/+2
| * | Merge branch 'master' into homogeneous-allocationAaron Patterson2018-06-2610-40/+27
| |\ \
| * | | Speed up homogeneous AR lists / reduce allocationsAaron Patterson2018-06-255-2/+43
* | | | Merge pull request #33225 from utilum/railties_testoptsRafael França2018-06-261-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Enable TESTOPTS in railties testsutilum2018-06-261-1/+1
* | | | Merge pull request #33227 from rails/remove-allocateAaron Patterson2018-06-262-18/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Call initialize after allocateAaron Patterson2018-06-262-18/+0
|/ / /
* | | Remove `ActiveSupport::Concern` from `ActiveRecord::Aggregations`Ryuta Kamizono2018-06-261-2/+0
* | | Merge pull request #33224 from mikepmunroe/mm-no-touching-api-updateRyuta Kamizono2018-06-261-0/+7
|\ \ \
| * | | Add example for no_touching? in active_record/no_touching for api docs [ci skip]Michael Munroe2018-06-251-0/+7
|/ / /
* / / Generate a new key for each service testGeorge Claghorn2018-06-256-20/+20
|/ /
* | Merge pull request #33221 from rails/lazy-aggregateAaron Patterson2018-06-252-1/+5
|\ \
| * | Lazily add `Aggregations` to `composed_of` modelsAaron Patterson2018-06-252-1/+5
* | | Allow passing multiple exceptions to retry_on/discard_onGeorge Claghorn2018-06-253-7/+32
|/ /
* | `references(:developers_projects_join)` isn't needed if using `where` with ha...Ryuta Kamizono2018-06-261-16/+2
* | Use `reflection.alias_candidate` in `table_alias_for`Ryuta Kamizono2018-06-261-1/+1
|/
* Revert "Avoid Node.js v10.4.0 for now"yuuji.yaginuma2018-06-251-1/+1
* Merge pull request #33191 from bogdanvlviv/change-rails_welcome-image-on-loca...George Claghorn2018-06-241-1/+1
|\
| * Changes Rails Welcome image on localhost:3000bogdanvlviv2018-06-221-1/+1
* | Add an assertion that `credentials:edit` works when `RAILS_MASTER_KEY` env is...yuuji.yaginuma2018-06-241-1/+1
* | Merge pull request #33205 from ishanray/patch-1Ryuta Kamizono2018-06-241-1/+1
|\ \
| * | Update service.rbishanray2018-06-241-1/+1
|/ /
* | Fix formatting of `primary_key` [ci skip]yuuji.yaginuma2018-06-241-2/+2
* | Merge pull request #33204 from utilum/bump_raabroYuji Yaginuma2018-06-241-1/+1
|\ \
| * | Update raabro to latest versionutilum2018-06-231-1/+1
|/ /
* | OS X -> macOS [Closes #30313]Xavier Noria2018-06-234-6/+6
* | Merge pull request #33198 from henrik/patch-1George Claghorn2018-06-221-1/+5
|\ \ | |/ |/|
| * Active Storage: Explicit form field in basic exampleHenrik Nyh2018-06-221-1/+5
|/
* Merge pull request #33184 from bogdanvlviv/document-year_format-option-of-dat...Prem Sichanugrist2018-06-221-0/+4
|\
| * Add to docs mention about `:year_format` option of date selectbogdanvlviv2018-06-221-0/+4
|/
* Add missing test case for `find` with a large numberRyuta Kamizono2018-06-221-0/+6
* Permit configuring the default service URL expiryGeorge Claghorn2018-06-219-10/+17
* Merge pull request #33176 from utilum/bump_fugitYuji Yaginuma2018-06-211-2/+2
|\
| * Update fugit to latest versionutilum2018-06-211-2/+2
|/
* Merge pull request #32190 from liwii/use_year_namesRyuta Kamizono2018-06-213-1/+71
|\
| * Add `year_format` option to date_select tag. This option makes it possible to...Koki Ryu2018-06-103-1/+69
* | Merge pull request #33175 from gsamokovarov/fix-actionpack-typoRyuta Kamizono2018-06-211-1/+1
|\ \
| * | Fix a typo in the Action Pack changelog [ci skip]Genadi Samokovarov2018-06-191-1/+1
* | | Merge pull request #33172 from thomasdziedzic-pd/add-use_authenticated_messag...Yuji Yaginuma2018-06-211-0/+2
|\ \ \
| * | | add documentation for config.active_support.use_authenticated_message_encrypt...Thomas Dziedzic2018-06-201-0/+2
|/ / /
* | | Remove all `aliases` passing from `JoinDependency`Ryuta Kamizono2018-06-201-2/+2