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
Jérome Perrin
gitlab-ce
Commits
62cd17bb
Commit
62cd17bb
authored
Sep 20, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes CSS issues and namespace path issue. Also tested in different browsers.
parent
13e81898
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+10
-0
app/views/import/github/status.html.haml
app/views/import/github/status.html.haml
+6
-6
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
62cd17bb
...
@@ -769,4 +769,14 @@ pre.light-well {
...
@@ -769,4 +769,14 @@ pre.light-well {
display
:
block
;
display
:
block
;
}
}
}
}
}
.project-path
{
#path
.form-control
{
min-width
:
100px
;
}
.select2-choice
{
border-top-right-radius
:
0
;
border-bottom-right-radius
:
0
;
}
}
}
\ No newline at end of file
app/views/import/github/status.html.haml
View file @
62cd17bb
...
@@ -46,16 +46,16 @@
...
@@ -46,16 +46,16 @@
=
github_project_link
(
repo
.
full_name
)
=
github_project_link
(
repo
.
full_name
)
%td
.import-target
%td
.import-target
%fieldset
.row
%fieldset
.row
.input-group
.col-sm-8
.input-group
.project-path.input-group-btn
.project-path.input-group-btn
-
if
false
-
if
current_user
.
can_select_namespace?
-
selected
=
params
[
:namespace_id
]
||
:current_user
-
selected
=
params
[
:namespace_id
]
||
:current_user
-
opts
=
current_user
.
can_create_group?
?
{
extra_group:
Group
.
new
(
name:
repo
.
owner
.
login
)
}
:
{
display_path:
true
}
-
opts
=
current_user
.
can_create_group?
?
{
extra_group:
Group
.
new
(
name:
repo
.
owner
.
login
,
path:
repo
.
owner
.
login
)
}:
{
}
=
select_tag
:namespace_id
,
namespaces_options
(
selected
,
opts
),
{
class:
'select2 js-select-namespace'
,
tabindex:
1
}
=
select_tag
:namespace_id
,
namespaces_options
(
selected
,
opts
.
merge
({
display_path:
true
})
),
{
class:
'select2 js-select-namespace'
,
tabindex:
1
}
-
else
-
else
=
text_field_tag
:path
,
current_user
.
namespace_path
,
class:
"
form-control"
,
tabindex:
1
,
autofocus:
true
,
disabled:
true
=
text_field_tag
:path
,
current_user
.
namespace_path
,
class:
"
input-large form-control"
,
tabindex:
1
,
disabled:
true
%span
.input-group-addon
/
%span
.input-group-addon
/
=
text_field_tag
:path
,
repo
.
name
,
class:
"form-control"
,
tabindex:
2
,
autofocus:
true
,
required:
true
=
text_field_tag
:path
,
repo
.
name
,
class:
"
input-mini
form-control"
,
tabindex:
2
,
autofocus:
true
,
required:
true
%td
.import-actions.job-status
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
Import
...
...
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