aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #33254 from huacnlee/add-expires-in-option-support-for-red...Rafael França2018-06-293-2/+57
|\
| * Add :expires_in option support for RedisCacheStore increment/decrement method.Jason Lee2018-06-293-2/+57
* | Merge pull request #33250 from utilum/pdftoppm_existsMatthew Draper2018-06-291-1/+1
|\ \ | |/ |/|
| * Tweak Previewer::PopplerPDFPreviewer#pdftoppm_exists?utilum2018-06-291-1/+1
* | Merge pull request #33246 from anthonycrumley/improve-form-with-wordingRafael França2018-06-281-4/+5
|\ \
| * | Improve wording for form_with in Getting Started GuideAnthony Crumley2018-06-281-4/+5
| |/
* / Revert "Merge pull request #33243 from evopark/fix/action-mailer-test-helper-...Rafael Mendonça França2018-06-281-1/+1
|/
* Merge pull request #26764 from choncou/improve_has_secure_passwordRafael Mendonça França2018-06-284-56/+72
|\
| * Remove method for regenerating a token, and update `#authenticate`.Unathi Chonco2016-10-123-61/+25
| * This addition will now allow configuring an attribute name for theUnathi Chonco2016-10-124-41/+93
* | Merge pull request #33244 from utilum/guides_menu_breakdownRafael França2018-06-281-9/+13
|\ \
| * | Break guides menu 'Digging Deeper' section in twoutilum2018-06-281-9/+13
* | | Merge pull request #33243 from evopark/fix/action-mailer-test-helper-no-blockRafael França2018-06-281-1/+1
|\ \ \ | |/ / |/| |
| * | Fix ActionMailer assert_enqueued_email_withMarcus Ilgner2018-06-281-1/+1
|/ /
* | 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
|\ \ \ | |/ / |/| |