Skip to content

Commit e7f4c82

Browse files
authored
Merge branch 'main' into dependabot/bundler/rubocop-1.75.4
2 parents 2f50437 + 0efcc36 commit e7f4c82

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ GEM
165165
unf
166166
ast (2.4.3)
167167
aws-eventstream (1.3.2)
168-
aws-partitions (1.1078.0)
169-
aws-sdk-core (3.222.1)
168+
aws-partitions (1.1093.0)
169+
aws-sdk-core (3.222.3)
170170
aws-eventstream (~> 1, >= 1.3.0)
171171
aws-partitions (~> 1, >= 1.992.0)
172172
aws-sigv4 (~> 1.9)
@@ -176,7 +176,7 @@ GEM
176176
aws-sdk-kms (1.99.0)
177177
aws-sdk-core (~> 3, >= 3.216.0)
178178
aws-sigv4 (~> 1.5)
179-
aws-sdk-s3 (1.183.0)
179+
aws-sdk-s3 (1.184.0)
180180
aws-sdk-core (~> 3, >= 3.216.0)
181181
aws-sdk-kms (~> 1)
182182
aws-sigv4 (~> 1.5)

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ volumes:
77

88
x-env-info: &env-info
99
env_file:
10-
- './.env'
10+
#- './.env'
1111
- './.env.dev'
1212

1313
x-app-shared: &app-shared

0 commit comments

Comments
 (0)