Commit 4a6c5546 authored by Douwe Maan's avatar Douwe Maan

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
parents aa7c927e 4b0988aa
......@@ -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
......
......@@ -65,12 +65,6 @@ describe Profiles::KeysController do
expect(response.content_type).to eq("text/plain")
end
it "responds with attachment content disposition" do
get :get_keys, username: user.username
expect(response.headers['Content-Disposition']).to eq('attachment')
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment