diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-07-27 16:42:07 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-07-27 16:42:07 +0000 |
| commit | 37306971903ec06e7e3b12dbad598e6555c2b2c1 (patch) | |
| tree | 5869254558516e8118ce0f4e105f3dc457af09a3 /Gemfile.lock | |
| parent | ac7f3e6a9201778e796394d54f86f45f7d789dc9 (diff) | |
| parent | f00dc0fcae6cf482c1bf60065bd2c1ecfaa9748d (diff) | |
| download | gitlab-ce-37306971903ec06e7e3b12dbad598e6555c2b2c1.tar.gz | |
Merge branch 'simple-cov' into 'master'
Generate coverage report from whole test suite
Extends our CI plan to merge all coverage results and generate HTML report.
See merge request !5018
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2039a0bb421..6fc6219bb67 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -673,9 +673,9 @@ GEM rufus-scheduler (>= 2.0.24) sidekiq (>= 4.0.0) simple_oauth (0.1.9) - simplecov (0.11.2) + simplecov (0.12.0) docile (~> 1.1.0) - json (~> 1.8) + json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) sinatra (1.4.7) @@ -962,7 +962,7 @@ DEPENDENCIES shoulda-matchers (~> 2.8.0) sidekiq (~> 4.0) sidekiq-cron (~> 0.4.0) - simplecov (~> 0.11.0) + simplecov (= 0.12.0) sinatra (~> 1.4.4) six (~> 0.2.0) slack-notifier (~> 1.2.0) |