Code

Changes from upstream#24

Code

Merged

orien merged 18 commits intoenvato:envato-productionenvato/samson:envato-productionfrom zendesk:masterzendesk/samson:masterCopy head branch name to clipboardJan 27, 2025

+355-219

Commits

Commits on Oct 31, 2024

• rails 7

  grosser

  committed
  924d5ac

  Copy full SHA for 924d5ac

Commits on Dec 2, 2024

• Merge branch 'master' into grosser/7

  anthonywoo

  committed
  3f30790

  Copy full SHA for 3f30790

Commits on Dec 3, 2024

• fix tests - log in abstract_adapter now has keyword args

  anthonywoo

  committed
  61db6d1

  Copy full SHA for 61db6d1

Commits on Dec 5, 2024

• bump ar_multi_threaded_transactional_tests

  anthonywoo

  committed
  52a7fad

  Copy full SHA for 52a7fad

• change log args syntax

  anthonywoo

  committed
  5844b96

  Copy full SHA for 5844b96

• bump rails-html-sanitizer

  anthonywoo

  committed
  1742996

  Copy full SHA for 1742996

Commits on Dec 9, 2024

• fix precompiling assets

  anthonywoo

  committed
  b9d3f3e

  Copy full SHA for b9d3f3e

Commits on Jan 22, 2025

• Merge branch 'master' into grosser/7

  orien

  committed
  aa8f44e

  Copy full SHA for aa8f44e

• Add mutex_m, an undeclared activesupport dependency

  Show description for 63b7b03
  orien

  committed
  63b7b03

  Copy full SHA for 63b7b03

Commits on Jan 23, 2025

• feat: use SleepAction for prestop hooks instead of ExecAction

  Show description for b497f5c
  a7i

  committed
  b497f5c

  Copy full SHA for b497f5c

Commits on Jan 26, 2025

• Add csv dependency, required for Ruby 3.4

  orien

  committed
  cc69a9d

  Copy full SHA for cc69a9d

• rails app:update

  orien

  committed
  cfab1fa

  Copy full SHA for cfab1fa

• Bump Rails default configuration from 6.1 to 7.0

  orien

  committed
  74c20a2

  Copy full SHA for 74c20a2

• Bump Rails to 7.0.8.7, resolves CVE-2024-54133

  orien

  committed
  416f254

  Copy full SHA for 416f254

• Merge pull request #4125 from envato/rails-7.0

  Show description for e5cfbc0
  grosser

  authored
  e5cfbc0

  Copy full SHA for e5cfbc0

• Merge pull request #4126 from zendesk/amir/prestop-sleep-action

  Show description for 19f070d
  grosser

  authored
  19f070d

  Copy full SHA for 19f070d

Commits on Jan 27, 2025

• Update minor and patch versions

  orien

  committed
  a7212fe

  Copy full SHA for a7212fe

• Merge pull request #4127 from envato/bundle

  Show description for 495c0ac
  grosser

  authored
  495c0ac

  Copy full SHA for 495c0ac