diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-30 15:08:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-30 15:08:48 +0000 |
| commit | 340f15b402eec795fca0e0f29709baef0ecf14a7 (patch) | |
| tree | 6a7eac5d394f4002b9e5b0c9da12bc12e59ed59c /Gemfile.lock | |
| parent | 1e254d9f5a46a85c9bb6f24da8265a30fd388db4 (diff) | |
| download | gitlab-ce-340f15b402eec795fca0e0f29709baef0ecf14a7.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ae35fa30e6e..ca0884db4a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,8 +4,8 @@ GEM RedCloth (4.3.2) abstract_type (0.0.7) ace-rails-ap (4.1.2) - acme-client (2.0.5) - faraday (~> 0.9, >= 0.9.1) + acme-client (2.0.6) + faraday (>= 0.17, < 2.0.0) actioncable (6.0.3.1) actionpack (= 6.0.3.1) nio4r (~> 2.0) @@ -1169,7 +1169,7 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) ace-rails-ap (~> 4.1.0) - acme-client (~> 2.0.5) + acme-client (~> 2.0, >= 2.0.6) activerecord-explain-analyze (~> 0.1) acts-as-taggable-on (~> 6.0) addressable (~> 2.7) |