Merge branch 'ce_upstream' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream

app/views/profiles/keys/_key.html.haml

-<<<<<<< HEAD
-%tr
-  %td
-    = link_to path_to_key(key, is_admin) do
-      %strong= key.title
-  %td
-    %code.key-fingerprint= key.fingerprint
-  %td
-    %span.cgray
-      added #{time_ago_with_tooltip(key.created_at)}
-  %td
-    - unless key.is_a? LDAPKey
-      = link_to 'Remove', path_to_key(key, is_admin), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-sm btn-remove delete-key pull-right"
-=======
 %li.key-list-item
   .pull-left.append-right-10
     = icon 'key', class: "key-icon hidden-xs"
@@ -23,7 +9,7 @@
   .pull-right
     %span.key-created-at
       created #{time_ago_with_tooltip(key.created_at)} ago
-    = link_to path_to_key(key, is_admin), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-transparent prepend-left-10" do
-      %span.sr-only Remove
-      = icon('trash')
->>>>>>> 99f08b3f727e9d155ab10ad285fe48e0279fb79e
+    - unless key.is_a? LDAPKey
+      = link_to path_to_key(key, is_admin), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-transparent prepend-left-10" do
+        %span.sr-only Remove
+        = icon('trash')