diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:08:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-02 15:08:01 +0000 |
| commit | b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc (patch) | |
| tree | 55f2a32e5fd3d67597fc8c6cc2a01793ee15c87a /Gemfile.lock | |
| parent | 988b28ec1a379d38f6ac9ed04886ee564fd447fd (diff) | |
| download | gitlab-ce-b375c6c05fbd03aea33a9ee9f82e678bdaa8c3cc.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index b11f0c5a5db..8653375281b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1065,7 +1065,7 @@ GEM thread_safe (0.3.6) thrift (0.11.0.0) tilt (2.0.10) - timecop (0.8.1) + timecop (0.9.1) timfel-krb5-auth (0.8.3) toml (0.2.0) parslet (~> 1.8.0) @@ -1387,7 +1387,7 @@ DEPENDENCIES sys-filesystem (~> 1.1.6) test-prof (~> 0.10.0) thin (~> 1.7.0) - timecop (~> 0.8.0) + timecop (~> 0.9.1) toml-rb (~> 1.0.0) truncato (~> 0.7.11) u2f (~> 0.2.1) |