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
ae5003a3
Commit
ae5003a3
authored
Aug 07, 2017
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix html structure
Removes test for removed behavior
parent
036ee515
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
14 deletions
+2
-14
app/views/import/gitlab_projects/new.html.haml
app/views/import/gitlab_projects/new.html.haml
+2
-3
spec/features/projects/import_export/import_file_spec.rb
spec/features/projects/import_export/import_file_spec.rb
+0
-11
No files found.
app/views/import/gitlab_projects/new.html.haml
View file @
ae5003a3
...
@@ -8,11 +8,10 @@
...
@@ -8,11 +8,10 @@
Import an exported GitLab project
Import an exported GitLab project
%hr
%hr
=
form_tag
import_gitlab_project_path
,
html:
{
class:
'new_project'
}
,
multipart:
true
do
=
form_tag
import_gitlab_project_path
,
class:
'new_project'
,
multipart:
true
do
.row
.row
.form-group.col-xs-12.col-sm-6
.form-group.col-xs-12.col-sm-6
.span
=
label_tag
:namespace_id
,
'Project path'
,
class:
'label-light'
=
label_tag
:namespace_id
,
'Project path'
,
class:
'label-light'
.form-group
.form-group
.input-group
.input-group
-
if
current_user
.
can_select_namespace?
-
if
current_user
.
can_select_namespace?
...
...
spec/features/projects/import_export/import_file_spec.rb
View file @
ae5003a3
...
@@ -61,17 +61,6 @@ feature 'Import/Export - project import integration test', js: true do
...
@@ -61,17 +61,6 @@ feature 'Import/Export - project import integration test', js: true do
expect
(
page
).
to
have_content
(
'Project could not be imported'
)
expect
(
page
).
to
have_content
(
'Project could not be imported'
)
end
end
end
end
scenario
'project with no name'
do
create
(
:project
,
namespace:
namespace
)
visit
new_project_path
select2
(
namespace
.
id
,
from:
'#project_namespace_id'
)
# Check for tooltip disabled import button
expect
(
find
(
'.import_gitlab_project'
)[
'title'
]).
to
eq
(
'Please enter a valid project name.'
)
end
end
end
context
'when limited to the default user namespace'
do
context
'when limited to the default user namespace'
do
...
...
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