aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #32361 from ph3t/safe-html-translation-arraysKasper Timm Hansen2018-07-032-4/+10
|\ | | | | Add safe html support to arrays of translations
| * Add safe html support to arrays of translationsJuan Broullon2018-07-032-4/+10
| |
* | Merge pull request #33208 from utilum/bump_sprocketsEileen M. Uchitelle2018-07-031-1/+1
|\ \ | | | | | | Update sprockets to Security release for CVE-2018-3760
| * | Update sprockets to Security release for CVE-2018-3760utilum2018-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | See: https://github.com/rails/sprockets/blob/v3.7.2/CHANGELOG.md https://github.com/rails/sprockets/commit/9c34fa05900b968d74f08ccf40917848a7be9441
* | | Use `construct_join_dependency` in all placesRyuta Kamizono2018-07-033-13/+6
| | |
* | | Don't extract `readonly_value` each timeRyuta Kamizono2018-07-032-5/+7
| | |
* | | Don't share seen object cache between different join nodes in eager loadingRyuta Kamizono2018-07-032-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the seen object cache is shared if join nodes have the same target class. But it is a wrong assumption, we can't share the seen object cache between different join nodes (e.g. `:readonly_account` and `:accounts` have the same target class `Account`, but the instances have the different state `readonly`). Fixes #26805. Closes #27737.
* | | Merge pull request #32987 from kevgathuku/patch-2Kasper Timm Hansen2018-07-021-1/+1
|\ \ \ | | | | | | | | Change location for running copy migrations command
| * | | Change location for running copy migrations commandKevin Ndung'u Gathuku2018-05-251-1/+1
| | | | | | | | | | | | | | | | This fixes the location from where the command to copy migrations from the engine to the application should be run [ci skip]
* | | | Merge pull request #33242 from brasic/sqlite-readonlyRyuta Kamizono2018-07-032-1/+36
|\ \ \ \ | | | | | | | | | | | | | | | Support readonly option in SQLite3Adapter
| * | | | Support readonly option in SQLite3AdapterCarl Brasic2018-07-022-1/+36
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Readonly sqlite database files are very useful as a data format for storing configuration/lookup data that is too complicated for YAML files. But since such files would typically be committed to a source control repository, it's important to ensure that they are truly safe from being inadvertently modified. Unfortunately using unix permissions isn't enough, as sqlite will "helpfully" add the write bit to a database file whenever it's written to. sqlite3-ruby has supported a `:readonly` option since version 1.3.2 (see https://github.com/sparklemotion/sqlite3-ruby/commit/c20c9f5dd2990042) This simply passes that option through to the adapter if present in the config hash. I think this is best considered an adapter-specific option since no other supported database has an identical concept.
* | | | Merge pull request #33273 from sohopro/patch-1Kasper Timm Hansen2018-07-021-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] fix error of a file name
| * | | | fix error of a file namesohopro2018-07-021-1/+1
|/ / / /
* | | | Merge pull request #32706 from ↵Kasper Timm Hansen2018-07-012-5/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | yhirano55/fix-app-update-when-hyphenated-name-is-given Fix app:update when hyphenated name is given
| * | | | Fix app:update when hyphenated name is givenYoshiyuki Hirano2018-04-242-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed app_name's difference between `rails new` and `app:update` * Changed be prefer to const name than directory name. * Kept original app name which use exception message.
* | | | | Revert "Merge pull request #33234 from alpaca-tc/autoload_activejob_arguments"Kasper Timm Hansen2018-07-013-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It breaks Active Job when run in isolation. E.g. bin/test test/cases/logging_test.rb: https://travis-ci.org/rails/rails/jobs/398779028 Consider Rafaels suggestion of reviewing the eager loading instead: https://github.com/rails/rails/pull/33234#issuecomment-401027419 This reverts commit cb0fdaacb277bd0595bfd73178329922aa24477e, reversing changes made to a0a1abb3c7942084111d87ae95837a83bcc794f6.
* | | | | Refactor #33254.Kasper Timm Hansen2018-07-013-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Firstly, increment and decrement shouldn't care about the particulars of key expiry. They should only know that they have to pass that responsibility on to somewhere else. Secondly, it moves the key normalization back inside the instrumentation like it was originally. I think that matches the original design intention or at the very least it lets users catch haywire key truncation. Thirdly, it moves the changelog entry to the top of the file, where new entries go. I couldn't understand what the entry was saying so I tried to rewrite it.
* | | | | Merge pull request #33267 from utilum/railties_testoptsKasper Timm Hansen2018-07-011-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Fix assignment of TESTOPTS in railties test task
| * | | | | Fix assignment of TESTOPTS in railties test taskutilum2018-07-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assignment of `ENV["TESTOPTS"]` to `ARGV`, introduced in 09f9a7a5b, did not take into account passing multiple options, such as `--verbose --seed=1`. This patch fixes it.
* | | | | | Merge pull request #33265 from ↵Ryuta Kamizono2018-07-013-2/+96
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | bogdanvlviv/allow-queue-option-to-assert_no_enqueued_jobs Allow `queue` option to `assert_no_enqueued_jobs`
| * | | | | Allow `queue` option to `assert_no_enqueued_jobs`bogdanvlviv2018-06-303-2/+96
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It can be asserted that no jobs are enqueued to a specific queue: ```ruby def test_no_logging assert_no_enqueued_jobs queue: 'default' do LoggingJob.set(queue: :some_queue).perform_later end end ```
* | | | | Merge pull request #33257 from utilum/ruby-warningsRyuta Kamizono2018-06-303-5/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix Ruby warnings tickled by the test suite
| * | | | | 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.rb
| * | | | | | Clarify activejob/lib/active_job/test_helper.rbbogdanvlviv2018-06-292-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `in_block_job` to `enqueued_job` since this variable can refer not only to jobs that were created in the block. See #33258. Return back accidentally removed test to activejob/test/cases/test_helper_test.rb See #33258. Fix name of tests.
* | | | | | | Merge pull request #33262 from gsmnv/patch-1Ryuta Kamizono2018-06-301-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Remove erroneous remove_column option from example [ci skip]
| * | | | | | 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.
| * | | | | 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]
| * | | | | Fix docs of `assert_no_emails` [ci skip]bogdanvlviv2018-06-291-1/+1
|/ / / / / | | | | | | | | | | | | | | | `assert_no_emails` is shortcut for `assert_emails 0, &block`.
* | | | | Merge pull request #33258 from ↵Rafael França2018-06-295-16/+160
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bogdanvlviv/allow-callassert_enqueued_with-with-no-block Allow call `assert_enqueued_with` and `assert_enqueued_email_with` with no block
| * | | | | Allow call `assert_enqueued_with` and `assert_enqueued_email_with` with no blockbogdanvlviv2018-06-295-16/+160
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example of `assert_enqueued_with` with no block ```ruby def test_assert_enqueued_with MyJob.perform_later(1,2,3) assert_enqueued_with(job: MyJob, args: [1,2,3], queue: 'low') MyJob.set(wait_until: Date.tomorrow.noon).perform_later assert_enqueued_with(job: MyJob, at: Date.tomorrow.noon) end ``` Example of `assert_enqueued_email_with` with no block: ```ruby def test_email ContactMailer.welcome.deliver_later assert_enqueued_email_with ContactMailer, :welcome end def test_email_with_arguments ContactMailer.welcome("Hello", "Goodbye").deliver_later assert_enqueued_email_with ContactMailer, :welcome, args: ["Hello", "Goodbye"] end ``` Related to #33243
* | | | | Merge pull request #33238 from ↵Rafael França2018-06-291-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dikond/explicit_action_mailer_deliver_later_queue_name Note deliver_later_queue_name gotcha in ActionMailer guide
| * | | | | 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 Service
| * | | | | | Incompatibility of Direct Uploads & Mirror ServiceStanislas Boyet2018-06-291-0/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip] It adds a note to the Active Storage documentation regarding the use of Mirror Service not being compatible with the use of the Direct Uploads as described later on in the documentation, as described in issue #32732
* | | | | | Merge pull request #33254 from ↵Rafael França2018-06-293-2/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | huacnlee/add-expires-in-option-support-for-redis-cache-store-increment-method Add :expires_in option support for RedisCacheStore increment/decrement method
| * | | | | | 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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Refactor Previewer::PopplerPDFPreviewer#pdftoppm_exists?
| * | | | | | Tweak Previewer::PopplerPDFPreviewer#pdftoppm_exists?utilum2018-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Does not warn `instance variable @pdftoppm_exists not initialized`.
* | | | | | | Merge pull request #33246 from anthonycrumley/improve-form-with-wordingRafael França2018-06-281-4/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve wording for form_with in Getting Started Guide
| * | | | | | | Improve wording for form_with in Getting Started GuideAnthony Crumley2018-06-281-4/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Improved wording by making it clear the form_with helper method was being referenced in the first paragraph and that the second paragraph is a continuation of the form_with train of thought. Additionally, a connection was made to examples of the form_with usage being described.
* / / / / / / Revert "Merge pull request #33243 from ↵Rafael Mendonça França2018-06-281-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | evopark/fix/action-mailer-test-helper-no-block" This reverts commit 9d6bbf4e0b2d2b2e2fccd87a778de2893bb28a25, reversing changes made to 5a1ea09062eaed78e21253a128d433a1beb745ad. This method only works with block.
* | | | | | Merge pull request #26764 from choncou/improve_has_secure_passwordRafael Mendonça França2018-06-284-56/+72
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Allow configurable attribute name on `#has_secure_password`
| * | | | | | Remove method for regenerating a token, and update `#authenticate`.Unathi Chonco2016-10-123-61/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change now creates a method `#authenticate_XXX` where XXX is the configured attribute name on `#has_secure_password`. `#authenticate` is now an alias to this method when the attribute name is the default 'password'
| * | | | | | This addition will now allow configuring an attribute name for theUnathi Chonco2016-10-124-41/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | existing `#has_secure_password`. This can be useful when one would like to store some secure field as a digest, just like a password. The method still defaults to `password`. It now also allows using the same `#authenticate` method which now accepts a second argument for specifying the attribute to be authenticated, or will default to 'password`. A new method is also added for generating a new token for an attribute by calling `#regenerate_XXXX` where `XXXX` is the attribute name.
* | | | | | | Merge pull request #33244 from utilum/guides_menu_breakdownRafael França2018-06-281-9/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Break guides menu 'Digging Deeper' section in two
| * | | | | | | Break guides menu 'Digging Deeper' section in twoutilum2018-06-281-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This list in the menu is currently long, and the order of the items not immediately obvious. I often find my self rescanning to find what I'm looking for, so I imagine that others do to.
* | | | | | | | Merge pull request #33243 from evopark/fix/action-mailer-test-helper-no-blockRafael França2018-06-281-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix ActionMailer assert_enqueued_email_with