Code

sync upstream#7

Code

Merged

dkyoyoung merged 113 commits intomasterOneCareerJP/audited:masterfrom misc/sync-upstreamOneCareerJP/audited:misc/sync-upstreamCopy head branch name to clipboardDec 18, 2023

+631-78

Commits

Commits on Dec 2, 2021

• Add audited method to parent in docs

  Show description for 8616f50
  jess

  authored
  8616f50

  Copy full SHA for 8616f50

Commits on Dec 25, 2021

• Use string class name and constantize

  simmerz

  committed
  3cf0141

  Copy full SHA for 3cf0141

Commits on Dec 28, 2021

• Test against Rails 7.0 stable

  enomotodev

  committed
  a99c5d9

  Copy full SHA for a99c5d9

Commits on Mar 31, 2022

• Deadlocks from concurrent audit combinations

  Show description for c6afe9f
  Crammaman

  committed
  c6afe9f

  Copy full SHA for c6afe9f

Commits on Dec 23, 2022

• Merge pull request collectiveidea#610 from enomotodev/rails70-stable

  Show description for c06250c
  danielmorrison

  authored
  c06250c

  Copy full SHA for c06250c

• Update standard recommedations

  danielmorrison

  committed
  a308065

  Copy full SHA for a308065

• Add yaml_column_permitted_classes in tests

  Show description for 7365aa1
  danielmorrison

  committed
  7365aa1

  Copy full SHA for 7365aa1

• Update some testing dependencies

  Show description for 3398e69
  danielmorrison

  committed
  3398e69

  Copy full SHA for 3398e69

• Test agains Ruby 3.0 on more versions and 3.1 for Rails 7

  danielmorrison

  committed
  e724d1e

  Copy full SHA for e724d1e

• Add psych to try to get old versions running

  danielmorrison

  committed
  0765c69

  Copy full SHA for 0765c69

• More tweaks to get old version tests passing

  danielmorrison

  committed
  827defc

  Copy full SHA for 827defc

• Update checkout action

  danielmorrison

  committed
  5ba3db0

  Copy full SHA for 5ba3db0

• Remove Ruby 2.3 PostgreSQL test runs

  Show description for eae3184
  danielmorrison

  committed
  eae3184

  Copy full SHA for eae3184

• Update supported Ruby versions in Readme

  danielmorrison

  committed
  897e110

  Copy full SHA for 897e110

• Remove whitespace and extraneous parens

  danielmorrison

  committed
  467ce08

  Copy full SHA for 467ce08

• Merge pull request collectiveidea#643 from collectiveidea/test-fix

  Show description for ed58ee7
  danielmorrison

  authored
  ed58ee7

  Copy full SHA for ed58ee7

• Update CHANGELOG

  danielmorrison

  committed
  7212260

  Copy full SHA for 7212260

• Replace raw string where clause with query methods

  Show description for c5fdb37
  

  macowie

  authored and

  danielmorrison

  committed
  c5fdb37

  Copy full SHA for c5fdb37

• Fix timestamped_migrations deprecation warning

  

  shouichi

  authored and

  danielmorrison

  committed
  fbd5170

  Copy full SHA for fbd5170

• Merge pull request collectiveidea#642 from macowie/patch-1

  Show description for 968c4fc
  danielmorrison

  authored
  968c4fc

  Copy full SHA for 968c4fc

• Ensure audits are re-enabled after with_auditing and without_auditing

  

  dcorlett

  authored and

  danielmorrison

  committed
  dd7845e

  Copy full SHA for dd7845e

• Merge pull request collectiveidea#632 from dcorlett/re-enable-audits-after-block-fix

  Show description for e46231d
  danielmorrison

  authored
  e46231d

  Copy full SHA for e46231d

• Merge branch 'master' into master

  danielmorrison

  authored
  664ae6b

  Copy full SHA for 664ae6b

• Merge pull request collectiveidea#609 from simmerz/master

  Show description for 00f17d6
  danielmorrison

  authored
  00f17d6

  Copy full SHA for 00f17d6

• Update CHANGELOG

  danielmorrison

  committed
  1b6200c

  Copy full SHA for 1b6200c

• Merge pull request collectiveidea#624 from shouichi/fix-timestamped-migrations-deprecation

  Show description for 6f346c5
  danielmorrison

  authored
  6f346c5

  Copy full SHA for 6f346c5

• Filter encrypted attributes automatically

  

  vlad-psh

  authored and

  danielmorrison

  committed
  1bbc099

  Copy full SHA for 1bbc099

