diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-06-26 22:54:09 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-26 23:19:22 +0200 |
commit | aaec64a500346502aedefff446f1d8688ac5077c (patch) | |
tree | b24b5c7fa4b500b00c85cee3ef2cbb553d763f4d /Gemfile.lock | |
parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
parent | 3086c645fde2345d34e401bdf3e2f19f19da3294 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb - config/locales/simple_form.en.yml
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 057b929bb..c01439081 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,17 +76,17 @@ GEM av (0.9.0) cocaine (~> 0.5.3) aws-eventstream (1.0.3) - aws-partitions (1.175.0) - aws-sdk-core (3.55.0) + aws-partitions (1.177.0) + aws-sdk-core (3.56.0) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.21.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-kms (1.22.0) + aws-sdk-core (~> 3, >= 3.56.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.42.0) - aws-sdk-core (~> 3, >= 3.53.0) + aws-sdk-s3 (1.43.0) + aws-sdk-core (~> 3, >= 3.56.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.1.0) @@ -159,7 +159,7 @@ GEM css_parser (1.6.0) addressable debug_inspector (0.0.3) - derailed_benchmarks (1.3.5) + derailed_benchmarks (1.3.6) benchmark-ips (~> 2) get_process_mem (~> 0) heapy (~> 0) @@ -188,9 +188,9 @@ GEM unf (>= 0.0.5, < 1.0.0) doorkeeper (5.1.0) railties (>= 5) - dotenv (2.7.2) - dotenv-rails (2.7.2) - dotenv (= 2.7.2) + dotenv (2.7.4) + dotenv-rails (2.7.4) + dotenv (= 2.7.4) railties (>= 3.2, < 6.1) elasticsearch (6.0.2) elasticsearch-api (= 6.0.2) @@ -395,7 +395,7 @@ GEM av (~> 0.9.0) paperclip (>= 2.5.2) parallel (1.17.0) - parallel_tests (2.29.0) + parallel_tests (2.29.1) parallel parser (2.6.3.0) ast (~> 2.4.0) @@ -650,7 +650,7 @@ DEPENDENCIES active_record_query_trace (~> 1.6) addressable (~> 2.6) annotate (~> 2.7) - aws-sdk-s3 (~> 1.42) + aws-sdk-s3 (~> 1.43) better_errors (~> 2.5) binding_of_caller (~> 0.7) blurhash (~> 0.1) |