diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 12:07:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 12:07:48 +0300 |
| commit | 5bd24a54ef4ce3a38a860eb53b66d062c2382971 (patch) | |
| tree | 5f5e65571dfcb2c62c27600ee7655dec4b44c923 /Gemfile.lock | |
| parent | 74673d04d25ffed35cbcf17cd42969bed0a4e705 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 812b21a836d..0e322705862 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -471,7 +471,7 @@ GEM rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.10.0) + hamlit (2.11.0) temple (>= 0.8.2) thor tilt @@ -1029,10 +1029,10 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (0.19.4) + thor (0.20.3) thread_safe (0.3.6) thrift (0.11.0.0) - tilt (2.0.9) + tilt (2.0.10) timecop (0.8.1) timfel-krb5-auth (0.8.3) toml (0.2.0) @@ -1224,7 +1224,7 @@ DEPENDENCIES gssapi guard-rspec haml_lint (~> 0.34.0) - hamlit (~> 2.10.0) + hamlit (~> 2.11.0) hangouts-chat (~> 0.0.5) hashie-forbidden_attributes health_check (~> 2.6.0) |