diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-26 16:06:02 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-26 16:06:02 +0000 |
| commit | ef0149dd4440e1ea6d164f096112a5004a10ccf6 (patch) | |
| tree | 7b44a7789fb9bdc21a5fd3560b9ff22a0b3fd57d /app/views/admin | |
| parent | 5b93c5579fabec5d7bcaf77128608ff2b9deecc5 (diff) | |
| parent | bafffb2d14e1924154d5b7c74c7b3cbcf8c898fd (diff) | |
| download | gitlab-ce-ef0149dd4440e1ea6d164f096112a5004a10ccf6.tar.gz | |
Merge branch 'enable_ssl_verification_web_hook' into 'master'
Enable SSL verification for Webhooks
https://dev.gitlab.org/gitlab/gitlabhq/issues/2121
See merge request !1135
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/hooks/index.html.haml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index e74e1e85f41..b120f4dea67 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/app/views/admin/hooks/index.html.haml @@ -18,6 +18,13 @@ = f.label :url, "URL:", class: 'control-label' .col-sm-10 = f.text_field :url, class: "form-control" + .form-group + = f.label :enable_ssl_verification, "SSL verification", class: 'control-label checkbox' + .col-sm-10 + .checkbox + = f.label :enable_ssl_verification do + = f.check_box :enable_ssl_verification + %strong Enable SSL verification .form-actions = f.submit "Add System Hook", class: "btn btn-create" %hr @@ -32,6 +39,7 @@ .list-item-name = link_to admin_hook_path(hook) do %strong= hook.url + %p SSL Verification: #{hook.enable_ssl_verification ? "enabled" : "disabled"} .pull-right = link_to 'Test Hook', admin_hook_test_path(hook), class: "btn btn-sm" |