Merge branch 'ce_upstream' into 'master'
CE upstream Closes #1376 and gitlab-ce#26114 See merge request !1014
Showing
... | @@ -343,7 +343,7 @@ gem 'octokit', '~> 4.3.0' | ... | @@ -343,7 +343,7 @@ gem 'octokit', '~> 4.3.0' |
gem 'mail_room', '~> 0.9.0' | gem 'mail_room', '~> 0.9.0' | ||
gem 'email_reply_parser', '~> 0.5.8' | gem 'email_reply_trimmer', '~> 0.1' | ||
gem 'html2text' | gem 'html2text' | ||
gem 'ruby-prof', '~> 0.16.2' | gem 'ruby-prof', '~> 0.16.2' | ||
... | @@ -358,5 +358,5 @@ gem 'paranoia', '~> 2.2' | ... | @@ -358,5 +358,5 @@ gem 'paranoia', '~> 2.2' |
gem 'health_check', '~> 2.2.0' | gem 'health_check', '~> 2.2.0' | ||
# System information | # System information | ||
gem 'vmstat', '~> 2.2' | gem 'vmstat', '~> 2.3.0' | ||
gem 'sys-filesystem', '~> 1.1.6' | gem 'sys-filesystem', '~> 1.1.6' |
295 KB
68.9 KB