summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-07-01 22:51:28 -0700
committerStan Hu <stanhu@gmail.com>2015-07-01 22:53:52 -0700
commitb643fa16039b9da8a52527e1a657401415684f21 (patch)
tree84f52badcef9dcd38fd9892c4a0cb8ca3d519704
parent2ca7ffd094ae285823d1a00b8cf1a7d23b80a2a3 (diff)
downloadgitlab-ce-b643fa16039b9da8a52527e1a657401415684f21.tar.gz
Remove link leading to a 404 error in Deploy Keys page
Closes #1866
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/admin/deploy_keys/index.html.haml3
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 616b41a4269..7a6b71ff140 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 7.13.0 (unreleased)
+ - 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
diff --git a/app/views/admin/deploy_keys/index.html.haml b/app/views/admin/deploy_keys/index.html.haml
index 6405a69fad3..2bf1689cbc6 100644
--- 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