Merge branch 'rs-issue-1741' into 'master'

Remove show actions from Admin and Project DeployKeys

Example styling after:

> ![Screen_Shot_2015-06-03_at_6.04.51_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/105801a7e390224066721bba200c4909/Screen_Shot_2015-06-03_at_6.04.51_PM.png)

Closes #1741

See merge request !763

13 files changed, 20 insertions, 93 deletions

diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss
index e5590897947..66767cb13cb 100644
--- a/app/assets/stylesheets/generic/typography.scss
+++ b/app/assets/stylesheets/generic/typography.scss
@@ -23,6 +23,13 @@ pre {
   font-family: $monospace_font;
 }
 
+code {
+  &.key-fingerprint {
+    background: $body-bg;
+    color: $text-color;
+  }
+}
+
 /**
  * Wiki typography
  *
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/index.html.haml b/app/views/admin/deploy_keys/index.html.haml
index 367d25cd6a1..6405a69fad3 100644
--- a/app/views/admin/deploy_keys/index.html.haml
+++ b/app/views/admin/deploy_keys/index.html.haml
@@ -19,8 +19,7 @@
               = link_to admin_deploy_key_path(deploy_key) do
                 %strong= deploy_key.title
             %td
-              %span
-                (#{deploy_key.fingerprint})
+              %code.key-fingerprint= deploy_key.fingerprint
             %td
               %span.cgray
                 added #{time_ago_with_tooltip(deploy_key.created_at)}
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/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml
index fe5770f45c3..9bbccbc45ea 100644
--- a/app/views/profiles/keys/_key.html.haml
+++ b/app/views/profiles/keys/_key.html.haml
@@ -3,8 +3,7 @@
     = link_to path_to_key(key, is_admin) do
       %strong= key.title
   %td
-    %span
-      (#{key.fingerprint})
+    %code.key-fingerprint= key.fingerprint
   %td
     %span.cgray
       added #{time_ago_with_tooltip(key.created_at)}
diff --git a/app/views/profiles/keys/_key_details.html.haml b/app/views/profiles/keys/_key_details.html.haml
index 8bac22a2e1a..e0ae4d9720f 100644
--- a/app/views/profiles/keys/_key_details.html.haml
+++ b/app/views/profiles/keys/_key_details.html.haml
@@ -15,7 +15,7 @@
   .col-md-8
     %p
       %span.light Fingerprint:
-      %strong= @key.fingerprint
+      %code.key-fingerprint= @key.fingerprint
     %pre.well-pre
       = @key.key
   .pull-right
diff --git a/app/views/projects/deploy_keys/_deploy_key.html.haml b/app/views/projects/deploy_keys/_deploy_key.html.haml
index c577dfa8d55..8d66bae8cdf 100644
--- a/app/views/projects/deploy_keys/_deploy_key.html.haml
+++ b/app/views/projects/deploy_keys/_deploy_key.html.haml
@@ -2,24 +2,20 @@
   .pull-right
     - if @available_keys.include?(deploy_key)
       = link_to enable_namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), class: 'btn btn-sm', method: :put do
-        %i.fa.fa-plus
+        = icon('plus')
         Enable
     - else
       - if deploy_key.destroyed_when_orphaned? && deploy_key.almost_orphaned?
         = link_to 'Remove', disable_namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), data: { confirm: 'You are going to remove deploy key. Are you sure?'}, method: :put, class: "btn btn-remove delete-key btn-sm pull-right"
       - else
         = link_to disable_namespace_project_deploy_key_path(@project.namespace, @project, deploy_key), class: 'btn btn-sm', method: :put do
-          %i.fa.fa-power-off
+          = icon('power-off')
           Disable
 
-  - if project = project_for_deploy_key(deploy_key)
-    = link_to namespace_project_deploy_key_path(project.namespace, project, deploy_key) do
-      %i.fa.fa-key
-      %strong= deploy_key.title
-  - else
-    %i.fa.fa-key
-    %strong= deploy_key.title
-
+  = icon('key')
+  %strong= deploy_key.title
+  %br
+  %code.key-fingerprint= deploy_key.fingerprint
 
   %p.light.prepend-top-10
     - if deploy_key.public?
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"
diff --git a/config/routes.rb b/config/routes.rb
index b7380254abb..f4a104664f3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -165,7 +165,7 @@ Gitlab::Application.routes.draw do
       end
     end
 
-    resources :deploy_keys, only: [:index, :show, :new, :create, :destroy]
+    resources :deploy_keys, only: [:index, :new, :create, :destroy]
 
     resources :hooks, only: [:index, :create, :destroy] do
       get :test
@@ -421,7 +421,7 @@ Gitlab::Application.routes.draw do
           end
         end
 
-        resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :show, :new, :create] do
+        resources :deploy_keys, constraints: { id: /\d+/ }, only: [:index, :new, :create] do
           member do
             put :enable
             put :disable
diff --git a/features/admin/deploy_keys.feature b/features/admin/deploy_keys.feature
index 9df47eb51fd..33439cd1e85 100644
--- a/features/admin/deploy_keys.feature
+++ b/features/admin/deploy_keys.feature
@@ -8,11 +8,6 @@ Feature: Admin Deploy Keys
     When I visit admin deploy keys page
     Then I should see all public deploy keys
 
-  Scenario: Deploy Keys show
-    When I visit admin deploy keys page
-    And I click on first deploy key
-    Then I should see deploy key details
-
   Scenario: Deploy Keys new
     When I visit admin deploy keys page
     And I click 'New Deploy Key'
diff --git a/features/steps/admin/deploy_keys.rb b/features/steps/admin/deploy_keys.rb
index fb0b611762e..844837d177d 100644
--- a/features/steps/admin/deploy_keys.rb
+++ b/features/steps/admin/deploy_keys.rb
@@ -14,17 +14,6 @@ class Spinach::Features::AdminDeployKeys < Spinach::FeatureSteps
     end
   end
 
-  step 'I click on first deploy key' do
-    click_link DeployKey.are_public.first.title
-  end
-
-  step 'I should see deploy key details' do
-    deploy_key = DeployKey.are_public.first
-    current_path.should == admin_deploy_key_path(deploy_key)
-    page.should have_content(deploy_key.title)
-    page.should have_content(deploy_key.key)
-  end
-
   step 'I visit admin deploy key page' do
     visit admin_deploy_key_path(deploy_key)
   end
diff --git a/spec/routing/project_routing_spec.rb b/spec/routing/project_routing_spec.rb
index 3a0d9b88d75..0040718d9be 100644
--- a/spec/routing/project_routing_spec.rb
+++ b/spec/routing/project_routing_spec.rb
@@ -172,7 +172,7 @@ end
 #                         DELETE /:project_id/deploy_keys/:id(.:format)      deploy_keys#destroy
 describe Projects::DeployKeysController, 'routing' do
   it_behaves_like 'RESTful project resources' do
-    let(:actions)    { [:index, :show, :new, :create] }
+    let(:actions)    { [:index, :new, :create] }
     let(:controller) { 'deploy_keys' }
   end
 end