diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-05-12 23:03:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-05-12 23:03:36 +0000 |
| commit | 6aef2567330fb7c3e549d3f434acc0c272a8366f (patch) | |
| tree | da2631be87eb79a738767b953c10a2b120b051bc | |
| parent | d2fb451c8ffb1f7d7bd8c08e61a688608138e97c (diff) | |
| parent | 4fea5cda0bf7ff56dafae90306441b0d65f3ca05 (diff) | |
| download | gitlab-ce-6aef2567330fb7c3e549d3f434acc0c272a8366f.tar.gz | |
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
| -rw-r--r-- | app/views/admin/health_check/show.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/admin/admin_health_check_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml index ad79fd26d0b..c2313986a7f 100644 --- a/app/views/admin/health_check/show.html.haml +++ b/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) diff --git a/spec/features/admin/admin_health_check_spec.rb b/spec/features/admin/admin_health_check_spec.rb index 4fde04b609b..dec2dedf2b5 100644 --- a/spec/features/admin/admin_health_check_spec.rb +++ b/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 |