diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-04-25 13:18:05 +0300 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-04-25 13:18:05 +0300 |
| commit | 0474b28120870d7ea0a734c9a75a3ada6ead29eb (patch) | |
| tree | 538a1d88193795696525d1101c8f712a7fbb7096 | |
| parent | 3e5228e0a2027c5230c3223cda565596e4536e2a (diff) | |
| parent | bfa66ef41da9955ee6183a0fbd97786b3c1c20b0 (diff) | |
Merge branch 'zj-update-licensee' into 'master'
Upgrade Licensee gem
Closes #1157
See merge request gitlab-org/gitaly!693
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b954411..d80677c1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ UNRELEASED +- Upgrade Licensee gem to match the CE gem + https://gitlab.com/gitlab-org/gitaly/merge_requests/693 - Vendor gitlab_git at 8b41c40674273d6ee https://gitlab.com/gitlab-org/gitaly/merge_requests/684 - Make wiki commit fields backwards compatible diff --git a/ruby/Gemfile b/ruby/Gemfile index 2037b653e..54d3d2a8e 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -13,7 +13,7 @@ gem 'sentry-raven', '~> 2.7.2', require: false # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE -gem 'licensee', '~> 8.7.0' +gem 'licensee', '~> 8.9.0' # Locked until https://github.com/google/protobuf/issues/4210 is closed gem 'google-protobuf', '= 3.5.1' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 216c801eb..fcbe40626 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -67,7 +67,7 @@ GEM i18n (0.8.1) json (2.1.0) jwt (2.1.0) - licensee (8.7.0) + licensee (8.9.2) rugged (~> 0.24) little-plugger (1.1.4) logging (2.2.2) @@ -149,7 +149,7 @@ DEPENDENCIES gitlab-styles (~> 2.0.0) google-protobuf (= 3.5.1) grpc (~> 1.10.0) - licensee (~> 8.7.0) + licensee (~> 8.9.0) rdoc (~> 4.2) rspec rugged (~> 0.27.0) |