diff options
| author | Elan Ruusamäe <glen@delfi.ee> | 2016-08-25 17:42:58 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-28 07:40:26 +0200 |
| commit | ef063e00a9262a20f4bd584f1ee246b6f79c0025 (patch) | |
| tree | 7d8ad90f7fc06e151a0a912df21e96f17e7c30b9 | |
| parent | 3b206ccb8393d8f2c5ad227874d9a60beb054782 (diff) | |
| download | gitlab-ce-ef063e00a9262a20f4bd584f1ee246b6f79c0025.tar.gz | |
Bump ruby prof to 0.16
This solve issues with ruby builds with rubygems preload
see https://github.com/ruby-prof/ruby-prof/pull/191
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 10f1da4c681..8ea765b4ea9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -7,6 +7,7 @@ v 8.13.0 (unreleased) - Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison) - Only update issuable labels if they have been changed - Revoke button in Applications Settings underlines on hover. + - Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe) - Add organization field to user profile - Optimize GitHub importing for speed and memory @@ -328,7 +328,7 @@ gem 'mail_room', '~> 0.8' gem 'email_reply_parser', '~> 0.5.8' -gem 'ruby-prof', '~> 0.15.9' +gem 'ruby-prof', '~> 0.16.2' ## CI gem 'activerecord-session_store', '~> 1.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 1691f92c8ce..911ffcd7d9c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -629,7 +629,7 @@ GEM rubocop (>= 0.40.0) ruby-fogbugz (0.2.1) crack (~> 0.4) - ruby-prof (0.15.9) + ruby-prof (0.16.2) ruby-progressbar (1.8.1) ruby-saml (1.3.0) nokogiri (>= 1.5.10) @@ -942,7 +942,7 @@ DEPENDENCIES rubocop (~> 0.42.0) rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) - ruby-prof (~> 0.15.9) + ruby-prof (~> 0.16.2) sanitize (~> 2.0) sass-rails (~> 5.0.6) scss_lint (~> 0.47.0) |