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
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
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
13 deletions
+10
-13
action_btn.vue
app/assets/javascripts/deploy_keys/components/action_btn.vue
+2
-1
app.vue
app/assets/javascripts/deploy_keys/components/app.vue
+5
-5
key.vue
app/assets/javascripts/deploy_keys/components/key.vue
+2
-2
keys_panel.vue
app/assets/javascripts/deploy_keys/components/keys_panel.vue
+0
-0
index.js
app/assets/javascripts/deploy_keys/store/index.js
+0
-4
deploy-keys-load-async.yml
changelogs/unreleased/deploy-keys-load-async.yml
+1
-1
No files found.
app/assets/javascripts/deploy_keys/components/action_btn.vue
View file @
0b7824d4
...
...
@@ -47,7 +47,8 @@
<i
v-if=
"isLoading"
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
>
aria-hidden=
"true"
aria-label=
"Loading"
>
</i>
</button>
</
template
>
app/assets/javascripts/deploy_keys/components/app.vue
View file @
0b7824d4
...
...
@@ -3,15 +3,13 @@
import
eventHub
from
'../eventhub'
;
import
DeployKeysService
from
'../service'
;
import
DeployKeysStore
from
'../store'
;
import
keysPanel
from
'./keys.vue'
;
import
keysPanel
from
'./keys
_panel
.vue'
;
export
default
{
data
()
{
const
store
=
new
DeployKeysStore
();
return
{
isLoading
:
false
,
store
,
store
:
new
DeployKeysStore
()
,
};
},
props
:
{
...
...
@@ -84,7 +82,9 @@
class=
"text-center"
v-if=
"isLoading && !hasKeys"
>
<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>
</div>
<div
v-else-if=
"hasKeys"
>
...
...
app/assets/javascripts/deploy_keys/components/key.vue
View file @
0b7824d4
...
...
@@ -56,9 +56,9 @@
</div>
<div
class=
"deploy-key-content prepend-left-default deploy-key-projects"
>
<a
v-for=
"project in deployKey.projects"
class=
"label deploy-project-label"
:href=
"project.full_path"
v-for=
"project in deployKey.projects"
>
:href=
"project.full_path"
>
{{
project
.
full_name
}}
</a>
</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 {
findEnabledKey
(
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
:
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