diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-11 17:52:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 17:52:18 +0100 |
| commit | c2857c976c7d4a8bbd02c3c18569913f2bf8a034 (patch) | |
| tree | fabbdcab9a68f7b7b702b5652c71351c62c250c4 /Gemfile.lock | |
| parent | a1c6e6de1b42ea1ecfa2bb188ab56ee5f73611ce (diff) | |
| parent | f3e76341565e9455b755dd9f0529b444c7081abc (diff) | |
Merge pull request #955 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 684a34c0a..49e6fe66d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GEM activemodel (>= 4.1, < 6) case_transform (>= 0.2) jsonapi-renderer (>= 0.1.1.beta1, < 0.3) - active_record_query_trace (1.6) + active_record_query_trace (1.6.1) activejob (5.2.2) activesupport (= 5.2.2) globalid (>= 0.3.6) @@ -76,8 +76,8 @@ GEM av (0.9.0) cocaine (~> 0.5.3) aws-eventstream (1.0.1) - aws-partitions (1.131.0) - aws-sdk-core (3.45.0) + aws-partitions (1.143.0) + aws-sdk-core (3.46.2) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) aws-sigv4 (~> 1.0) @@ -85,7 +85,7 @@ GEM aws-sdk-kms (1.13.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.30.1) + aws-sdk-s3 (1.31.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) @@ -402,7 +402,7 @@ GEM pg (1.1.4) pghero (2.2.0) activerecord - pkg-config (1.3.5) + pkg-config (1.3.6) powerpack (0.1.2) premailer (1.11.1) addressable @@ -661,7 +661,7 @@ DEPENDENCIES active_record_query_trace (~> 1.6) addressable (~> 2.6) annotate (~> 2.7) - aws-sdk-s3 (~> 1.30) + aws-sdk-s3 (~> 1.31) better_errors (~> 2.5) binding_of_caller (~> 0.7) bootsnap (~> 1.4) |