• Merge pull request collectiveidea#630 from vlad-psh/filter-encrypted-attributes-automatically

  Show description for 68c2413
  danielmorrison

  authored
  68c2413

  Copy full SHA for 68c2413

• Merge pull request collectiveidea#621 from Crammaman/ignore_audit_combine_deadlock

  Show description for 71c52bc
  danielmorrison

  authored
  71c52bc

  Copy full SHA for 71c52bc

• Merge pull request collectiveidea#605 from jess/patch-1

  Show description for 9232a75
  danielmorrison

  authored
  9232a75

  Copy full SHA for 9232a75

• Update CHANGELOG

  danielmorrison

  committed
  2f09bb8

  Copy full SHA for 2f09bb8

• Remove https://hakiri.io link in README

  danielmorrison

  committed
  a9dde82

  Copy full SHA for a9dde82

• Improve readme example for conditional auditing:

  Show description for 2b605cb
  danielmorrison

  committed
  2b605cb

  Copy full SHA for 2b605cb

• Fix old Rubies

  Show description for 729a35f
  danielmorrison

  committed
  729a35f

  Copy full SHA for 729a35f

• Run standardrb --fix

  danielmorrison

  committed
  503a689

  Copy full SHA for 503a689

• Bump version

  danielmorrison

  committed
  16769b3

  Copy full SHA for 16769b3

Commits on Dec 25, 2022

• Fix typo: PostgresSQL -> PostgreSQL

  Show description for eb4b746
  jdufresne

  committed
  eb4b746

  Copy full SHA for eb4b746

Commits on Jan 2, 2023

• Update documentation link

  jeremiahlukus

  authored
  9997fa8

  Copy full SHA for 9997fa8

Commits on Jan 12, 2023

• Allow Audited.audit_class= to receive a string class name and return an class

  

  rocket-turtle

  authored and

  Jonas Schoeler

  committed
  b828848

  Copy full SHA for b828848

Commits on Jan 23, 2023

• Merge pull request collectiveidea#648 from rocket-turtle/issues-647

  Show description for 904cc69
  danielmorrison

  authored
  904cc69

  Copy full SHA for 904cc69

• Merge pull request collectiveidea#646 from jeremiahlukus/patch-1

  Show description for d6d2673
  danielmorrison

  authored
  d6d2673

  Copy full SHA for d6d2673

• Merge pull request collectiveidea#644 from jdufresne/typo

  Show description for 857c9bc
  danielmorrison

  authored
  857c9bc

  Copy full SHA for 857c9bc

• Switch to safe_constantize

  danielmorrison

  committed
  32851bd

  Copy full SHA for 32851bd

• Bump version

  danielmorrison

  committed
  53f76dc

  Copy full SHA for 53f76dc

• Ensure CI runs on main. Add to Buildlight

  danielmorrison

  committed
  a04d8be

  Copy full SHA for a04d8be

Commits on Jan 29, 2023

• Add testing and document support for Ruby 3.2

  Show description for cab0705
  jdufresne

  committed
  cab0705

  Copy full SHA for cab0705

• Run GitHub actions on all branches

  Show description for 448e288
  jdufresne

  committed
  448e288

  Copy full SHA for 448e288

Commits on Jan 30, 2023

• Merge pull request collectiveidea#652 from jdufresne/ruby32

  Show description for 4e7a20e
  danielmorrison

  authored
  4e7a20e

  Copy full SHA for 4e7a20e

• Merge pull request collectiveidea#653 from jdufresne/gha-all-branches

  Show description for 11880aa
  danielmorrison

  authored
  11880aa

  Copy full SHA for 11880aa

• Update CHANGELOG

  danielmorrison

  committed
  7fcc902

  Copy full SHA for 7fcc902

Commits on Feb 9, 2023

• Replace Rails version check with ActiveRecord version check so that audited gem can be used with non Rails projects

  nicduke38degrees

  committed
  fa6a084

  Copy full SHA for fa6a084

• Merge pull request collectiveidea#655 from nicduke38degrees/no-assume-rails

  Show description for 05cb9f2
  danielmorrison

  authored
  05cb9f2

  Copy full SHA for 05cb9f2

• Update CHANGELOG

  danielmorrison

  committed
  15e899b

  Copy full SHA for 15e899b

• conditional require railtie if Rails module exists

  nicduke38degrees

  committed
  d7fbc55

  Copy full SHA for d7fbc55

