BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
3d438870
Commit
3d438870
authored
Apr 14, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated based on feedback
parent
a650af12
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
25 deletions
+25
-25
importer_status.js.coffee
app/assets/javascripts/importer_status.js.coffee
+10
-10
create.js.haml
app/views/import/base/create.js.haml
+1
-1
status.html.haml
app/views/import/bitbucket/status.html.haml
+3
-3
status.html.haml
app/views/import/fogbugz/status.html.haml
+2
-2
status.html.haml
app/views/import/github/status.html.haml
+2
-2
status.html.haml
app/views/import/gitlab/status.html.haml
+2
-2
status.html.haml
app/views/import/gitorious/status.html.haml
+2
-2
status.html.haml
app/views/import/google_code/status.html.haml
+3
-3
No files found.
app/assets/javascripts/importer_status.js.coffee
View file @
3d438870
...
...
@@ -4,16 +4,16 @@ class @ImporterStatus
this
.
setAutoUpdate
()
initStatusPage
:
->
$
(
".js-add-to-import"
)
$
(
'.js-add-to-import'
)
.
off
'click'
.
on
'click'
,
(
event
)
=>
new_namespace
=
null
$btn
=
$
(
event
.
currentTarget
)
$tr
=
$btn
.
closest
(
"tr"
)
id
=
$tr
.
attr
(
"id"
).
replace
(
"repo_"
,
""
)
if
$tr
.
find
(
".import-target input"
).
length
>
0
new_namespace
=
$tr
.
find
(
".import-target input"
).
prop
(
"value"
)
$tr
.
find
(
".import-target"
).
empty
().
append
(
new_namespace
+
"/"
+
$tr
.
find
(
".import-target"
).
data
(
"project_name"
)
)
$tr
=
$btn
.
closest
(
'tr'
)
id
=
$tr
.
attr
(
'id'
).
replace
(
'repo_'
,
''
)
if
$tr
.
find
(
'.import-target input'
).
length
>
0
new_namespace
=
$tr
.
find
(
'.import-target input'
).
prop
(
'value'
)
$tr
.
find
(
'.import-target'
).
empty
().
append
(
"
#{
new_namespace
}
/
#{
$tr
.
find
(
'.import-target'
).
data
(
'project_name'
)
}
"
)
$btn
.
disable
()
...
...
@@ -21,15 +21,15 @@ class @ImporterStatus
$
.
post
@
import_url
,
{
repo_id
:
id
,
new_namespace
:
new_namespace
},
dataType
:
'script'
$
(
".js-import-all"
)
$
(
'.js-import-all'
)
.
off
'click'
.
on
'click'
,
(
e
vent
)
=>
$btn
=
$
(
e
vent
.
currentTarget
)
.
on
'click'
,
(
e
)
=>
$btn
=
$
(
e
.
currentTarget
)
$btn
.
disable
()
.
addClass
'is-loading'
$
(
".js-add-to-import"
).
each
->
$
(
'.js-add-to-import'
).
each
->
$
(
this
).
click
()
setAutoUpdate
:
->
...
...
app/views/import/base/create.js.haml
View file @
3d438870
...
...
@@ -26,4 +26,4 @@
-
else
:plain
job = $("tr#repo_
#{
@repo_id
}
")
job.find(".import-actions").html("<i class='fa fa-exclamation-circle'></i> 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
(
','
))
}
")
app/views/import/bitbucket/status.html.haml
View file @
3d438870
...
...
@@ -12,11 +12,11 @@
-
if
@incompatible_repos
.
any?
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
Import all compatible projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
-
else
=
button_tag
class:
"btn btn-success js-import-all"
do
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
%table
.table.import-jobs
...
...
@@ -55,7 +55,7 @@
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
-
@incompatible_repos
.
each
do
|
repo
|
%tr
{
id:
"repo_#{repo["
owner
"]}___#{repo["
slug
"]}"
}
%td
...
...
app/views/import/fogbugz/status.html.haml
View file @
3d438870
...
...
@@ -15,7 +15,7 @@
%p
=
button_tag
class:
'btn btn-import btn-success js-import-all'
do
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
%table
.table.import-jobs
...
...
@@ -54,7 +54,7 @@
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
:javascript
new
ImporterStatus
(
"
#{
jobs_import_fogbugz_path
}
"
,
"
#{
import_fogbugz_path
}
"
);
app/views/import/github/status.html.haml
View file @
3d438870
...
...
@@ -10,7 +10,7 @@
%p
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
%table
.table.import-jobs
...
...
@@ -49,7 +49,7 @@
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
:javascript
new
ImporterStatus
(
"
#{
jobs_import_github_path
}
"
,
"
#{
import_github_path
}
"
);
app/views/import/gitlab/status.html.haml
View file @
3d438870
...
...
@@ -10,7 +10,7 @@
%p
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
%table
.table.import-jobs
...
...
@@ -49,7 +49,7 @@
%td
.import-actions.job-status
=
button_tag
class:
"btn js-add-to-import"
do
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
:javascript
new
ImporterStatus
(
"
#{
jobs_import_gitlab_path
}
"
,
"
#{
import_gitlab_path
}
"
);
app/views/import/gitorious/status.html.haml
View file @
3d438870
...
...
@@ -10,7 +10,7 @@
%p
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
%table
.table.import-jobs
...
...
@@ -49,7 +49,7 @@
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
:javascript
new
ImporterStatus
(
"
#{
jobs_import_gitorious_path
}
"
,
"
#{
import_gitorious_path
}
"
);
app/views/import/google_code/status.html.haml
View file @
3d438870
...
...
@@ -16,11 +16,11 @@
-
if
@incompatible_repos
.
any?
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
Import all compatible projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
-
else
=
button_tag
class:
"btn btn-import btn-success js-import-all"
do
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
%table
.table.import-jobs
...
...
@@ -59,7 +59,7 @@
%td
.import-actions.job-status
=
button_tag
class:
"btn btn-import js-add-to-import"
do
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
-
@incompatible_repos
.
each
do
|
repo
|
%tr
{
id:
"repo_#{repo.id}"
}
%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