diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 18:08:10 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 18:08:10 +0000 |
commit | 5d75b2b9a9d11c20667895e6aa68ea4e76658c5d (patch) | |
tree | 2aa529b0a153c805f5f4ecb357321a4e4f4c59cb /Gemfile.lock | |
parent | 6f2065c468b05658125b746169c56764a8ccddb1 (diff) | |
download | gitlab-ce-5d75b2b9a9d11c20667895e6aa68ea4e76658c5d.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 e96a38ccf22..bb64fb09649 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -951,7 +951,7 @@ GEM i18n ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-prof (1.0.0) + ruby-prof (1.3.1) ruby-progressbar (1.10.1) ruby-saml (1.7.2) nokogiri (>= 1.5.10) @@ -1358,7 +1358,7 @@ DEPENDENCIES rubocop-performance (~> 1.4.1) rubocop-rspec (~> 1.37.0) ruby-fogbugz (~> 0.2.1) - ruby-prof (~> 1.0.0) + ruby-prof (~> 1.3.0) ruby-progressbar ruby_parser (~> 3.8) rubyzip (~> 2.0.0) |