Merge branch 'fix-redirect-profile-keys-new-to-profile-keys' into 'master'

Make /profile/keys/new redirects to /profile/keys for back-compat

This addresses https://github.com/gitlabhq/gitlabhq/issues/10138.

See merge request !3717

1 files changed, 11 insertions, 1 deletions

diff --git a/spec/controllers/profiles/keys_controller_spec.rb b/spec/controllers/profiles/keys_controller_spec.rb
index b6573f105dc..3a82083717f 100644
--- a/spec/controllers/profiles/keys_controller_spec.rb
+++ b/spec/controllers/profiles/keys_controller_spec.rb
@@ -1,7 +1,17 @@
 require 'spec_helper'
 
 describe Profiles::KeysController do
-  let(:user)    { create(:user) }
+  let(:user) { create(:user) }
+
+  describe '#new' do
+    before { sign_in(user) }
+
+    it 'redirect to #index' do
+      get :new
+
+      expect(response).to redirect_to(profile_keys_path)
+    end
+  end
 
   describe "#get_keys" do
     describe "non existant user" do