diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-05-24 15:34:54 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-05-24 15:34:54 +0000 |
| commit | 21c809ce224696a811d6a557c601e6dc2eb27d2f (patch) | |
| tree | f575dd5e531bc14a866c3be86ae902adab42ddc8 /Gemfile.lock | |
| parent | c0ea4164cdc21e831fbbfa9dee48a6fa2766d9fc (diff) | |
| parent | 0c9b9a70f4f9bf6cbdb6df244f6c7532f4d3d532 (diff) | |
| download | gitlab-ce-21c809ce224696a811d6a557c601e6dc2eb27d2f.tar.gz | |
Merge branch '62151-broken-master' into 'master'
Fix MySQL CI jobs
Closes #62156 and #62151
See merge request gitlab-org/gitlab-ce!28593
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 61450ebc0e0..9a2411713c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,7 +182,7 @@ GEM diffy (3.1.0) discordrb-webhooks-blackst0ne (3.3.0) rest-client (~> 2.0) - docile (1.1.5) + docile (1.3.1) domain_name (0.5.20180417) unf (>= 0.0.5, < 1.0.0) doorkeeper (4.3.2) @@ -883,11 +883,11 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.2) - simplecov (0.14.1) - docile (~> 1.1.0) + simplecov (0.16.1) + docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) + simplecov-html (0.10.2) slack-notifier (1.5.1) spring (2.0.2) activesupport (>= 4.2) @@ -1215,7 +1215,7 @@ DEPENDENCIES sidekiq (~> 5.2.7) sidekiq-cron (~> 1.0) simple_po_parser (~> 1.1.2) - simplecov (~> 0.14.0) + simplecov (~> 0.16.1) slack-notifier (~> 1.5.1) spring (~> 2.0.0) spring-commands-rspec (~> 1.0.4) |