diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-09 09:09:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-09 09:09:23 +0300 |
| commit | 4bfebcc481ca32ca0055e55cad509f400a2939ff (patch) | |
| tree | ae2178cccb15c2c16a83865d496fd4a40f465dfb /Gemfile.lock | |
| parent | 5d066c532d5fc4dc8a89be2068236b7058ddb645 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f16934bf05c..59aff2900f5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1122,8 +1122,7 @@ GEM slack-messenger (2.3.4) snowplow-tracker (0.6.1) contracts (~> 0.7, <= 0.11) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) sprockets (3.7.2) @@ -1179,7 +1178,7 @@ GEM truncato (0.7.11) htmlentities (~> 4.3.1) nokogiri (>= 1.7.0, <= 2.0) - tzinfo (1.2.7) + tzinfo (1.2.8) thread_safe (~> 0.1) u2f (0.2.1) uber (0.1.0) @@ -1498,7 +1497,7 @@ DEPENDENCIES simplecov-cobertura (~> 1.3.1) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.6.1) - spring (~> 2.0.0) + spring (~> 2.1.0) spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) sshkey (~> 2.0) |