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
Boxiang Sun
gitlab-ce
Commits
0b7824d4
Commit
0b7824d4
authored
Apr 28, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated some Vue specific JS
parent
fde9732a
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
12 deletions
+13
-12
app/assets/javascripts/deploy_keys/components/action_btn.vue
app/assets/javascripts/deploy_keys/components/action_btn.vue
+2
-1
app/assets/javascripts/deploy_keys/components/app.vue
app/assets/javascripts/deploy_keys/components/app.vue
+5
-5
app/assets/javascripts/deploy_keys/components/key.vue
app/assets/javascripts/deploy_keys/components/key.vue
+2
-2
app/assets/javascripts/deploy_keys/components/keys_panel.vue
app/assets/javascripts/deploy_keys/components/keys_panel.vue
+0
-0
app/assets/javascripts/deploy_keys/store/index.js
app/assets/javascripts/deploy_keys/store/index.js
+0
-4
changelogs/unreleased/deploy-keys-load-async.yml
changelogs/unreleased/deploy-keys-load-async.yml
+4
-0
No files found.
app/assets/javascripts/deploy_keys/components/action_btn.vue
View file @
0b7824d4
...
@@ -47,7 +47,8 @@
...
@@ -47,7 +47,8 @@
<i
<i
v-if=
"isLoading"
v-if=
"isLoading"
class=
"fa fa-spinner fa-spin"
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
>
aria-hidden=
"true"
aria-label=
"Loading"
>
</i>
</i>
</button>
</button>
</
template
>
</
template
>
app/assets/javascripts/deploy_keys/components/app.vue
View file @
0b7824d4
...
@@ -3,15 +3,13 @@
...
@@ -3,15 +3,13 @@
import
eventHub
from
'
../eventhub
'
;
import
eventHub
from
'
../eventhub
'
;
import
DeployKeysService
from
'
../service
'
;
import
DeployKeysService
from
'
../service
'
;
import
DeployKeysStore
from
'
../store
'
;
import
DeployKeysStore
from
'
../store
'
;
import
keysPanel
from
'
./keys.vue
'
;
import
keysPanel
from
'
./keys
_panel
.vue
'
;
export
default
{
export
default
{
data
()
{
data
()
{
const
store
=
new
DeployKeysStore
();
return
{
return
{
isLoading
:
false
,
isLoading
:
false
,
store
,
store
:
new
DeployKeysStore
()
,
};
};
},
},
props
:
{
props
:
{
...
@@ -84,7 +82,9 @@
...
@@ -84,7 +82,9 @@
class=
"text-center"
class=
"text-center"
v-if=
"isLoading && !hasKeys"
>
v-if=
"isLoading && !hasKeys"
>
<i
<i
class=
"fa fa-spinner fa-spin fa-2x"
>
class=
"fa fa-spinner fa-spin fa-2x"
aria-hidden=
"true"
aria-label=
"Loading deploy keys"
>
</i>
</i>
</div>
</div>
<div
v-else-if=
"hasKeys"
>
<div
v-else-if=
"hasKeys"
>
...
...
app/assets/javascripts/deploy_keys/components/key.vue
View file @
0b7824d4
...
@@ -56,9 +56,9 @@
...
@@ -56,9 +56,9 @@
</div>
</div>
<div
class=
"deploy-key-content prepend-left-default deploy-key-projects"
>
<div
class=
"deploy-key-content prepend-left-default deploy-key-projects"
>
<a
<a
v-for=
"project in deployKey.projects"
class=
"label deploy-project-label"
class=
"label deploy-project-label"
:href=
"project.full_path"
:href=
"project.full_path"
>
v-for=
"project in deployKey.projects"
>
{{
project
.
full_name
}}
{{
project
.
full_name
}}
</a>
</a>
</div>
</div>
...
...
app/assets/javascripts/deploy_keys/components/keys.vue
→
app/assets/javascripts/deploy_keys/components/keys
_panel
.vue
View file @
0b7824d4
File moved
app/assets/javascripts/deploy_keys/store/index.js
View file @
0b7824d4
...
@@ -6,8 +6,4 @@ export default class DeployKeysStore {
...
@@ -6,8 +6,4 @@ export default class DeployKeysStore {
findEnabledKey
(
id
)
{
findEnabledKey
(
id
)
{
return
this
.
keys
.
enabled_keys
.
find
(
key
=>
key
.
id
===
id
);
return
this
.
keys
.
enabled_keys
.
find
(
key
=>
key
.
id
===
id
);
}
}
removeKeyForType
(
deployKey
,
type
)
{
this
.
keys
[
type
]
=
this
.
keys
[
type
].
filter
(
key
=>
key
.
id
!==
deployKey
.
id
);
}
}
}
changelogs/unreleased/
29667-deploy-keys
.yml
→
changelogs/unreleased/
deploy-keys-load-async
.yml
View file @
0b7824d4
---
---
title
:
Project deploy keys json end point
title
:
Deploy keys load are loaded async
merge_request
:
merge_request
:
author
:
author
:
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