diff options
| author | mo khan <mo.khan@gmail.com> | 2020-07-30 02:00:26 +0000 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-07-30 02:00:26 +0000 |
| commit | ab794b1050830a01f6fede765e9eb40cdbfcdc38 (patch) | |
| tree | 1a112dbbb328e31467adae6650e8d344ab94aeaa | |
| parent | 8ee0824204c0e97d97ad6d38778cd9e7e9da6813 (diff) | |
| parent | 04cd16a6c066118bc48a2ca88a3954a73251bbef (diff) | |
Merge branch 'eread/require-latest-go' into 'master'v3.19.3
Set .tool-versions to latest Go
See merge request gitlab-org/security-products/license-management!197
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | config/files/.tool-versions | 2 | ||||
| -rw-r--r-- | lib/license/management/version.rb | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e75026..0f0316c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # GitLab License management changelog +## v3.19.3 + +- Set `golang` version to `1.14.6` in `.tool-versions` file. (!197) + ## v3.19.2 - Combine default/custom x509 certificates in TLS validation. (!194) diff --git a/Gemfile.lock b/Gemfile.lock index 907b440..bb4ae19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,7 +8,7 @@ GIT PATH remote: . specs: - license-management (3.19.2) + license-management (3.19.3) license_finder (~> 6.6.0) GEM diff --git a/config/files/.tool-versions b/config/files/.tool-versions index 852c2d4..41b41e6 100644 --- a/config/files/.tool-versions +++ b/config/files/.tool-versions @@ -1,5 +1,5 @@ elixir system -golang 1.14 +golang 1.14.6 gradle 6.3 java adoptopenjdk-8.0.252+9.1 adoptopenjdk-11.0.7+10.1 maven 3.6.3 diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb index d9e2383..6ca1993 100644 --- a/lib/license/management/version.rb +++ b/lib/license/management/version.rb @@ -2,6 +2,6 @@ module License module Management - VERSION = '3.19.2' + VERSION = '3.19.3' end end |