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
5b89d971
Commit
5b89d971
authored
Oct 10, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ee-specific import project spec
parent
50d2d7f9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
+11
-10
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+10
-9
spec/ee/spec/features/projects/new_project_spec.rb
spec/ee/spec/features/projects/new_project_spec.rb
+1
-0
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
5b89d971
...
...
@@ -658,7 +658,6 @@ a.deploy-project-label {
}
.import-buttons
{
padding-left
:
0
;
display
:
-
webkit-flex
;
display
:
flex
;
-webkit-flex-wrap
:
wrap
;
...
...
app/views/projects/new.html.haml
View file @
5b89d971
...
...
@@ -48,11 +48,12 @@
.tab-pane.import-project-pane
{
id:
'import-project-pane'
,
role:
'tabpanel'
}
=
form_for
@project
,
html:
{
class:
'new_project'
}
do
|
f
|
-
if
import_sources_enabled?
.project-import
.form-group.clearfix
=
f
.
label
:visibility_level
,
class:
'label-light'
do
#the label here seems wrong
Import project from
.col-sm-12.import-buttons
.project-import.row
.col-sm-12
.form-group.clearfix
=
f
.
label
:visibility_level
,
class:
'label-light'
do
#the label here seems wrong
Import project from
.import-buttons
%div
-
if
github_import_enabled?
=
link_to
new_import_github_path
,
class:
'btn import_github'
do
...
...
@@ -90,10 +91,10 @@
.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'
)
.col-lg-12
.js-toggle-content.hide
%hr
=
render
"shared/import_form"
,
f:
f
.col-lg-12
.js-toggle-content.hide
%hr
=
render
"shared/import_form"
,
f:
f
.save-project-loader.hide
.center
...
...
spec/ee/spec/features/projects/new_project_spec.rb
View file @
5b89d971
...
...
@@ -15,6 +15,7 @@ feature 'New project' do
it
'shows mirror repository checkbox enabled'
,
:js
do
visit
new_project_path
find
(
'#import-project-tab'
).
trigger
(
'click'
)
first
(
'.import_git'
).
click
expect
(
page
).
to
have_unchecked_field
(
'Mirror repository'
,
disabled:
false
)
...
...
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