Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync upstream #7

Merged
merged 113 commits into from
Dec 18, 2023
Merged
Changes from 1 commit
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
8616f50
Add audited method to parent in docs
jess Dec 2, 2021
3cf0141
Use string class name and constantize
simmerz Dec 25, 2021
a99c5d9
Test against Rails 7.0 stable
enomotodev Dec 28, 2021
c6afe9f
Deadlocks from concurrent audit combinations
Crammaman Mar 31, 2022
c06250c
Merge pull request #610 from enomotodev/rails70-stable
danielmorrison Dec 23, 2022
a308065
Update standard recommedations
danielmorrison Dec 23, 2022
7365aa1
Add yaml_column_permitted_classes in tests
danielmorrison Dec 23, 2022
3398e69
Update some testing dependencies
danielmorrison Dec 23, 2022
e724d1e
Test agains Ruby 3.0 on more versions and 3.1 for Rails 7
danielmorrison Dec 23, 2022
0765c69
Add psych to try to get old versions running
danielmorrison Dec 23, 2022
827defc
More tweaks to get old version tests passing
danielmorrison Dec 23, 2022
5ba3db0
Update checkout action
danielmorrison Dec 23, 2022
eae3184
Remove Ruby 2.3 PostgreSQL test runs
danielmorrison Dec 23, 2022
897e110
Update supported Ruby versions in Readme
danielmorrison Dec 23, 2022
467ce08
Remove whitespace and extraneous parens
danielmorrison Dec 23, 2022
ed58ee7
Merge pull request #643 from collectiveidea/test-fix
danielmorrison Dec 23, 2022
7212260
Update CHANGELOG
danielmorrison Dec 23, 2022
c5fdb37
Replace raw string where clause with query methods
macowie Dec 5, 2022
fbd5170
Fix timestamped_migrations deprecation warning
shouichi May 2, 2022
968c4fc
Merge pull request #642 from macowie/patch-1
danielmorrison Dec 23, 2022
dd7845e
Ensure audits are re-enabled after with_auditing and without_auditing
dcorlett Aug 19, 2022
e46231d
Merge pull request #632 from dcorlett/re-enable-audits-after-block-fix
danielmorrison Dec 23, 2022
664ae6b
Merge branch 'master' into master
danielmorrison Dec 23, 2022
00f17d6
Merge pull request #609 from simmerz/master
danielmorrison Dec 23, 2022
1b6200c
Update CHANGELOG
danielmorrison Dec 23, 2022
6f346c5
Merge pull request #624 from shouichi/fix-timestamped-migrations-depr…
danielmorrison Dec 23, 2022
1bbc099
Filter encrypted attributes automatically
vlad-psh Jul 5, 2022
68c2413
Merge pull request #630 from vlad-psh/filter-encrypted-attributes-aut…
danielmorrison Dec 23, 2022
71c52bc
Merge pull request #621 from Crammaman/ignore_audit_combine_deadlock
danielmorrison Dec 23, 2022
9232a75
Merge pull request #605 from jess/patch-1
danielmorrison Dec 23, 2022
2f09bb8
Update CHANGELOG
danielmorrison Dec 23, 2022
a9dde82
Remove https://hakiri.io link in README
danielmorrison Dec 23, 2022
2b605cb
Improve readme example for conditional auditing:
danielmorrison Dec 23, 2022
729a35f
Fix old Rubies
danielmorrison Dec 23, 2022
503a689
Run standardrb --fix
danielmorrison Dec 23, 2022
16769b3
Bump version
danielmorrison Dec 23, 2022
eb4b746
Fix typo: PostgresSQL -> PostgreSQL
jdufresne Dec 25, 2022
9997fa8
Update documentation link
jeremiahlukus Jan 2, 2023
b828848
Allow Audited.audit_class= to receive a string class name and return …
rocket-turtle Jan 4, 2023
904cc69
Merge pull request #648 from rocket-turtle/issues-647
danielmorrison Jan 23, 2023
d6d2673
Merge pull request #646 from jeremiahlukus/patch-1
danielmorrison Jan 23, 2023
857c9bc
Merge pull request #644 from jdufresne/typo
danielmorrison Jan 23, 2023
32851bd
Switch to safe_constantize
danielmorrison Jan 23, 2023
53f76dc
Bump version
danielmorrison Jan 23, 2023
a04d8be
Ensure CI runs on main. Add to Buildlight
danielmorrison Jan 23, 2023
cab0705
Add testing and document support for Ruby 3.2
jdufresne Jan 29, 2023
448e288
Run GitHub actions on all branches
jdufresne Jan 29, 2023
4e7a20e
Merge pull request #652 from jdufresne/ruby32
danielmorrison Jan 30, 2023
11880aa
Merge pull request #653 from jdufresne/gha-all-branches
danielmorrison Jan 30, 2023
7fcc902
Update CHANGELOG
danielmorrison Jan 30, 2023
fa6a084
Replace Rails version check with ActiveRecord version check so that a…
nicduke38degrees Feb 9, 2023
05cb9f2
Merge pull request #655 from nicduke38degrees/no-assume-rails
danielmorrison Feb 9, 2023
15e899b
Update CHANGELOG
danielmorrison Feb 9, 2023
d7fbc55
conditional require railtie if Rails module exists
nicduke38degrees Feb 9, 2023
69810dc
Audit touch events
mcyoung Feb 13, 2023
a808f8e
Simplify
mcyoung Feb 13, 2023
670b947
Include as a default
mcyoung Feb 13, 2023
6789b9b
Add spec coverage
mcyoung Feb 13, 2023
02c5b89
Suggested changes
mcyoung Feb 14, 2023
b0bb2c3
An older rails friendly test
mcyoung Feb 14, 2023
5d41025
Do touch auditing on 6+ Rails
mcyoung Feb 14, 2023
82feab7
Compare w/ second
mcyoung Feb 14, 2023
4962e20
Make time spec work
mcyoung Feb 14, 2023
c568864
Adjust coverage line count for < 6 ActiveRecord and touch.
mcyoung Feb 14, 2023
944f0b8
Merge pull request #657 from mcyoung/mcy/feature/audit-touch
danielmorrison Feb 14, 2023
908f3c7
Update CHANGELOG
danielmorrison Feb 9, 2023
e2d9ebc
Bump version
danielmorrison Feb 14, 2023
21827de
Ensure testing of touched audit
mcyoung Feb 15, 2023
2556096
Give spec a little more time to reduce flakiness
mcyoung Feb 15, 2023
dd23c21
Merge pull request #658 from mcyoung/mcy/feature/adjust-touch-spec
danielmorrison Feb 15, 2023
9a583ba
Update changelog
danielmorrison Feb 15, 2023
7dbbb66
Fix redacted attributes bug when no changes were made
vlad-psh Jun 23, 2022
1eccb07
Merge pull request #628 from vlad-psh/fix-redacted-attributes
danielmorrison Feb 16, 2023
a07561f
Update changelog
danielmorrison Feb 16, 2023
b773b4a
Don't double audit on touch
mcyoung Feb 19, 2023
443d5f2
Merge pull request #660 from mcyoung/mcy/feature/audit-only-touchable…
danielmorrison Feb 21, 2023
7315642
Bump version
danielmorrison Feb 21, 2023
829bdb8
Ensure audits
mcyoung Feb 21, 2023
874f291
Merge pull request #662 from mcyoung/mcy/feature/safely-touch-audit
danielmorrison Feb 22, 2023
818ad34
Run standardrb --fix
danielmorrison Feb 22, 2023
548cbe9
Bump version
danielmorrison Feb 22, 2023
8d54983
Merge branch 'collectiveidea:main' into conditional-require-railtie
nicduke38degrees Mar 6, 2023
0172cbe
Update README.md
kvoshell Mar 13, 2023
900303f
Merge pull request #666 from kvoshell/patch-1
danielmorrison Mar 13, 2023
90a745c
A little cleanup
mcyoung Mar 16, 2023
363ac30
Use RequestStore instead of Thread.current for thread-safe requests.
tiagocassio Apr 18, 2023
7e4d609
Merge pull request #1 from convisoappsec/use-request-store-thread-safe
tiagocassio Apr 18, 2023
6ad0d10
Fix specs.
tiagocassio Apr 19, 2023
950ff2a
Fix typo.
tiagocassio Apr 19, 2023
0960dc7
Fix audited_spec.rb.
tiagocassio Apr 19, 2023
342734c
Merge pull request #669 from convisoappsec/main
danielmorrison Apr 20, 2023
e6cc2da
Preparing release 5.3.3
giovannism20 Apr 24, 2023
0efe797
Optimize query
danielmorrison Apr 24, 2023
7fefaf5
Update CHANGELOG.md
danielmorrison Apr 24, 2023
c61ec9c
Update README.md
danielmorrison Apr 24, 2023
e38e8a3
Merge pull request #668 from mcyoung/mcy/refactor/touch-enhancement
danielmorrison Apr 24, 2023
379aeed
Merge pull request #671 from giovannism20/main
danielmorrison Apr 24, 2023
f8416b1
Replace RequestStore with ActiveSupport::CurrentAttributes
the-spectator Apr 30, 2023
bbedccb
Add support for Rails 7.1
yuki24 Sep 24, 2023
bbfb4db
Add fixes for test builds for Ruby 2.3 & 2.4
yuki24 Sep 24, 2023
73aae10
Merge pull request #686 from yuki24/rails-7-1
danielmorrison Sep 30, 2023
76fd75e
Bump version to 5.4.0
danielmorrison Sep 30, 2023
9a1bed7
Add Rails 7.1 to README
danielmorrison Sep 30, 2023
626a97b
Merge branch 'main' into migrate_to_current_attributes
danielmorrison Nov 6, 2023
7e881fb
Merge pull request #673 from the-spectator/migrate_to_current_attributes
danielmorrison Nov 6, 2023
9a2a516
Merge pull request #665 from nicduke38degrees/conditional-require-rai…
danielmorrison Nov 6, 2023
e2513bb
Bump version
danielmorrison Nov 6, 2023
d9b4d5a
Revert "Replace RequestStore with ActiveSupport::CurrentAttributes"
danielmorrison Nov 6, 2023
3b4e52f
Bump version
danielmorrison Nov 8, 2023
0e41cea
Merge remote-tracking branch 'upstream/main' into misc/sync-upstream
mshimizu-oc Dec 14, 2023
dd4a7de
add audit_application column for test table
mshimizu-oc Dec 14, 2023
e70b4d7
add test for as_audit_application
mshimizu-oc Dec 14, 2023
fc05a40
audit_spec.rb +1 SingleCov uncovered.
mshimizu-oc Dec 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
More tweaks to get old version tests passing
  • Loading branch information
danielmorrison committed Dec 23, 2022
commit 827defc3ee91bba85c3ae7ceb341c1a7f37ce340
2 changes: 1 addition & 1 deletion spec/rails_app/config/application.rb
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ class Application < Rails::Application
config.root = File.expand_path("../../", __FILE__)
config.i18n.enforce_available_locales = true

if config.active_record.respond_to?(:yaml_column_permitted_classes=)
if !Rails.version.start_with?("5.0") && !Rails.version.start_with?("5.1") && config.active_record.respond_to?(:yaml_column_permitted_classes=)
config.active_record.yaml_column_permitted_classes =
%w[String Symbol Integer NilClass Float Time Date FalseClass Hash Array DateTime TrueClass BigDecimal
ActiveSupport::TimeWithZone ActiveSupport::TimeZone ActiveSupport::HashWithIndifferentAccess]