Automatic merge of gitlab-org/gitlab-ce master

config/routes.rb

@@ -67,7 +67,7 @@ Rails.application.routes.draw do
   get 'health_check(/:checks)' => 'health_check#index', as: :health_check
 
   scope path: '-' do
-    # '/-/health' implemented by BasicHealthMiddleware
+    # '/-/health' implemented by BasicHealthCheck middleware
     get 'liveness' => 'health#liveness'
     get 'readiness' => 'health#readiness'
     resources :metrics, only: [:index]

spec/models/merge_request/metrics_spec.rb

@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 describe MergeRequest::Metrics do
-  subject { described_class.new }
-
   describe 'associations' do
     it { is_expected.to belong_to(:merge_request) }
     it { is_expected.to belong_to(:latest_closed_by).class_name('User') }