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

2 files changed, 0 insertions, 7 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
diff --git a/spec/controllers/profiles/keys_controller_spec.rb b/spec/controllers/profiles/keys_controller_spec.rb
index 685db8488f0..d55d15d0db8 100644
--- a/spec/controllers/profiles/keys_controller_spec.rb
+++ b/spec/controllers/profiles/keys_controller_spec.rb
@@ -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