Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 0 deletions

diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb
index 136a30387b4..b224ef87229 100644
--- a/spec/requests/users_controller_spec.rb
+++ b/spec/requests/users_controller_spec.rb
@@ -97,6 +97,14 @@ RSpec.describe UsersController do
     end
   end
 
+  describe 'GET /users/:username (deprecated user top)' do
+    it 'redirects to /user1' do
+      get '/users/user1'
+
+      expect(response).to redirect_to user_path('user1')
+    end
+  end
+
   describe 'GET #activity' do
     shared_examples_for 'renders the show template' do
       it 'renders the show template' do