diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-20 18:38:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-20 18:38:36 +0200 |
| commit | 4dcabe6f9c776ea230b23dc60ec9b8a8fbed82df (patch) | |
| tree | c7f4b75274ae46db55b585a39ca427940d8fc218 /Gemfile.lock | |
| parent | b7e178d2e4102bdaa1ea41dfd8ed50093cf3f60a (diff) | |
| parent | 27b5143dc4289fa87481899f6658f927e833ff9e (diff) | |
Merge pull request #1331 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e4af7b195..f3bf40ff0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,13 +201,13 @@ GEM dotenv (= 2.7.5) railties (>= 3.2, < 6.1) e2mmap (0.1.0) - elasticsearch (7.6.0) - elasticsearch-api (= 7.6.0) - elasticsearch-transport (= 7.6.0) - elasticsearch-api (7.6.0) + elasticsearch (7.7.0) + elasticsearch-api (= 7.7.0) + elasticsearch-transport (= 7.7.0) + elasticsearch-api (7.7.0) multi_json elasticsearch-dsl (0.1.9) - elasticsearch-transport (7.6.0) + elasticsearch-transport (7.7.0) faraday (~> 1) multi_json encryptor (3.0.0) |