diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
| commit | b9f314bba754074c7ac7dad37cdd35a0cbf1d1b5 (patch) | |
| tree | 987f8ceff468686d7f4185cf2312e56aed45ecd1 /Gemfile.lock | |
| parent | 648cf8bfd51913929b7d0d3a637de496d6e40f89 (diff) | |
| parent | 0c1a05b281c2665b52a644d51b9b06c2756479a7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fc9e9a6dc..f51d41c09 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,7 +76,7 @@ GEM av (0.9.0) cocaine (~> 0.5.3) aws-eventstream (1.0.2) - aws-partitions (1.145.0) + aws-partitions (1.146.0) aws-sdk-core (3.48.2) aws-eventstream (~> 1.0, >= 1.0.2) aws-partitions (~> 1.0) @@ -85,7 +85,7 @@ GEM aws-sdk-kms (1.16.0) aws-sdk-core (~> 3, >= 3.48.2) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.34.0) + aws-sdk-s3 (1.35.0) aws-sdk-core (~> 3, >= 3.48.2) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) @@ -186,9 +186,9 @@ GEM unf (>= 0.0.5, < 1.0.0) doorkeeper (5.0.2) railties (>= 4.2) - dotenv (2.7.1) - dotenv-rails (2.7.1) - dotenv (= 2.7.1) + dotenv (2.7.2) + dotenv-rails (2.7.2) + dotenv (= 2.7.2) railties (>= 3.2, < 6.1) elasticsearch (6.0.2) elasticsearch-api (= 6.0.2) @@ -330,7 +330,7 @@ GEM nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) - makara (0.4.0) + makara (0.4.1) activerecord (>= 3.0.0) marcel (0.3.3) mimemagic (~> 0.3.2) @@ -357,7 +357,7 @@ GEM net-ssh (>= 2.6.5) net-ssh (5.0.2) nio4r (2.3.1) - nokogiri (1.10.1) + nokogiri (1.10.2) mini_portile2 (~> 2.4.0) nokogumbo (2.0.0) nokogiri (~> 1.8, >= 1.8.4) @@ -429,7 +429,7 @@ GEM rack (2.0.6) rack-attack (5.4.2) rack (>= 1.0, < 3) - rack-cors (1.0.2) + rack-cors (1.0.3) rack-protection (2.0.5) rack rack-proxy (0.6.5) @@ -660,7 +660,7 @@ DEPENDENCIES active_record_query_trace (~> 1.6) addressable (~> 2.6) annotate (~> 2.7) - aws-sdk-s3 (~> 1.34) + aws-sdk-s3 (~> 1.35) better_errors (~> 2.5) binding_of_caller (~> 0.7) bootsnap (~> 1.4) |