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
a938b3ee
Commit
a938b3ee
authored
Feb 18, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Link to original repo on import status pages.
parent
6979b3af
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
7 deletions
+19
-7
app/views/import/bitbucket/status.html.haml
app/views/import/bitbucket/status.html.haml
+4
-2
app/views/import/github/status.html.haml
app/views/import/github/status.html.haml
+7
-2
app/views/import/gitlab/status.html.haml
app/views/import/gitlab/status.html.haml
+8
-3
No files found.
app/views/import/bitbucket/status.html.haml
View file @
a938b3ee
...
@@ -17,7 +17,8 @@
...
@@ -17,7 +17,8 @@
%tbody
%tbody
-
@already_added_projects
.
each
do
|
project
|
-
@already_added_projects
.
each
do
|
project
|
%tr
{
id:
"project_#{project.id}"
,
class:
"#{project_status_css_class(project.import_status)}"
}
%tr
{
id:
"project_#{project.id}"
,
class:
"#{project_status_css_class(project.import_status)}"
}
%td
=
project
.
import_source
%td
=
link_to
project
.
import_source
,
"https://bitbucket.org/
#{
project
.
import_source
}
"
,
target:
"_blank"
%td
%td
%strong
=
link_to
project
.
path_with_namespace
,
project
%strong
=
link_to
project
.
path_with_namespace
,
project
%td
.job-status
%td
.job-status
...
@@ -33,7 +34,8 @@
...
@@ -33,7 +34,8 @@
-
@repos
.
each
do
|
repo
|
-
@repos
.
each
do
|
repo
|
%tr
{
id:
"repo_#{repo["
owner
"]}___#{repo["
slug
"]}"
}
%tr
{
id:
"repo_#{repo["
owner
"]}___#{repo["
slug
"]}"
}
%td
=
"
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
%td
=
link_to
"
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
,
"https://bitbucket.org/
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
,
target:
"_blank"
%td
.import-target
%td
.import-target
=
"
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
=
"
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
%td
.import-actions.job-status
%td
.import-actions.job-status
...
...
app/views/import/github/status.html.haml
View file @
a938b3ee
...
@@ -17,7 +17,8 @@
...
@@ -17,7 +17,8 @@
%tbody
%tbody
-
@already_added_projects
.
each
do
|
project
|
-
@already_added_projects
.
each
do
|
project
|
%tr
{
id:
"project_#{project.id}"
,
class:
"#{project_status_css_class(project.import_status)}"
}
%tr
{
id:
"project_#{project.id}"
,
class:
"#{project_status_css_class(project.import_status)}"
}
%td
=
project
.
import_source
%td
=
link_to
project
.
import_source
,
"https://github.com/
#{
project
.
import_source
}
"
,
target:
"_blank"
%td
%td
%strong
=
link_to
project
.
path_with_namespace
,
project
%strong
=
link_to
project
.
path_with_namespace
,
project
%td
.job-status
%td
.job-status
...
@@ -25,12 +26,16 @@
...
@@ -25,12 +26,16 @@
%span
.cgreen
%span
.cgreen
%i
.fa.fa-check
%i
.fa.fa-check
done
done
-
elsif
project
.
import_status
==
'started'
%i
.fa.fa-spinner.fa-spin
started
-
else
-
else
=
project
.
human_import_status_name
=
project
.
human_import_status_name
-
@repos
.
each
do
|
repo
|
-
@repos
.
each
do
|
repo
|
%tr
{
id:
"repo_#{repo.id}"
}
%tr
{
id:
"repo_#{repo.id}"
}
%td
=
repo
.
full_name
%td
=
link_to
repo
.
full_name
,
"https://github.com/
#{
repo
.
full_name
}
"
,
target:
"_blank"
%td
.import-target
%td
.import-target
=
repo
.
full_name
=
repo
.
full_name
%td
.import-actions.job-status
%td
.import-actions.job-status
...
...
app/views/import/gitlab/status.html.haml
View file @
a938b3ee
...
@@ -12,12 +12,13 @@
...
@@ -12,12 +12,13 @@
%thead
%thead
%tr
%tr
%th
From GitLab.com
%th
From GitLab.com
%th
To
GitLab private
instance
%th
To
this GitLab
instance
%th
Status
%th
Status
%tbody
%tbody
-
@already_added_projects
.
each
do
|
project
|
-
@already_added_projects
.
each
do
|
project
|
%tr
{
id:
"project_#{project.id}"
,
class:
"#{project_status_css_class(project.import_status)}"
}
%tr
{
id:
"project_#{project.id}"
,
class:
"#{project_status_css_class(project.import_status)}"
}
%td
=
project
.
import_source
%td
=
link_to
project
.
import_source
,
"https://gitlab.com/
#{
project
.
import_source
}
"
,
target:
"_blank"
%td
%td
%strong
=
link_to
project
.
path_with_namespace
,
project
%strong
=
link_to
project
.
path_with_namespace
,
project
%td
.job-status
%td
.job-status
...
@@ -25,12 +26,16 @@
...
@@ -25,12 +26,16 @@
%span
.cgreen
%span
.cgreen
%i
.fa.fa-check
%i
.fa.fa-check
done
done
-
elsif
project
.
import_status
==
'started'
%i
.fa.fa-spinner.fa-spin
started
-
else
-
else
=
project
.
human_import_status_name
=
project
.
human_import_status_name
-
@repos
.
each
do
|
repo
|
-
@repos
.
each
do
|
repo
|
%tr
{
id:
"repo_#{repo["
id
"]}"
}
%tr
{
id:
"repo_#{repo["
id
"]}"
}
%td
=
repo
[
"path_with_namespace"
]
%td
=
link_to
repo
[
"path_with_namespace"
],
"https://gitlab.com/
#{
repo
[
"path_with_namespace"
]
}
"
,
target:
"_blank"
%td
.import-target
%td
.import-target
=
repo
[
"path_with_namespace"
]
=
repo
[
"path_with_namespace"
]
%td
.import-actions.job-status
%td
.import-actions.job-status
...
...
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