Commit e22534e9 authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'update-acme-client' into 'master'

Update acme-client to 2.0.6 to allow faraday 1.0

See merge request gitlab-org/gitlab!35327
parents b0ed4b7c 17ad39ef
...@@ -66,7 +66,7 @@ gem 'u2f', '~> 0.2.1' ...@@ -66,7 +66,7 @@ gem 'u2f', '~> 0.2.1'
gem 'validates_hostname', '~> 1.0.10' gem 'validates_hostname', '~> 1.0.10'
gem 'rubyzip', '~> 2.0.0', require: 'zip' gem 'rubyzip', '~> 2.0.0', require: 'zip'
# GitLab Pages letsencrypt support # GitLab Pages letsencrypt support
gem 'acme-client', '~> 2.0.5' gem 'acme-client', '~> 2.0', '>= 2.0.6'
# Browser detection # Browser detection
gem 'browser', '~> 2.5' gem 'browser', '~> 2.5'
......
...@@ -4,8 +4,8 @@ GEM ...@@ -4,8 +4,8 @@ GEM
RedCloth (4.3.2) RedCloth (4.3.2)
abstract_type (0.0.7) abstract_type (0.0.7)
ace-rails-ap (4.1.2) ace-rails-ap (4.1.2)
acme-client (2.0.5) acme-client (2.0.6)
faraday (~> 0.9, >= 0.9.1) faraday (>= 0.17, < 2.0.0)
actioncable (6.0.3.1) actioncable (6.0.3.1)
actionpack (= 6.0.3.1) actionpack (= 6.0.3.1)
nio4r (~> 2.0) nio4r (~> 2.0)
...@@ -1169,7 +1169,7 @@ PLATFORMS ...@@ -1169,7 +1169,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
RedCloth (~> 4.3.2) RedCloth (~> 4.3.2)
ace-rails-ap (~> 4.1.0) ace-rails-ap (~> 4.1.0)
acme-client (~> 2.0.5) acme-client (~> 2.0, >= 2.0.6)
activerecord-explain-analyze (~> 0.1) activerecord-explain-analyze (~> 0.1)
acts-as-taggable-on (~> 6.0) acts-as-taggable-on (~> 6.0)
addressable (~> 2.7) addressable (~> 2.7)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment