diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-24 09:28:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-24 09:28:33 +0000 |
| commit | b0f7ab7f0764e2d4beeb272b9d5d3c8740295f6b (patch) | |
| tree | ae2755a5381b624567bf1c350b90f87ba6a77966 /Gemfile.lock | |
| parent | fc070ad00efc28c8d1c252bc75d86059e52612cf (diff) | |
| parent | 69246ec8d2bcbffeeb5265d16be85a158f767a4e (diff) | |
| download | gitlab-ce-b0f7ab7f0764e2d4beeb272b9d5d3c8740295f6b.tar.gz | |
Merge branch 'sh-bump-lograge' into 'master'
Bump lograge to 0.10.0 and remove monkey patch
See merge request gitlab-org/gitlab-ce!18551
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1ba99df5e44..d5e1c428e25 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -483,10 +483,11 @@ GEM logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - lograge (0.5.1) - actionpack (>= 4, < 5.2) - activesupport (>= 4, < 5.2) - railties (>= 4, < 5.2) + lograge (0.10.0) + actionpack (>= 4) + activesupport (>= 4) + railties (>= 4) + request_store (~> 1.0) loofah (2.2.2) crass (~> 1.0.2) nokogiri (>= 1.5.9) |