Merge branch 'rails5-fix-project-import-spec' into 'master'

Rails5 fix project import spec

See merge request gitlab-org/gitlab-ee!6981

ee/changelogs/unreleased/rails5-fix-project-import-spec.yml

+---
+title: Rails5 fix project import spec
+merge_request: 6981
+author: Jasper Maes
+type: fixed

ee/spec/features/projects/new_project_spec.rb

@@ -119,13 +119,7 @@ describe 'New project' do
           click_button 'Create project'
 
           created_project = Project.last
-
-          if Gitlab.rails5?
-            expect(current_path).to eq(project_import_path(created_project))
-          else
-            expect(current_path).to eq(project_path(created_project))
-          end
-
+          expect(current_path).to eq(project_path(created_project))
           expect(created_project.mirror).to eq(true)
           expect(created_project.project_feature).not_to be_issues_enabled
         end