diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:07:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 18:07:42 +0000 |
| commit | 7b52c7cb634ef7047d30b0337fe477bcdcedf41d (patch) | |
| tree | 374ca9e908204488422046f10e340d1500780362 /Gemfile.lock | |
| parent | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (diff) | |
| download | gitlab-ce-7b52c7cb634ef7047d30b0337fe477bcdcedf41d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8653375281b..0748cb0e56b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -240,7 +240,7 @@ GEM diffy (3.3.0) discordrb-webhooks-blackst0ne (3.3.0) rest-client (~> 2.0) - docile (1.3.1) + docile (1.3.2) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) doorkeeper (5.0.2) @@ -1015,11 +1015,10 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) - simplecov (0.16.1) + simplecov (0.18.5) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) + simplecov-html (~> 0.11) + simplecov-html (0.12.2) sixarm_ruby_unaccent (1.2.0) slack-messenger (2.3.3) snowplow-tracker (0.6.1) @@ -1375,7 +1374,7 @@ DEPENDENCIES sidekiq (~> 5.2.7) sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) - simplecov (~> 0.16.1) + simplecov (~> 0.18.5) slack-messenger (~> 2.3.3) snowplow-tracker (~> 0.6.1) spring (~> 2.0.0) |