diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-08-26 04:13:55 +0000 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-08-26 04:13:55 +0000 |
| commit | 21996b027de0c2ba09042330cc1b1160d1d0a0de (patch) | |
| tree | 956f7496078ed4e3ac1a0e11d3d43d8b9a844cb0 | |
| parent | 257230e98643d319e59b3c15d928c4309253e93c (diff) | |
| parent | 27fbd36adeddd6fe162c9a2dbe7a39b3389f4b45 (diff) | |
| download | gitlab-ce-21996b027de0c2ba09042330cc1b1160d1d0a0de.tar.gz | |
Merge branch 'add-unleash-gem' into 'master'
Install Unleash Client Gem
See merge request gitlab-org/gitlab-ce!32065
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 5 insertions, 0 deletions
@@ -438,6 +438,7 @@ gem 'toml-rb', '~> 1.0.0', require: false gem 'flipper', '~> 0.13.0' gem 'flipper-active_record', '~> 0.13.0' gem 'flipper-active_support_cache_store', '~> 0.13.0' +gem 'unleash', '~> 0.1.5' # Structured logging gem 'lograge', '~> 0.5' diff --git a/Gemfile.lock b/Gemfile.lock index d9a32027f3c..43b9eec4967 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -535,6 +535,7 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) + murmurhash3 (0.1.6) mustermann (1.0.3) mustermann-grape (1.0.0) mustermann (~> 1.0.0) @@ -972,6 +973,8 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.10.0) + unleash (0.1.5) + murmurhash3 (~> 0.1.6) unparser (0.4.5) abstract_type (~> 0.0.7) adamantium (~> 0.2.0) @@ -1251,6 +1254,7 @@ DEPENDENCIES unf (~> 0.1.4) unicorn (~> 5.4.1) unicorn-worker-killer (~> 0.4.4) + unleash (~> 0.1.5) validates_hostname (~> 1.0.6) version_sorter (~> 2.2.4) vmstat (~> 2.3.0) |