Commits on Feb 13, 2023

• Audit touch events

  mcyoung

  committed
  69810dc

  Copy full SHA for 69810dc

• Simplify

  mcyoung

  committed
  a808f8e

  Copy full SHA for a808f8e

• Include as a default

  mcyoung

  committed
  670b947

  Copy full SHA for 670b947

• Add spec coverage

  mcyoung

  committed
  6789b9b

  Copy full SHA for 6789b9b

Commits on Feb 14, 2023

• Suggested changes

  mcyoung

  committed
  02c5b89

  Copy full SHA for 02c5b89

• An older rails friendly test

  mcyoung

  committed
  b0bb2c3

  Copy full SHA for b0bb2c3

• Do touch auditing on 6+ Rails

  mcyoung

  committed
  5d41025

  Copy full SHA for 5d41025

• Compare w/ second

  mcyoung

  committed
  82feab7

  Copy full SHA for 82feab7

• Make time spec work

  mcyoung

  committed
  4962e20

  Copy full SHA for 4962e20

• Adjust coverage line count for < 6 ActiveRecord and touch.

  mcyoung

  committed
  c568864

  Copy full SHA for c568864

• Merge pull request collectiveidea#657 from mcyoung/mcy/feature/audit-touch

  Show description for 944f0b8
  danielmorrison

  authored
  944f0b8

  Copy full SHA for 944f0b8

• Update CHANGELOG

  danielmorrison

  committed
  908f3c7

  Copy full SHA for 908f3c7

• Bump version

  danielmorrison

  committed
  e2d9ebc

  Copy full SHA for e2d9ebc

Commits on Feb 15, 2023

• Ensure testing of touched audit

  mcyoung

  committed
  21827de

  Copy full SHA for 21827de

• Give spec a little more time to reduce flakiness

  mcyoung

  committed
  2556096

  Copy full SHA for 2556096

• Merge pull request collectiveidea#658 from mcyoung/mcy/feature/adjust-touch-spec

  Show description for dd23c21
  danielmorrison

  authored
  dd23c21

  Copy full SHA for dd23c21

• Update changelog

  danielmorrison

  committed
  9a583ba

  Copy full SHA for 9a583ba

Commits on Feb 16, 2023

• Fix redacted attributes bug when no changes were made

  vlad-psh

  committed
  7dbbb66

  Copy full SHA for 7dbbb66

• Merge pull request collectiveidea#628 from vlad-psh/fix-redacted-attributes

  Show description for 1eccb07
  danielmorrison

  authored
  1eccb07

  Copy full SHA for 1eccb07

• Update changelog

  danielmorrison

  committed
  a07561f

  Copy full SHA for a07561f

Commits on Feb 21, 2023

• Don't double audit on touch

  Show description for b773b4a
  mcyoung

  committed
  b773b4a

  Copy full SHA for b773b4a

• Merge pull request collectiveidea#660 from mcyoung/mcy/feature/audit-only-touchable-touches

  Show description for 443d5f2
  danielmorrison

  authored
  443d5f2

  Copy full SHA for 443d5f2

• Bump version

  danielmorrison

  committed
  7315642

  Copy full SHA for 7315642

• Ensure audits

  Show description for 829bdb8
  mcyoung

  committed
  829bdb8

  Copy full SHA for 829bdb8

Commits on Feb 22, 2023

• Merge pull request collectiveidea#662 from mcyoung/mcy/feature/safely-touch-audit

  Show description for 874f291
  danielmorrison

  authored
  874f291

  Copy full SHA for 874f291

• Run standardrb --fix

  danielmorrison

  committed
  818ad34

  Copy full SHA for 818ad34

• Bump version

  danielmorrison

  committed
  548cbe9

  Copy full SHA for 548cbe9

Commits on Mar 6, 2023

• Merge branch 'collectiveidea:main' into conditional-require-railtie

  nicduke38degrees

  authored
  8d54983

  Copy full SHA for 8d54983

Commits on Mar 13, 2023

• Update README.md

  kvoshell

  authored
  0172cbe

  Copy full SHA for 0172cbe

• Merge pull request collectiveidea#666 from kvoshell/patch-1

  Show description for 900303f
  danielmorrison

  authored
  900303f

  Copy full SHA for 900303f

Commits on Mar 16, 2023

• A little cleanup

  mcyoung

  committed
  90a745c

  Copy full SHA for 90a745c

Commits on Apr 18, 2023

