Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2799479d922..eaf08cd421b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -58,7 +58,9 @@ class UsersController < ApplicationController
# Get all keys of a user(params[:username]) in a text format
# Helpful for sysadmins to put in respective servers
def ssh_keys
- render plain: user.all_ssh_keys.join("\n")
+ keys = user.all_ssh_keys.join("\n")
+ keys << "\n" unless keys.empty?
+ render plain: keys
end
def activity
@@ -74,7 +76,9 @@ class UsersController < ApplicationController
# Get all gpg keys of a user(params[:username]) in a text format
def gpg_keys
- render plain: user.gpg_keys.select(&:verified?).map(&:key).join("\n")
+ keys = user.gpg_keys.filter_map { |gpg_key| gpg_key.key if gpg_key.verified? }.join("\n")
+ keys << "\n" unless keys.empty?
+ render plain: keys
end
def groups