diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-05-22 14:16:49 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-05-22 21:47:32 +0200 |
| commit | 6145ddf515f93fcc7ed873b911b6369cc2bc0462 (patch) | |
| tree | abdf5336367a88aaa7af7e1a83c3c4fbba37e7ba /Gemfile.lock | |
| parent | add00b6986c78497c18a2f48bf83f0a23c7923f8 (diff) | |
| download | gitlab-ce-6145ddf515f93fcc7ed873b911b6369cc2bc0462.tar.gz | |
Revert "Merge branch 'revert-04c3c6dd' into 'master'"
This reverts commit 744f1f2e7037f5c70c3168d9e2e89b1c327465d2, reversing
changes made to c4d930e5f54e7da07c80cc028dfc0f5c08719146.
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 a63b7cc84aa..064413168f9 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) |