Merge branch 'fix_health_check_type' into 'master'

Fix minor typos in admin health check page

Fix minor typos from gitlab-org/gitlab-ce!3888

cc/ @DouweM @twk3 

See merge request !4134

app/views/admin/health_check/show.html.haml

@@ -13,7 +13,7 @@
     = icon('refresh')
     Reset health check access token
 %p.light
-  Health information can be reteived as plain text, json, or xml using:
+  Health information can be retrieved as plain text, JSON, or XML using:
   %ul
     %li
       %code= health_check_url(token: current_application_settings.health_check_access_token)

spec/features/admin/admin_health_check_spec.rb

@@ -13,7 +13,7 @@ feature "Admin Health Check", feature: true do
     end
 
     it { page.has_text? 'Health Check' }
-    it { page.has_text? 'Health information can be reteived' }
+    it { page.has_text? 'Health information can be retrieved' }
 
     it 'has a health check access token' do
       token = current_application_settings.health_check_access_token