diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-05-22 10:21:38 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-05-22 10:21:38 +0000 |
| commit | 04c3c6dd5a415cdf73429eaead3178112fee2534 (patch) | |
| tree | 04a1f751aef1d99975fefe5505584be447584ceb /Gemfile.lock | |
| parent | e5e9466c9c7489816a3271575e582f560bb4709f (diff) | |
| parent | 4d9c76e9e44119ee2578c94b2b98bb72e80e874b (diff) | |
| download | gitlab-ce-04c3c6dd5a415cdf73429eaead3178112fee2534.tar.gz | |
Merge branch 'reorganize-tests-jobs-by-level' into 'master'
Reorganize test jobs by level
See merge request gitlab-org/gitlab-ce!27514
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 2dbff1674df..eb1a2fae123 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,7 +174,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) @@ -873,11 +873,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) @@ -1203,7 +1203,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) |