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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
a650af12
Commit
a650af12
authored
Apr 12, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved loading icon to match todo loading icon
parent
3cfbd2b1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
16 deletions
+16
-16
app/views/import/base/create.js.haml
app/views/import/base/create.js.haml
+2
-2
app/views/import/bitbucket/status.html.haml
app/views/import/bitbucket/status.html.haml
+3
-3
app/views/import/fogbugz/status.html.haml
app/views/import/fogbugz/status.html.haml
+2
-2
app/views/import/github/status.html.haml
app/views/import/github/status.html.haml
+2
-2
app/views/import/gitlab/status.html.haml
app/views/import/gitlab/status.html.haml
+2
-2
app/views/import/gitorious/status.html.haml
app/views/import/gitorious/status.html.haml
+2
-2
app/views/import/google_code/status.html.haml
app/views/import/google_code/status.html.haml
+3
-3
No files found.
app/views/import/base/create.js.haml
View file @
a650af12
...
@@ -20,10 +20,10 @@
...
@@ -20,10 +20,10 @@
job.attr("id", "project_
#{
@project
.
id
}
")
job.attr("id", "project_
#{
@project
.
id
}
")
target_field = job.find(".import-target")
target_field = job.find(".import-target")
target_field.empty()
target_field.empty()
target_field.append('
<strong>
#{
link_to
@project
.
path_with_namespace
,
namespace_project_path
(
@project
.
namespace
,
@project
)
}
</strong>
')
target_field.append('
#{
link_to
@project
.
path_with_namespace
,
namespace_project_path
(
@project
.
namespace
,
@project
)
}
')
$("table.import-jobs tbody").prepend(job)
$("table.import-jobs tbody").prepend(job)
job.addClass("active").find(".import-actions").html("<i class='fa fa-spinner fa-spin'></i> started")
job.addClass("active").find(".import-actions").html("<i class='fa fa-spinner fa-spin'></i> started")
-
else
-
else
:plain
:plain
job = $("tr#repo_
#{
@repo_id
}
")
job = $("tr#repo_
#{
@repo_id
}
")
job.find(".import-actions").html("<i class='fa fa-exclamation-circle'> Error saving project:
#{
escape_javascript
(
@project
.
errors
.
full_messages
.
join
(
','
))
}
</i>")
job.find(".import-actions").html("<i class='fa fa-exclamation-circle'>
</i>
Error saving project:
#{
escape_javascript
(
@project
.
errors
.
full_messages
.
join
(
','
))
}
</i>")
app/views/import/bitbucket/status.html.haml
View file @
a650af12
...
@@ -11,12 +11,12 @@
...
@@ -11,12 +11,12 @@
%p
%p
-
if
@incompatible_repos
.
any?
-
if
@incompatible_repos
.
any?
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import all compatible projects
Import all compatible projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
-
else
-
else
=
button_tag
class:
"btn btn-success js-import-all"
do
=
button_tag
class:
"btn btn-success js-import-all"
do
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -54,8 +54,8 @@
...
@@ -54,8 +54,8 @@
=
"
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
=
"
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
%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
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
-
@incompatible_repos
.
each
do
|
repo
|
-
@incompatible_repos
.
each
do
|
repo
|
%tr
{
id:
"repo_#{repo["
owner
"]}___#{repo["
slug
"]}"
}
%tr
{
id:
"repo_#{repo["
owner
"]}___#{repo["
slug
"]}"
}
%td
%td
...
...
app/views/import/fogbugz/status.html.haml
View file @
a650af12
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
%hr
%hr
%p
%p
=
button_tag
class:
'btn btn-import btn-success js-import-all'
do
=
button_tag
class:
'btn btn-import btn-success js-import-all'
do
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -53,8 +53,8 @@
...
@@ -53,8 +53,8 @@
=
"
#{
current_user
.
username
}
/
#{
repo
.
name
}
"
=
"
#{
current_user
.
username
}
/
#{
repo
.
name
}
"
%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
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
:javascript
:javascript
new
ImporterStatus
(
"
#{
jobs_import_fogbugz_path
}
"
,
"
#{
import_fogbugz_path
}
"
);
new
ImporterStatus
(
"
#{
jobs_import_fogbugz_path
}
"
,
"
#{
import_fogbugz_path
}
"
);
app/views/import/github/status.html.haml
View file @
a650af12
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
%hr
%hr
%p
%p
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -48,8 +48,8 @@
...
@@ -48,8 +48,8 @@
=
repo
.
full_name
=
repo
.
full_name
%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
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
:javascript
:javascript
new
ImporterStatus
(
"
#{
jobs_import_github_path
}
"
,
"
#{
import_github_path
}
"
);
new
ImporterStatus
(
"
#{
jobs_import_github_path
}
"
,
"
#{
import_github_path
}
"
);
app/views/import/gitlab/status.html.haml
View file @
a650af12
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
%hr
%hr
%p
%p
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -48,8 +48,8 @@
...
@@ -48,8 +48,8 @@
=
repo
[
"path_with_namespace"
]
=
repo
[
"path_with_namespace"
]
%td
.import-actions.job-status
%td
.import-actions.job-status
=
button_tag
class:
"btn js-add-to-import"
do
=
button_tag
class:
"btn js-add-to-import"
do
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
:javascript
:javascript
new
ImporterStatus
(
"
#{
jobs_import_gitlab_path
}
"
,
"
#{
import_gitlab_path
}
"
);
new
ImporterStatus
(
"
#{
jobs_import_gitlab_path
}
"
,
"
#{
import_gitlab_path
}
"
);
app/views/import/gitorious/status.html.haml
View file @
a650af12
...
@@ -9,8 +9,8 @@
...
@@ -9,8 +9,8 @@
%hr
%hr
%p
%p
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -48,8 +48,8 @@
...
@@ -48,8 +48,8 @@
=
repo
.
full_name
=
repo
.
full_name
%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
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
:javascript
:javascript
new
ImporterStatus
(
"
#{
jobs_import_gitorious_path
}
"
,
"
#{
import_gitorious_path
}
"
);
new
ImporterStatus
(
"
#{
jobs_import_gitorious_path
}
"
,
"
#{
import_gitorious_path
}
"
);
app/views/import/google_code/status.html.haml
View file @
a650af12
...
@@ -15,12 +15,12 @@
...
@@ -15,12 +15,12 @@
%p
%p
-
if
@incompatible_repos
.
any?
-
if
@incompatible_repos
.
any?
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import all compatible projects
Import all compatible projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
-
else
-
else
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -58,8 +58,8 @@
...
@@ -58,8 +58,8 @@
=
"
#{
current_user
.
username
}
/
#{
repo
.
name
}
"
=
"
#{
current_user
.
username
}
/
#{
repo
.
name
}
"
%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
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
-
@incompatible_repos
.
each
do
|
repo
|
-
@incompatible_repos
.
each
do
|
repo
|
%tr
{
id:
"repo_#{repo.id}"
}
%tr
{
id:
"repo_#{repo.id}"
}
%td
%td
...
...
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