summaryrefslogtreecommitdiff
path: root/app/controllers/profiles/keys_controller.rb
diff options
context:
space:
mode:
authorGitLab <devaroop123@yahoo.co.in>2014-02-06 14:42:59 +0530
committerGitLab <devaroop123@yahoo.co.in>2014-02-06 14:42:59 +0530
commit1c9a41e0d5cac3ee937555ae4189ecd1ad597004 (patch)
tree5ee908eb58dc64d085426de54baacaa207feb137 /app/controllers/profiles/keys_controller.rb
parentb9d58c4cecd06be74c3cc32ccfb522b31544ab2e (diff)
downloadgitlab-ce-1c9a41e0d5cac3ee937555ae4189ecd1ad597004.tar.gz
adding tests for the ssh keys feature
Diffstat (limited to 'app/controllers/profiles/keys_controller.rb')
-rw-r--r--app/controllers/profiles/keys_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb
index 2b991957b70..3bb1b0c2f2a 100644
--- a/app/controllers/profiles/keys_controller.rb
+++ b/app/controllers/profiles/keys_controller.rb
@@ -40,7 +40,7 @@ class Profiles::KeysController < ApplicationController
if params[:username].present?
begin
user = User.find_by_username(params[:username])
- user.present? ? (render :text => user.all_ssh_keys) :
+ user.present? ? (render :text => user.all_ssh_keys.join('\n')) :
(render_404 and return)
rescue => e
render text: e.message