• Use RequestStore instead of Thread.current for thread-safe requests.

  tiagocassio

  committed
  363ac30

  Copy full SHA for 363ac30

• Merge pull request #1 from convisoappsec/use-request-store-thread-safe

  Show description for 7e4d609
  tiagocassio

  authored
  7e4d609

  Copy full SHA for 7e4d609

Commits on Apr 19, 2023

• Fix specs.

  tiagocassio

  committed
  6ad0d10

  Copy full SHA for 6ad0d10

• Fix typo.

  tiagocassio

  committed
  950ff2a

  Copy full SHA for 950ff2a

• Fix audited_spec.rb.

  tiagocassio

  committed
  0960dc7

  Copy full SHA for 0960dc7

Commits on Apr 20, 2023

• Merge pull request collectiveidea#669 from convisoappsec/main

  danielmorrison

  authored
  342734c

  Copy full SHA for 342734c

Commits on Apr 24, 2023

• Preparing release 5.3.3

  giovannism20

  committed
  e6cc2da

  Copy full SHA for e6cc2da

• Optimize query

  Show description for 0efe797
  

  danielmorrison

  and

  akostadinov

  authored
  0efe797

  Copy full SHA for 0efe797

• Update CHANGELOG.md

  danielmorrison

  authored
  7fefaf5

  Copy full SHA for 7fefaf5

• Update README.md

  Show description for c61ec9c
  danielmorrison

  authored
  c61ec9c

  Copy full SHA for c61ec9c

• Merge pull request collectiveidea#668 from mcyoung/mcy/refactor/touch-enhancement

  Show description for e38e8a3
  danielmorrison

  authored
  e38e8a3

  Copy full SHA for e38e8a3

• Merge pull request collectiveidea#671 from giovannism20/main

  Show description for 379aeed
  danielmorrison

  authored
  379aeed

  Copy full SHA for 379aeed

Commits on Apr 30, 2023

• Replace RequestStore with ActiveSupport::CurrentAttributes

  the-spectator

  committed
  f8416b1

  Copy full SHA for f8416b1

Commits on Sep 24, 2023

• Add support for Rails 7.1

  yuki24

  committed
  bbedccb

  Copy full SHA for bbedccb

• Add fixes for test builds for Ruby 2.3 & 2.4

  yuki24

  committed
  bbfb4db

  Copy full SHA for bbfb4db

Commits on Sep 30, 2023

• Merge pull request collectiveidea#686 from yuki24/rails-7-1

  Show description for 73aae10
  danielmorrison

  authored
  73aae10

  Copy full SHA for 73aae10

• Bump version to 5.4.0

  danielmorrison

  committed
  76fd75e

  Copy full SHA for 76fd75e

• Add Rails 7.1 to README

  danielmorrison

  committed
  9a1bed7

  Copy full SHA for 9a1bed7

Commits on Nov 6, 2023

• Merge branch 'main' into migrate_to_current_attributes

  danielmorrison

  authored
  626a97b

  Copy full SHA for 626a97b

• Merge pull request collectiveidea#673 from the-spectator/migrate_to_current_attributes

  Show description for 7e881fb
  danielmorrison

  authored
  7e881fb

  Copy full SHA for 7e881fb

• Merge pull request collectiveidea#665 from nicduke38degrees/conditional-require-railtie

  Show description for 9a2a516
  danielmorrison

  authored
  9a2a516

  Copy full SHA for 9a2a516

• Bump version

  danielmorrison

  committed
  e2513bb

  Copy full SHA for e2513bb

• Revert "Replace RequestStore with ActiveSupport::CurrentAttributes"

  Show description for d9b4d5a
  danielmorrison

  committed
  d9b4d5a

  Copy full SHA for d9b4d5a

Commits on Nov 8, 2023

• Bump version

  danielmorrison

  committed
  3b4e52f

  Copy full SHA for 3b4e52f

Commits on Dec 14, 2023

• Merge remote-tracking branch 'upstream/main' into misc/sync-upstream

  mshimizu-oc

  committed
  0e41cea

  Copy full SHA for 0e41cea

• add audit_application column for test table

  mshimizu-oc

  committed
  dd4a7de

  Copy full SHA for dd4a7de

• add test for as_audit_application

  mshimizu-oc

  committed
  e70b4d7

  Copy full SHA for e70b4d7

Commits on Dec 15, 2023

• audit_spec.rb +1 SingleCov uncovered.

  mshimizu-oc

  committed
  fc05a40

  Copy full SHA for fc05a40