Skip to content

Commit

Permalink
Merge branch 'main' into feature/ND-570-Remove-secrets-baked-into-adm…
Browse files Browse the repository at this point in the history
…in-container-

Pulling in latest updates to main
  • Loading branch information
asifamirat00 committed Dec 12, 2024
2 parents 5b02487 + 9254e43 commit b1cfc4b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
Empty file.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ gem "devise"
gem "jwt"
gem "omniauth-oauth2"
gem "omniauth-rails_csrf_protection", "~> 1.0.1"
gem "aws-sdk-s3", "~> 1.136"
gem "aws-sdk-s3", "~> 1.176"
gem "ipaddress_2"
gem "aws-sdk-ecs", "~> 1.131"
gem "aws-sdk-ecs", "~> 1.172"
gem "cancancan", "~> 3.5"
gem "audited"
gem "kaminari"
Expand Down
26 changes: 13 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,23 @@ GEM
activerecord (>= 5.2, < 7.2)
activesupport (>= 5.2, < 7.2)
aws-eventstream (1.3.0)
aws-partitions (1.962.0)
aws-sdk-core (3.201.3)
aws-partitions (1.1020.0)
aws-sdk-core (3.214.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
aws-partitions (~> 1, >= 1.992.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-ecs (1.152.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-ecs (1.172.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (1.96.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.157.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-s3 (1.176.0)
aws-sdk-core (~> 3, >= 3.210.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.9.1)
aws-sigv4 (1.10.1)
aws-eventstream (~> 1, >= 1.0.2)
base64 (0.2.0)
bcrypt (3.1.20)
Expand Down Expand Up @@ -406,8 +406,8 @@ PLATFORMS

DEPENDENCIES
audited
aws-sdk-ecs (~> 1.131)
aws-sdk-s3 (~> 1.136)
aws-sdk-ecs (~> 1.172)
aws-sdk-s3 (~> 1.176)
bootsnap (>= 1.4.2)
byebug
cancancan (~> 3.5)
Expand Down

0 comments on commit b1cfc4b

Please sign in to comment.