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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
e02efff6
Commit
e02efff6
authored
Jul 09, 2018
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve manifest feature frontend after review
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
97751ca1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
21 deletions
+26
-21
app/views/import/manifest/_form.html.haml
app/views/import/manifest/_form.html.haml
+2
-2
app/views/import/manifest/status.html.haml
app/views/import/manifest/status.html.haml
+0
-3
app/views/projects/_import_project_pane.html.haml
app/views/projects/_import_project_pane.html.haml
+24
-16
No files found.
app/views/import/manifest/_form.html.haml
View file @
e02efff6
...
...
@@ -18,5 +18,5 @@
=
_
(
'Choose the top-level group for your repository imports.'
)
.append-bottom-10
=
submit_tag
'List available repositories'
,
class:
'btn btn-success'
=
link_to
'Cancel'
,
new_project_path
,
class:
'btn btn-cancel'
=
submit_tag
_
(
'List available repositories'
)
,
class:
'btn btn-success'
=
link_to
_
(
'Cancel'
)
,
new_project_path
,
class:
'btn btn-cancel'
app/views/import/manifest/status.html.haml
View file @
e02efff6
...
...
@@ -12,9 +12,6 @@
.table-responsive
%table
.table.import-jobs
%colgroup
.import-jobs-from-col
%colgroup
.import-jobs-to-col
%colgroup
.import-jobs-status-col
%thead
%tr
%th
=
_
(
'Repository URL'
)
...
...
app/views/projects/_import_project_pane.html.haml
View file @
e02efff6
...
...
@@ -9,41 +9,49 @@
.import_gitlab_project.has-tooltip
{
data:
{
container:
'body'
}
}
=
link_to
new_import_gitlab_project_path
,
class:
'btn btn_import_gitlab_project project-submit'
do
=
icon
(
'gitlab'
,
text:
'GitLab export'
)
%div
-
if
github_import_enabled?
-
if
github_import_enabled?
%div
=
link_to
new_import_github_path
,
class:
'btn js-import-github'
do
=
icon
(
'github'
,
text:
'GitHub'
)
%div
-
if
bitbucket_import_enabled?
-
if
bitbucket_import_enabled?
%div
=
link_to
status_import_bitbucket_path
,
class:
"btn import_bitbucket
#{
'how_to_import_link'
unless
bitbucket_import_configured?
}
"
do
=
icon
(
'bitbucket'
,
text:
'Bitbucket'
)
-
unless
bitbucket_import_configured?
=
render
'bitbucket_import_modal'
%div
-
if
gitlab_import_enabled?
-
if
gitlab_import_enabled?
%div
=
link_to
status_import_gitlab_path
,
class:
"btn import_gitlab
#{
'how_to_import_link'
unless
gitlab_import_configured?
}
"
do
=
icon
(
'gitlab'
,
text:
'GitLab.com'
)
-
unless
gitlab_import_configured?
=
render
'gitlab_import_modal'
%div
-
if
google_code_import_enabled?
-
if
google_code_import_enabled?
%div
=
link_to
new_import_google_code_path
,
class:
'btn import_google_code'
do
=
icon
(
'google'
,
text:
'Google Code'
)
%div
-
if
fogbugz_import_enabled?
-
if
fogbugz_import_enabled?
%div
=
link_to
new_import_fogbugz_path
,
class:
'btn import_fogbugz'
do
=
icon
(
'bug'
,
text:
'Fogbugz'
)
%div
-
if
gitea_import_enabled?
-
if
gitea_import_enabled?
%div
=
link_to
new_import_gitea_path
,
class:
'btn import_gitea'
do
=
custom_icon
(
'go_logo'
)
Gitea
%div
-
if
git_import_enabled?
-
if
git_import_enabled?
%div
%button
.btn.js-toggle-button.js-import-git-toggle-button
{
type:
"button"
,
data:
{
toggle_open_class:
'active'
}
}
=
icon
(
'git'
,
text:
'Repo by URL'
)
%div
-
if
manifest_import_enabled?
-
if
manifest_import_enabled?
%div
=
link_to
new_import_manifest_path
,
class:
'btn import_manifest'
do
=
icon
(
'file-text-o'
,
text:
'Manifest file'
)
...
...
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