diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-12-18 14:24:22 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2018-12-18 19:40:52 +0000 |
| commit | 6f6a7957025b232279b5353e2c8f9f73402173e4 (patch) | |
| tree | 511e9b229a794fcaab5e9a680826229b8acd6f02 /app | |
| parent | 16e645934b5ccde17cf6872975fca96c6e7a2b6b (diff) | |
| download | gitlab-ce-6f6a7957025b232279b5353e2c8f9f73402173e4.tar.gz | |
Merge branch 'fj-remove-forced-disposition-attachment-ssh-keys' into 'master'
Remove content disposition attachment displaying all ssh keys
See merge request gitlab-org/gitlab-ce!23882
(cherry picked from commit 4a6c5546cd6a3325e9a71cf4f7e097aedc3ce382)
d1c75762 Remove content disposition attachment displaying displaying ssh keys
b89eb71c Removed changelog since its not needed
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/profiles/keys_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/profiles/keys_controller.rb b/app/controllers/profiles/keys_controller.rb index dcee8eb7e6e..055d900eece 100644 --- a/app/controllers/profiles/keys_controller.rb +++ b/app/controllers/profiles/keys_controller.rb @@ -40,7 +40,6 @@ class Profiles::KeysController < Profiles::ApplicationController begin user = UserFinder.new(params[:username]).find_by_username if user.present? - headers['Content-Disposition'] = 'attachment' render plain: user.all_ssh_keys.join("\n") else return render_404 |