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.

Sign up for GitHub

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

Jump to bottom

Update defra-ruby-aws to AWS:KMS version #569

Merged
merged 2 commits into from
Jun 23, 2020
Merged

Update defra-ruby-aws to AWS:KMS version #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e5b412
Update defra-ruby-aws to AWS:KMS version
Cruikshanks Jun 19, 2020
1ec7bea
Merge branch 'master' into update-defra-ruby-aws
Cruikshanks Jun 19, 2020
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ gem "waste_exemptions_engine",
branch: "master"

# Use the Defra Ruby Aws gem for loading files to AWS buckets
gem "defra_ruby_aws", "~> 0.2.0"
gem "defra_ruby_aws", "~> 0.3.0"

# bundle exec rake doc:rails generates the API under doc/api.
gem "sdoc", "~> 1.1.0", group: :doc
Expand Down
20 changes: 10 additions & 10 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,21 @@ GEM
rbtree3 (~> 0.5)
ast (2.4.1)
aws-eventstream (1.1.0)
aws-partitions (1.324.0)
aws-sdk-core (3.97.1)
aws-partitions (1.331.0)
aws-sdk-core (3.100.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.33.0)
aws-sdk-core (~> 3, >= 3.71.0)
aws-sdk-kms (1.34.1)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.67.1)
aws-sdk-core (~> 3, >= 3.96.1)
aws-sdk-s3 (1.69.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.4)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-sigv4 (1.2.0)
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.13)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
Expand All @@ -130,7 +130,7 @@ GEM
defra_ruby_area (2.0.0)
nokogiri (~> 1.10.4)
rest-client (~> 2.0)
defra_ruby_aws (0.2.0)
defra_ruby_aws (0.3.0)
aws-sdk-s3
defra_ruby_email (1.0.0)
rails (~> 6.0.3.1)
Expand Down Expand Up @@ -432,7 +432,7 @@ DEPENDENCIES
bullet
cancancan (~> 2.0)
database_cleaner
defra_ruby_aws (~> 0.2.0)
defra_ruby_aws (~> 0.3.0)
defra_ruby_style
devise
devise_invitable
Expand Down