Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
c2f11f32
Commit
c2f11f32
authored
Apr 24, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get Gitorious importer to work again.
parent
439b9f50
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
app/controllers/import/gitorious_controller.rb
app/controllers/import/gitorious_controller.rb
+1
-1
lib/gitlab/gitorious_import/client.rb
lib/gitlab/gitorious_import/client.rb
+1
-1
No files found.
CHANGELOG
View file @
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)
...
...
app/controllers/import/gitorious_controller.rb
View file @
c2f11f32
...
@@ -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
...
...
lib/gitlab/gitorious_import/client.rb
View file @
c2f11f32
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment