aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #33257 from utilum/ruby-warningsRyuta Kamizono2018-06-303-5/+8
|\
| * Fix Ruby warnings tickled by the test suiteutilum2018-06-303-5/+8
* | Merge pull request #33263 from bogdanvlviv/follow-up-33258Ryuta Kamizono2018-06-302-4/+10
|\ \
| * | Clarify activejob/lib/active_job/test_helper.rbbogdanvlviv2018-06-292-4/+10
* | | Merge pull request #33262 from gsmnv/patch-1Ryuta Kamizono2018-06-301-1/+1
|\ \ \ | |_|/ |/| |
| * | Remove erroneous remove_column option from exampleGeorge Semenov2018-06-291-1/+1
| |/
* | Merge pull request #33264 from huacnlee/fix-redis-incr-ttl-checkRyuta Kamizono2018-06-302-6/+22
|\ \ | |/ |/|
| * Fix Cache :redis_store increment/decrement ttl check and add more tests.Jason Lee2018-06-302-6/+22
|/
* Merge pull request #33260 from bogdanvlviv/fix-docs-of-assert_no_emailsRafael França2018-06-291-1/+1
|\
| * Fix docs of `assert_no_emails` [ci skip]bogdanvlviv2018-06-291-1/+1
|/
* Merge pull request #33258 from bogdanvlviv/allow-callassert_enqueued_with-wit...Rafael França2018-06-295-16/+160
|\
| * Allow call `assert_enqueued_with` and `assert_enqueued_email_with` with no blockbogdanvlviv2018-06-295-16/+160
|/
* Merge pull request #33238 from dikond/explicit_action_mailer_deliver_later_qu...Rafael França2018-06-291-0/+2
|\
| * Note deliver_later_queue_name gotcha in ActionMailer guide [ci skip]dikond2018-06-271-0/+2
* | Merge pull request #33255 from StanBoyet/patch-1Rafael França2018-06-291-0/+2
|\ \
| * | Incompatibility of Direct Uploads & Mirror ServiceStanislas Boyet2018-06-291-0/+2
|/ /
* | 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
|/ / /