Commit b4317b16 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

Get Gitorious importer to work again.

Fixes #1504.

See merge request !576
parents 57759c9a c2f11f32
Please view this file on the master branch, on stable branches it's out of date. Please view this file on the master branch, on stable branches it's out of date.
v 7.11.0 (unreleased) v 7.11.0 (unreleased)
- Get Gitorious importer to work again.
- Fix clone URL field and X11 Primary selection (Dmitry Medvinsky) - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky)
- Ignore invalid lines in .gitmodules - Ignore invalid lines in .gitmodules
- Fix "Cannot move project" error message from popping up after a successful transfer (Stan Hu) - Fix "Cannot move project" error message from popping up after a successful transfer (Stan Hu)
......
...@@ -6,7 +6,7 @@ class Import::GitoriousController < Import::BaseController ...@@ -6,7 +6,7 @@ class Import::GitoriousController < Import::BaseController
def callback def callback
session[:gitorious_repos] = params[:repos] session[:gitorious_repos] = params[:repos]
redirect_to status_import_gitorious_url redirect_to status_import_gitorious_path
end end
def status def status
......
...@@ -14,7 +14,7 @@ module Gitlab ...@@ -14,7 +14,7 @@ module Gitlab
end end
def repos def repos
@repos ||= repo_names.map { |full_name| Repository.new(full_name) } @repos ||= repo_names.map { |full_name| GitoriousImport::Repository.new(full_name) }
end end
def repo(id) def repo(id)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment