Add latest changes from gitlab-org/gitlab@13-0-stable-ee

2 files changed, 0 insertions, 39 deletions

diff --git a/app/views/projects/deploy_keys/_form.html.haml b/app/views/projects/deploy_keys/_form.html.haml
deleted file mode 100644
index 568930595a2..00000000000
--- a/app/views/projects/deploy_keys/_form.html.haml
+++ /dev/null
@@ -1,24 +0,0 @@
-= form_for [@project.namespace.becomes(Namespace), @project, @deploy_keys.new_key], url: namespace_project_deploy_keys_path, html: { class: "js-requires-input container" } do |f|
-  = form_errors(@deploy_keys.new_key)
-  .form-group.row
-    = f.label :title, class: "label-bold"
-    = f.text_field :title, class: 'form-control', required: true
-  .form-group.row
-    = f.label :key, class: "label-bold"
-    = f.text_area :key, class: "form-control", rows: 5, required: true
-  .form-group.row
-    %p.light.append-bottom-0
-      Paste a machine public key here. Read more about how to generate it
-      = link_to "here", help_page_path("ssh/README")
-
-  = f.fields_for :deploy_keys_projects do |deploy_keys_project_form|
-    .form-group.row
-      = deploy_keys_project_form.label :can_push do
-        = deploy_keys_project_form.check_box :can_push
-        %strong Write access allowed
-    .form-group.row
-      %p.light.append-bottom-0
-        Allow this key to push to repository as well? (Default only allows pull access.)
-
-  .form-group.row
-    = f.submit "Add key", class: "btn-success btn"
diff --git a/app/views/projects/deploy_keys/_index.html.haml b/app/views/projects/deploy_keys/_index.html.haml
deleted file mode 100644
index 6b3b824f72f..00000000000
--- a/app/views/projects/deploy_keys/_index.html.haml
+++ /dev/null
@@ -1,15 +0,0 @@
-- expanded = expanded_by_default?
-%section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_keys_settings' } }
-  .settings-header
-    %h4
-      Deploy Keys
-    %button.btn.js-settings-toggle{ type: 'button' }
-      = expanded ? 'Collapse' : 'Expand'
-    %p
-      Deploy keys allow read-only or read-write (if enabled) access to your repository. Deploy keys can be used for CI, staging or production servers. You can create a deploy key or add an existing one.
-  .settings-content
-    %h5.prepend-top-0
-      Create a new deploy key for this project
-    = render @deploy_keys.form_partial_path
-    %hr
-    #js-deploy-keys{ data: { endpoint: project_deploy_keys_path(@project), project_id: @project.id } }