diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-14 16:52:57 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-03-14 16:52:57 +0000 |
| commit | 5cd13f3590cd88fe33dd06ae7531d553e7618c1d (patch) | |
| tree | 6fe3a13e9bb4005f98a633b19e399879fd7d1102 | |
| parent | feb95ce3412ae3ab8b2c990b8ddf64d8d8945670 (diff) | |
| parent | d181c95ef36cfa3143d0c40d4afd5f41c6828708 (diff) | |
| download | gitlab-ce-5cd13f3590cd88fe33dd06ae7531d553e7618c1d.tar.gz | |
Merge branch 'update-ruby-prof' into 'master'
Update ruby-prof 0.16.2 -> 0.17.0
See merge request gitlab-org/gitlab-ce!17710
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -388,7 +388,7 @@ gem 'mail_room', '~> 0.9.1' gem 'email_reply_trimmer', '~> 0.1' gem 'html2text' -gem 'ruby-prof', '~> 0.16.2' +gem 'ruby-prof', '~> 0.17.0' # OAuth gem 'oauth2', '~> 1.4' diff --git a/Gemfile.lock b/Gemfile.lock index 68f33270180..7ad5e88859b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -802,7 +802,7 @@ GEM i18n ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-prof (0.16.2) + ruby-prof (0.17.0) ruby-progressbar (1.9.0) ruby-saml (1.4.1) nokogiri (>= 1.5.10) @@ -1172,7 +1172,7 @@ DEPENDENCIES rubocop (~> 0.52.1) rubocop-rspec (~> 1.22.1) ruby-fogbugz (~> 0.2.1) - ruby-prof (~> 0.16.2) + ruby-prof (~> 0.17.0) ruby_parser (~> 3.8) rufus-scheduler (~> 3.4) rugged (~> 0.26.0) |