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
5036d8d5
Commit
5036d8d5
authored
Nov 12, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix styling of import error.
parent
91fdbdcd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
app/assets/stylesheets/framework/tw_bootstrap.scss
app/assets/stylesheets/framework/tw_bootstrap.scss
+1
-1
app/views/projects/imports/new.html.haml
app/views/projects/imports/new.html.haml
+6
-5
No files found.
app/assets/stylesheets/framework/tw_bootstrap.scss
View file @
5036d8d5
...
@@ -172,7 +172,7 @@
...
@@ -172,7 +172,7 @@
}
}
.panel-body
{
.panel-body
{
form
{
form
,
pre
{
margin
:
0
;
margin
:
0
;
}
}
...
...
app/views/projects/imports/new.html.haml
View file @
5036d8d5
...
@@ -5,11 +5,12 @@
...
@@ -5,11 +5,12 @@
%hr
%hr
-
if
@project
.
import_failed?
-
if
@project
.
import_failed?
.alert.alert-danger
.panel.panel-danger
%p
The repository could not be imported.
.panel-heading
The repository could not be imported.
%pre
.prepend-top-10
.panel-body
:preserve
%pre
#{
@project
.
import_error
.
try
(
:strip
)
}
:preserve
#{
@project
.
import_error
.
try
(
:strip
)
}
=
form_for
@project
,
url:
namespace_project_import_path
(
@project
.
namespace
,
@project
),
method: :post
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
=
form_for
@project
,
url:
namespace_project_import_path
(
@project
.
namespace
,
@project
),
method: :post
,
html:
{
class:
'form-horizontal'
}
do
|
f
|
=
render
"shared/import_form"
,
f:
f
=
render
"shared/import_form"
,
f:
f
...
...
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