Merge branch 'fix-gitorious-importer' into 'master'

Get Gitorious importer to work again.

Fixes #1504.

See merge request !576

CHANGELOG

@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 7.11.0 (unreleased)
+  - Get Gitorious importer to work again.
   - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
   - Ignore invalid lines in .gitmodules
   -

app/controllers/import/gitorious_controller.rb

@@ -6,7 +6,7 @@ class Import::GitoriousController < Import::BaseController
 
   def callback
     session[:gitorious_repos] = params[:repos]
-    redirect_to status_import_gitorious_url
+    redirect_to status_import_gitorious_path
   end
 
   def status

lib/gitlab/gitorious_import/client.rb

@@ -14,7 +14,7 @@ module Gitlab
       end
 
       def repos
-        @repos ||= repo_names.map { |full_name| Repository.new(full_name) }
+        @repos ||= repo_names.map { |full_name| GitoriousImport::Repository.new(full_name) }
       end
 
       def repo(id)