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
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
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
25 additions
and
25 deletions
+25
-25
app/assets/javascripts/importer_status.js.coffee
app/assets/javascripts/importer_status.js.coffee
+10
-10
app/views/import/base/create.js.haml
app/views/import/base/create.js.haml
+1
-1
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/assets/javascripts/importer_status.js.coffee
View file @
3d438870
...
@@ -4,16 +4,16 @@ class @ImporterStatus
...
@@ -4,16 +4,16 @@ class @ImporterStatus
this
.
setAutoUpdate
()
this
.
setAutoUpdate
()
initStatusPage
:
->
initStatusPage
:
->
$
(
".js-add-to-import"
)
$
(
'.js-add-to-import'
)
.
off
'click'
.
off
'click'
.
on
'click'
,
(
event
)
=>
.
on
'click'
,
(
event
)
=>
new_namespace
=
null
new_namespace
=
null
$btn
=
$
(
event
.
currentTarget
)
$btn
=
$
(
event
.
currentTarget
)
$tr
=
$btn
.
closest
(
"tr"
)
$tr
=
$btn
.
closest
(
'tr'
)
id
=
$tr
.
attr
(
"id"
).
replace
(
"repo_"
,
""
)
id
=
$tr
.
attr
(
'id'
).
replace
(
'repo_'
,
''
)
if
$tr
.
find
(
".import-target input"
).
length
>
0
if
$tr
.
find
(
'.import-target input'
).
length
>
0
new_namespace
=
$tr
.
find
(
".import-target input"
).
prop
(
"value"
)
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
.
find
(
'.import-target'
).
empty
().
append
(
"
#{
new_namespace
}
/
#{
$tr
.
find
(
'.import-target'
).
data
(
'project_name'
)
}
"
)
$btn
$btn
.
disable
()
.
disable
()
...
@@ -21,15 +21,15 @@ class @ImporterStatus
...
@@ -21,15 +21,15 @@ class @ImporterStatus
$
.
post
@
import_url
,
{
repo_id
:
id
,
new_namespace
:
new_namespace
},
dataType
:
'script'
$
.
post
@
import_url
,
{
repo_id
:
id
,
new_namespace
:
new_namespace
},
dataType
:
'script'
$
(
".js-import-all"
)
$
(
'.js-import-all'
)
.
off
'click'
.
off
'click'
.
on
'click'
,
(
e
vent
)
=>
.
on
'click'
,
(
e
)
=>
$btn
=
$
(
e
vent
.
currentTarget
)
$btn
=
$
(
e
.
currentTarget
)
$btn
$btn
.
disable
()
.
disable
()
.
addClass
'is-loading'
.
addClass
'is-loading'
$
(
".js-add-to-import"
).
each
->
$
(
'.js-add-to-import'
).
each
->
$
(
this
).
click
()
$
(
this
).
click
()
setAutoUpdate
:
->
setAutoUpdate
:
->
...
...
app/views/import/base/create.js.haml
View file @
3d438870
...
@@ -26,4 +26,4 @@
...
@@ -26,4 +26,4 @@
-
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'></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 @@
...
@@ -12,11 +12,11 @@
-
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
Import all compatible projects
Import all compatible projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
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
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
%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
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
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 @
3d438870
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
%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
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
%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
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
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 @
3d438870
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
%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
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
%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
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
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 @
3d438870
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
%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
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
%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
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
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 @
3d438870
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
%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
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
%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
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
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 @
3d438870
...
@@ -16,11 +16,11 @@
...
@@ -16,11 +16,11 @@
-
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
Import all compatible projects
Import all compatible projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
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
Import all projects
Import all projects
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
icon
(
"spinner spin"
,
class:
"loading-icon"
)
.table-responsive
.table-responsive
%table
.table.import-jobs
%table
.table.import-jobs
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
%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
Import
Import
=
icon
(
'spinner spin'
,
class:
'loading-icon'
)
=
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