diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 18:09:00 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 18:09:00 +0000 |
commit | c57e10faab0abb213e7a18274fd5a98ba87a5c09 (patch) | |
tree | de0195e28dfe19fbfeb5bffa8fde4f511288d8ef /Gemfile.lock | |
parent | 11e5d1b9ca3efa7be34ddebb708a6aedb4e91639 (diff) | |
download | gitlab-ce-c57e10faab0abb213e7a18274fd5a98ba87a5c09.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 64e701d22de..276f9da13c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1037,7 +1037,7 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.3.13) sshkey (2.0.0) - stackprof (0.2.13) + stackprof (0.2.15) state_machines (0.5.0) state_machines-activemodel (0.7.1) activemodel (>= 4.1) @@ -1382,7 +1382,7 @@ DEPENDENCIES spring-commands-rspec (~> 1.0.4) sprockets (~> 3.7.0) sshkey (~> 2.0) - stackprof (~> 0.2.13) + stackprof (~> 0.2.15) state_machines-activerecord (~> 0.6.0) sys-filesystem (~> 1.1.6) test-prof (~> 0.10.0) |