Merge branch 'disable-deploy-edit-link' into 'master'

Remove link leading to a 404 error in Deploy Keys page ### What does this MR do? This MR removes a link that would lead an admin to believe he/she could edit a deploy key, but clicking on this link would lead to a 404. ### Screenshot ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/b36cd76287d6389a09f9e0e49c1b6751/image.png) ### What are the relevant issue numbers? Closes #1866 See merge request !923

Merge branch 'disable-deploy-edit-link' into 'master'
59950380 · Dmitriy Zaporozhets · 2cbf4528 · b643fa16 · 59950380 · 59950380
Commit 59950380 authored Jul 02, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

CHANGELOG CHANGELOG +1 -0

index.html.haml app/views/admin/deploy_keys/index.html.haml +1 -2

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.

 v 7.13.0 (unreleased)
  - Fix external issue tracker hook/test for HTTPS URLs (Daniel Gerhardt)
+  - Remove link leading to a 404 error in Deploy Keys page (Stan Hu)
  - Fix order of issues imported form GitHub (Hiroyuki Sato)
  - Bump rugments to 1.0.0beta8 to fix C prototype function highlighting (Jonathon Reinhart)
  - Fix Merge Request webhook to properly fire "merge" action when accepted from the web UI

--- a/app/views/admin/deploy_keys/index.html.haml
+++ b/app/views/admin/deploy_keys/index.html.haml
@@ -16,8 +16,7 @@
        - @deploy_keys.each do |deploy_key|
          %tr
            %td
-              = link_to admin_deploy_key_path(deploy_key) do
-                %strong= deploy_key.title
+              %strong= deploy_key.title
            %td
              %code.key-fingerprint= deploy_key.fingerprint
            %td