diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-07 03:40:27 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-07 03:40:27 +0000 |
| commit | 1d749356c30bc18be5805dac7bc49565782ec30d (patch) | |
| tree | 1272188813f3fa8f143389a51026c2a66da1fbda | |
| parent | 7f22a16784c9b6c6e12ab8b5cc162b5ca62899cd (diff) | |
| parent | 3c0da6fb56c1d859ad60af7f02dd8761b752bcfb (diff) | |
| download | gitlab-ce-1d749356c30bc18be5805dac7bc49565782ec30d.tar.gz | |
Merge branch '33380-button-icon' into 'master'
Remove icon from reset health check token button
Closes #33380
See merge request !11956
| -rw-r--r-- | app/views/admin/health_check/show.html.haml | 9 | ||||
| -rw-r--r-- | app/views/admin/runners/index.html.haml | 8 |
2 files changed, 7 insertions, 10 deletions
diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml index 8adb966064c..f16f59623f7 100644 --- a/app/views/admin/health_check/show.html.haml +++ b/app/views/admin/health_check/show.html.haml @@ -10,11 +10,10 @@ %p Access token is %code#health-check-token= current_application_settings.health_check_access_token - = button_to reset_health_check_token_admin_application_settings_path, - method: :put, class: 'btn btn-default', - data: { confirm: 'Are you sure you want to reset the health check token?' } do - = icon('spinner') - Reset health check access token + .prepend-top-10 + = button_to "Reset health check access token", reset_health_check_token_admin_application_settings_path, + method: :put, class: 'btn btn-default', + data: { confirm: 'Are you sure you want to reset the health check token?' } %p.light Health information can be retrieved from the following endpoints. More information is available = link_to 'here', help_page_path('user/admin_area/monitoring/health_check') diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index f118804cace..e242e851b4d 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -17,12 +17,10 @@ .pull-left %p You can reset runners registration token by pressing a button below. - %p - = button_to reset_runners_token_admin_application_settings_path, + .prepend-top-10 + = button_to "Reset runners registration token", reset_runners_token_admin_application_settings_path, method: :put, class: 'btn btn-default', - data: { confirm: 'Are you sure you want to reset registration token?' } do - = icon('spinner') - Reset runners registration token + data: { confirm: 'Are you sure you want to reset registration token?' } .bs-callout %p |