Commit 91dc753a authored by David Fernandez's avatar David Fernandez

Merge branch '2682-update-gitlab-license-gem' into 'master'

Update gitlab-license gem to 1.3.0

See merge request gitlab-org/gitlab!53906
parents 5cc7ad00 886698ee
...@@ -293,7 +293,7 @@ gem 'gon', '~> 6.2' ...@@ -293,7 +293,7 @@ gem 'gon', '~> 6.2'
gem 'request_store', '~> 1.5' gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'
gem "gitlab-license", "~> 1.0" gem "gitlab-license", "~> 1.3"
# Protect against bruteforcing # Protect against bruteforcing
gem 'rack-attack', '~> 6.3.0' gem 'rack-attack', '~> 6.3.0'
......
...@@ -443,7 +443,7 @@ GEM ...@@ -443,7 +443,7 @@ GEM
jaeger-client (~> 1.1) jaeger-client (~> 1.1)
opentracing (~> 0.4) opentracing (~> 0.4)
redis (> 3.0.0, < 5.0.0) redis (> 3.0.0, < 5.0.0)
gitlab-license (1.0.0) gitlab-license (1.3.0)
gitlab-mail_room (0.0.8) gitlab-mail_room (0.0.8)
gitlab-markup (1.7.1) gitlab-markup (1.7.1)
gitlab-net-dns (0.9.1) gitlab-net-dns (0.9.1)
...@@ -1374,7 +1374,7 @@ DEPENDENCIES ...@@ -1374,7 +1374,7 @@ DEPENDENCIES
gitlab-experiment (~> 0.4.9) gitlab-experiment (~> 0.4.9)
gitlab-fog-azure-rm (~> 1.0) gitlab-fog-azure-rm (~> 1.0)
gitlab-labkit (= 0.14.0) gitlab-labkit (= 0.14.0)
gitlab-license (~> 1.0) gitlab-license (~> 1.3)
gitlab-mail_room (~> 0.0.8) gitlab-mail_room (~> 0.0.8)
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
gitlab-net-dns (~> 0.9.1) gitlab-net-dns (~> 0.9.1)
......
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