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
Boxiang Sun
gitlab-ce
Commits
c89a9ab3
Commit
c89a9ab3
authored
May 29, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix import project by url layout
parent
c189246d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
63 additions
and
65 deletions
+63
-65
app/views/projects/_import_project_pane.html.haml
app/views/projects/_import_project_pane.html.haml
+46
-48
app/views/projects/_new_project_fields.html.haml
app/views/projects/_new_project_fields.html.haml
+4
-5
app/views/shared/_import_form.html.haml
app/views/shared/_import_form.html.haml
+12
-11
app/views/shared/_visibility_level.html.haml
app/views/shared/_visibility_level.html.haml
+1
-1
No files found.
app/views/projects/_import_project_pane.html.haml
View file @
c89a9ab3
-
active_tab
=
local_assigns
.
fetch
(
:active_tab
,
'blank'
)
-
active_tab
=
local_assigns
.
fetch
(
:active_tab
,
'blank'
)
-
f
=
local_assigns
.
fetch
(
:f
)
-
f
=
local_assigns
.
fetch
(
:f
)
.project-import.row
.project-import
.col-lg-12
.form-group.import-btn-container.clearfix
.form-group.import-btn-container.clearfix
=
f
.
label
:visibility_level
,
class:
'label-light'
do
#the label here seems wrong
=
f
.
label
:visibility_level
,
class:
'label-light'
do
#the label here seems wrong
Import project from
Import project from
...
@@ -44,7 +43,6 @@
...
@@ -44,7 +43,6 @@
-
if
git_import_enabled?
-
if
git_import_enabled?
%button
.btn.js-toggle-button.js-import-git-toggle-button
{
type:
"button"
,
data:
{
toggle_open_class:
'active'
}
}
%button
.btn.js-toggle-button.js-import-git-toggle-button
{
type:
"button"
,
data:
{
toggle_open_class:
'active'
}
}
=
icon
(
'git'
,
text:
'Repo by URL'
)
=
icon
(
'git'
,
text:
'Repo by URL'
)
.col-lg-12
.js-toggle-content.toggle-import-form
{
class:
(
'hide'
if
active_tab
!=
'import'
)
}
.js-toggle-content.toggle-import-form
{
class:
(
'hide'
if
active_tab
!=
'import'
)
}
%hr
%hr
=
render
"shared/import_form"
,
f:
f
=
render
"shared/import_form"
,
f:
f
...
...
app/views/projects/_new_project_fields.html.haml
View file @
c89a9ab3
...
@@ -35,11 +35,10 @@
...
@@ -35,11 +35,10 @@
%span
(optional)
%span
(optional)
=
f
.
text_area
:description
,
placeholder:
'Description format'
,
class:
"form-control"
,
rows:
3
,
maxlength:
250
=
f
.
text_area
:description
,
placeholder:
'Description format'
,
class:
"form-control"
,
rows:
3
,
maxlength:
250
.form-group.visibility-level-setting
=
f
.
label
:visibility_level
,
class:
'label-light'
do
=
f
.
label
:visibility_level
,
class:
'label-light'
do
Visibility Level
Visibility Level
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"public_access/public_access"
),
aria:
{
label:
'Documentation for Visibility Level'
},
target:
'_blank'
,
rel:
'noopener noreferrer'
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"public_access/public_access"
),
aria:
{
label:
'Documentation for Visibility Level'
},
target:
'_blank'
,
rel:
'noopener noreferrer'
=
render
'shared/visibility_level'
,
f:
f
,
visibility_level:
visibility_level
.
to_i
,
can_change_visibility_level:
true
,
form_model:
@project
,
with_label:
false
=
render
'shared/visibility_level'
,
f:
f
,
visibility_level:
visibility_level
.
to_i
,
can_change_visibility_level:
true
,
form_model:
@project
,
with_label:
false
=
f
.
submit
'Create project'
,
class:
"btn btn-create project-submit"
,
tabindex:
4
=
f
.
submit
'Create project'
,
class:
"btn btn-create project-submit"
,
tabindex:
4
=
link_to
'Cancel'
,
dashboard_projects_path
,
class:
'btn btn-cancel'
=
link_to
'Cancel'
,
dashboard_projects_path
,
class:
'btn btn-cancel'
app/views/shared/_import_form.html.haml
View file @
c89a9ab3
-
ci_cd_only
=
local_assigns
.
fetch
(
:ci_cd_only
,
false
)
-
ci_cd_only
=
local_assigns
.
fetch
(
:ci_cd_only
,
false
)
.form-group.
row.
import-url-data
.form-group.import-url-data
=
f
.
label
:import_url
,
class:
'label-light'
do
=
f
.
label
:import_url
,
class:
'label-light'
do
%span
%span
=
_
(
'Git repository URL'
)
=
_
(
'Git repository URL'
)
=
f
.
text_field
:import_url
,
autocomplete:
'off'
,
class:
'form-control'
,
placeholder:
'https://username:password@gitlab.company.com/group/project.git'
,
required:
true
=
f
.
text_field
:import_url
,
autocomplete:
'off'
,
class:
'form-control'
,
placeholder:
'https://username:password@gitlab.company.com/group/project.git'
,
required:
true
.card.prepend-top-20
.info-well.prepend-top-20
.well-segment
%ul
%ul
%li
%li
=
_
(
'The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>.'
).
html_safe
=
_
(
'The repository must be accessible over <code>http://</code>, <code>https://</code> or <code>git://</code>.'
).
html_safe
...
...
app/views/shared/_visibility_level.html.haml
View file @
c89a9ab3
-
with_label
=
local_assigns
.
fetch
(
:with_label
,
true
)
-
with_label
=
local_assigns
.
fetch
(
:with_label
,
true
)
.form-group.
row.
visibility-level-setting
.form-group.visibility-level-setting
-
if
with_label
-
if
with_label
=
f
.
label
:visibility_level
,
class:
'col-form-label col-sm-2'
do
=
f
.
label
:visibility_level
,
class:
'col-form-label col-sm-2'
do
Visibility Level
Visibility Level
...
...
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