Remove show actions from Admin and Project DeployKeys

4 files changed, 1 insertions, 59 deletions

diff --git a/app/controllers/admin/deploy_keys_controller.rb b/app/controllers/admin/deploy_keys_controller.rb
index c301e61d1c7..285e8495342 100644
--- a/app/controllers/admin/deploy_keys_controller.rb
+++ b/app/controllers/admin/deploy_keys_controller.rb
@@ -1,13 +1,8 @@
 class Admin::DeployKeysController < Admin::ApplicationController
   before_action :deploy_keys, only: [:index]
-  before_action :deploy_key, only: [:show, :destroy]
+  before_action :deploy_key, only: [:destroy]
 
   def index
-
-  end
-
-  def show
-
   end
 
   def new
diff --git a/app/controllers/projects/deploy_keys_controller.rb b/app/controllers/projects/deploy_keys_controller.rb
index 8c1bbf76917..40e2b37912b 100644
--- a/app/controllers/projects/deploy_keys_controller.rb
+++ b/app/controllers/projects/deploy_keys_controller.rb
@@ -18,10 +18,6 @@ class Projects::DeployKeysController < Projects::ApplicationController
     @available_public_keys -= @available_project_keys
   end
 
-  def show
-    @key = @project.deploy_keys.find(params[:id])
-  end
-
   def new
     @key = @project.deploy_keys.new
 
diff --git a/app/views/admin/deploy_keys/show.html.haml b/app/views/admin/deploy_keys/show.html.haml
deleted file mode 100644
index ea361ca4bdb..00000000000
--- a/app/views/admin/deploy_keys/show.html.haml
+++ /dev/null
@@ -1,35 +0,0 @@
-- page_title @deploy_key.title, "Deploy Keys"
-.row
-  .col-md-4
-    .panel.panel-default
-      .panel-heading
-        Deploy Key
-      %ul.well-list
-        %li
-          %span.light Title:
-          %strong= @deploy_key.title
-        %li
-          %span.light Created on:
-          %strong= @deploy_key.created_at.stamp("Aug 21, 2011")
-
-    .panel.panel-default
-      .panel-heading Projects (#{@deploy_key.deploy_keys_projects.count})
-      - if @deploy_key.deploy_keys_projects.any?
-        %ul.well-list
-          - @deploy_key.projects.each do |project|
-            %li
-              %span
-                %strong
-                = link_to project.name_with_namespace, [:admin, project.namespace.becomes(Namespace), project]
-              .pull-right
-                = link_to disable_namespace_project_deploy_key_path(project.namespace, project, @deploy_key), data: { confirm: "Are you sure?" }, method: :put, class: "btn-xs btn btn-remove", title: 'Remove deploy key from project' do
-                  %i.fa.fa-times.fa-inverse
-
-  .col-md-8
-    %p
-      %span.light Fingerprint:
-      %strong= @deploy_key.fingerprint
-    %pre.well-pre
-      = @deploy_key.key
-  .pull-right
-    = link_to 'Remove', admin_deploy_key_path(@deploy_key), data: {confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove delete-key"
diff --git a/app/views/projects/deploy_keys/show.html.haml b/app/views/projects/deploy_keys/show.html.haml
deleted file mode 100644
index 7d44652af72..00000000000
--- a/app/views/projects/deploy_keys/show.html.haml
+++ /dev/null
@@ -1,14 +0,0 @@
-- page_title @key.title, "Deploy Keys"
-%h3.page-title
-  Deploy key:
-  = @key.title
-  %small
-    created on
-    = @key.created_at.stamp("Aug 21, 2011")
-.back-link
-  = link_to namespace_project_deploy_keys_path(@project.namespace, @project) do
-    &larr; To keys list
-%hr
-%pre= @key.key
-.pull-right
-  = link_to 'Remove', namespace_project_deploy_key_path(@project.namespace, @project, @key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn-remove btn delete-key"