Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
projects.thm.de
GitLab
Commits
7c7f5266
Unverified
Commit
7c7f5266
authored
Jan 05, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci skip] Fix more rules
parent
1525b005
Changes
34
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
1035 additions
and
920 deletions
+1035
-920
app/assets/javascripts/boards/components/board_card.vue
app/assets/javascripts/boards/components/board_card.vue
+2
-1
app/assets/javascripts/clusters/components/applications.vue
app/assets/javascripts/clusters/components/applications.vue
+6
-6
app/assets/javascripts/cycle_analytics/components/stage_code_component.vue
...ripts/cycle_analytics/components/stage_code_component.vue
+1
-1
app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
...ripts/cycle_analytics/components/stage_plan_component.vue
+1
-1
app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
...pts/cycle_analytics/components/stage_review_component.vue
+2
-3
app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
...ts/cycle_analytics/components/stage_staging_component.vue
+3
-3
app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
...ripts/cycle_analytics/components/stage_test_component.vue
+51
-15
app/assets/javascripts/cycle_analytics/components/total_time_component.vue
...ripts/cycle_analytics/components/total_time_component.vue
+24
-4
app/assets/javascripts/deploy_keys/components/action_btn.vue
app/assets/javascripts/deploy_keys/components/action_btn.vue
+11
-13
app/assets/javascripts/deploy_keys/components/app.vue
app/assets/javascripts/deploy_keys/components/app.vue
+23
-23
app/assets/javascripts/deploy_keys/components/key.vue
app/assets/javascripts/deploy_keys/components/key.vue
+5
-4
app/assets/javascripts/deploy_keys/components/keys_panel.vue
app/assets/javascripts/deploy_keys/components/keys_panel.vue
+7
-5
app/assets/javascripts/environments/components/container.vue
app/assets/javascripts/environments/components/container.vue
+9
-10
app/assets/javascripts/environments/components/empty_state.vue
...ssets/javascripts/environments/components/empty_state.vue
+7
-6
app/assets/javascripts/environments/components/environment_actions.vue
...vascripts/environments/components/environment_actions.vue
+49
-45
app/assets/javascripts/environments/components/environment_external_url.vue
...ipts/environments/components/environment_external_url.vue
+24
-22
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+454
-436
app/assets/javascripts/issue_show/components/description.vue
app/assets/javascripts/issue_show/components/description.vue
+7
-7
app/assets/javascripts/issue_show/components/edited.vue
app/assets/javascripts/issue_show/components/edited.vue
+26
-26
app/assets/javascripts/issue_show/components/fields/description.vue
.../javascripts/issue_show/components/fields/description.vue
+3
-3
app/assets/javascripts/issue_show/components/form.vue
app/assets/javascripts/issue_show/components/form.vue
+15
-11
app/assets/javascripts/issue_show/components/title.vue
app/assets/javascripts/issue_show/components/title.vue
+14
-14
app/assets/javascripts/jobs/components/header.vue
app/assets/javascripts/jobs/components/header.vue
+12
-12
app/assets/javascripts/jobs/components/sidebar_detail_row.vue
...assets/javascripts/jobs/components/sidebar_detail_row.vue
+4
-3
app/assets/javascripts/jobs/components/sidebar_details_block.vue
...ets/javascripts/jobs/components/sidebar_details_block.vue
+32
-28
app/assets/javascripts/monitoring/components/dashboard.vue
app/assets/javascripts/monitoring/components/dashboard.vue
+32
-30
app/assets/javascripts/monitoring/components/empty_state.vue
app/assets/javascripts/monitoring/components/empty_state.vue
+12
-6
app/assets/javascripts/monitoring/components/graph.vue
app/assets/javascripts/monitoring/components/graph.vue
+75
-73
app/assets/javascripts/monitoring/components/graph/deployment.vue
...ts/javascripts/monitoring/components/graph/deployment.vue
+39
-35
app/assets/javascripts/monitoring/components/graph/flag.vue
app/assets/javascripts/monitoring/components/graph/flag.vue
+13
-10
app/assets/javascripts/monitoring/components/graph/legend.vue
...assets/javascripts/monitoring/components/graph/legend.vue
+41
-36
app/assets/javascripts/monitoring/components/graph/path.vue
app/assets/javascripts/monitoring/components/graph/path.vue
+5
-4
app/assets/javascripts/monitoring/components/graph_group.vue
app/assets/javascripts/monitoring/components/graph_group.vue
+8
-8
app/assets/javascripts/notes/components/note_actions.vue
app/assets/javascripts/notes/components/note_actions.vue
+18
-16
No files found.
app/assets/javascripts/boards/components/board_card.vue
View file @
7c7f5266
...
...
@@ -89,6 +89,7 @@ export default {
:issue=
"issue"
:issue-link-base=
"issueLinkBase"
:root-path=
"rootPath"
:update-filters=
"true"
/>
:update-filters=
"true"
/>
</li>
</
template
>
app/assets/javascripts/clusters/components/applications.vue
View file @
7c7f5266
...
...
@@ -77,12 +77,12 @@ which incur additional costs. See %{pricingLink}`)),
return
sprintf
(
_
.
escape
(
s__
(
`ClusterIntegration|Prometheus is an open-source monitoring system
with %{gitlabIntegrationLink} to monitor deployed applications.`
)),
{
gitlabIntegrationLink
:
`<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html"
target="_blank" rel="noopener noreferrer">
${
_
.
escape
(
s__
(
'
ClusterIntegration|Gitlab Integration
'
))}
</a>`
,
},
{
gitlabIntegrationLink
:
`<a href="https://docs.gitlab.com/ce/user/project/integrations/prometheus.html"
target="_blank" rel="noopener noreferrer">
${
_
.
escape
(
s__
(
'
ClusterIntegration|Gitlab Integration
'
))}
</a>`
,
},
false
,
);
},
...
...
app/assets/javascripts/cycle_analytics/components/stage_code_component.vue
View file @
7c7f5266
...
...
@@ -12,7 +12,7 @@
props
:
{
items
:
{
type
:
Array
,
default
:
[]
default
:
()
=>
[],
},
stage
:
{
type
:
Object
,
...
...
app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
View file @
7c7f5266
...
...
@@ -13,7 +13,7 @@
props
:
{
items
:
{
type
:
Array
,
default
:
[]
default
:
()
=>
[],
},
stage
:
{
type
:
Object
,
...
...
app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
View file @
7c7f5266
...
...
@@ -14,7 +14,7 @@
props
:
{
items
:
{
type
:
Array
,
default
:
[]
default
:
()
=>
[],
},
stage
:
{
type
:
Object
,
...
...
@@ -81,8 +81,7 @@
name=
"fork"
:size=
"16"
/>
<a
:href=
"mergeRequest.branch.url"
>
<a
:href=
"mergeRequest.branch.url"
>
{{
mergeRequest
.
branch
.
name
}}
</a>
</span>
...
...
app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
View file @
7c7f5266
...
...
@@ -15,7 +15,7 @@
props
:
{
items
:
{
type
:
Array
,
default
:
[]
default
:
()
=>
[],
},
stage
:
{
type
:
Object
,
...
...
@@ -69,7 +69,7 @@
<a
:href=
"build.commitUrl"
class=
"commit-sha"
>
>
{{
build
.
shortSha
}}
</a>
</h5>
...
...
@@ -77,7 +77,7 @@
<a
:href=
"build.url"
class=
"build-date"
>
>
{{
build
.
date
}}
</a>
{{
s__
(
'
ByAuthor|by
'
)
}}
...
...
app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
View file @
7c7f5266
...
...
@@ -6,15 +6,21 @@
import
icon
from
'
../../vue_shared/components/icon.vue
'
;
export
default
{
props
:
{
items
:
Array
,
stage
:
Object
,
},
components
:
{
totalTime
,
limitWarning
,
icon
,
},
props
:
{
items
:
{
type
:
Array
,
default
:
()
=>
[],
},
stage
:
{
type
:
Object
,
default
:
()
=>
({}),
},
},
computed
:
{
iconBuildStatus
()
{
return
iconBuildStatus
;
...
...
@@ -35,29 +41,59 @@
<li
v-for=
"(build, i) in items"
:key=
"i"
class=
"stage-event-item item-build-component"
>
class=
"stage-event-item item-build-component"
>
<div
class=
"item-details"
>
<h5
class=
"item-title"
>
<span
class=
"icon-build-status"
v-html=
"iconBuildStatus"
></span>
<a
:href=
"build.url"
class=
"item-build-name"
>
{{
build
.
name
}}
</a>
<span
class=
"icon-build-status"
v-html=
"iconBuildStatus"
>
</span>
<a
:href=
"build.url"
class=
"item-build-name"
>
{{
build
.
name
}}
</a>
·
<a
:href=
"build.url"
class=
"pipeline-id"
>
#
{{
build
.
id
}}
</a>
<a
:href=
"build.url"
class=
"pipeline-id"
>
#
{{
build
.
id
}}
</a>
<icon
name=
"fork"
:size=
"16"
>
</icon>
<a
:href=
"build.branch.url"
class=
"ref-name"
>
{{
build
.
branch
.
name
}}
</a>
<span
class=
"icon-branch"
v-html=
"iconBranch"
></span>
<a
:href=
"build.commitUrl"
class=
"commit-sha"
>
{{
build
.
shortSha
}}
</a>
:size=
"16"
/>
<a
:href=
"build.branch.url"
class=
"ref-name"
>
{{
build
.
branch
.
name
}}
</a>
<span
class=
"icon-branch"
v-html=
"iconBranch"
>
</span>
<a
:href=
"build.commitUrl"
class=
"commit-sha"
>
{{
build
.
shortSha
}}
</a>
</h5>
<span>
<a
:href=
"build.url"
class=
"issue-date"
>
<a
:href=
"build.url"
class=
"issue-date"
>
{{
build
.
date
}}
</a>
</span>
</div>
<div
class=
"item-time"
>
<total-time
:time=
"build.totalTime"
/>
<total-time
:time=
"build.totalTime"
/>
</div>
</li>
</ul>
...
...
app/assets/javascripts/cycle_analytics/components/total_time_component.vue
View file @
7c7f5266
...
...
@@ -17,10 +17,30 @@
<
template
>
<span
class=
"total-time"
>
<template
v-if=
"hasData"
>
<template
v-if=
"time.days"
>
{{
time
.
days
}}
<span>
{{
n__
(
'
day
'
,
'
days
'
,
time
.
days
)
}}
</span></
template
>
<
template
v-if=
"time.hours"
>
{{
time
.
hours
}}
<span>
{{
n__
(
'
Time|hr
'
,
'
Time|hrs
'
,
time
.
hours
)
}}
</span></
template
>
<
template
v-if=
"time.mins && !time.days"
>
{{
time
.
mins
}}
<span>
{{
n__
(
'
Time|min
'
,
'
Time|mins
'
,
time
.
mins
)
}}
</span></
template
>
<
template
v-if=
"time.seconds && hasData === 1 || time.seconds === 0"
>
{{
time
.
seconds
}}
<span>
{{
s__
(
'
Time|s
'
)
}}
</span></
template
>
<template
v-if=
"time.days"
>
{{
time
.
days
}}
<span>
{{
n__
(
'
day
'
,
'
days
'
,
time
.
days
)
}}
</span>
</
template
>
<
template
v-if=
"time.hours"
>
{{
time
.
hours
}}
<span>
{{
n__
(
'
Time|hr
'
,
'
Time|hrs
'
,
time
.
hours
)
}}
</span>
</
template
>
<
template
v-if=
"time.mins && !time.days"
>
{{
time
.
mins
}}
<span>
{{
n__
(
'
Time|min
'
,
'
Time|mins
'
,
time
.
mins
)
}}
</span>
</
template
>
<
template
v-if=
"time.seconds && hasData === 1 || time.seconds === 0"
>
{{
time
.
seconds
}}
<span>
{{
s__
(
'
Time|s
'
)
}}
</span>
</
template
>
</template>
<
template
v-else
>
--
...
...
app/assets/javascripts/deploy_keys/components/action_btn.vue
View file @
7c7f5266
...
...
@@ -3,10 +3,8 @@
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
export
default
{
data
()
{
return
{
isLoading
:
false
,
};
components
:
{
loadingIcon
,
},
props
:
{
deployKey
:
{
...
...
@@ -23,11 +21,16 @@
default
:
'
btn-default
'
,
},
},
components
:
{
loadingIcon
,
data
()
{
return
{
isLoading
:
false
,
};
},
computed
:
{
text
()
{
return
`
${
this
.
type
.
charAt
(
0
).
toUpperCase
()}${
this
.
type
.
slice
(
1
)}
`
;
},
},
methods
:
{
doAction
()
{
this
.
isLoading
=
true
;
...
...
@@ -37,11 +40,6 @@
});
},
},
computed
:
{
text
()
{
return
`
${
this
.
type
.
charAt
(
0
).
toUpperCase
()}${
this
.
type
.
slice
(
1
)}
`
;
},
},
};
</
script
>
...
...
app/assets/javascripts/deploy_keys/components/app.vue
View file @
7c7f5266
...
...
@@ -7,11 +7,9 @@
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
export
default
{
data
()
{
return
{
isLoading
:
false
,
store
:
new
DeployKeysStore
(),
};
components
:
{
keysPanel
,
loadingIcon
,
},
props
:
{
endpoint
:
{
...
...
@@ -19,6 +17,12 @@
required
:
true
,
},
},
data
()
{
return
{
isLoading
:
false
,
store
:
new
DeployKeysStore
(),
};
},
computed
:
{
hasKeys
()
{
return
Object
.
keys
(
this
.
keys
).
length
;
...
...
@@ -27,9 +31,20 @@
return
this
.
store
.
keys
;
},
},
components
:
{
keysPanel
,
loadingIcon
,
created
()
{
this
.
service
=
new
DeployKeysService
(
this
.
endpoint
);
eventHub
.
$on
(
'
enable.key
'
,
this
.
enableKey
);
eventHub
.
$on
(
'
remove.key
'
,
this
.
disableKey
);
eventHub
.
$on
(
'
disable.key
'
,
this
.
disableKey
);
},
mounted
()
{
this
.
fetchKeys
();
},
beforeDestroy
()
{
eventHub
.
$off
(
'
enable.key
'
,
this
.
enableKey
);
eventHub
.
$off
(
'
remove.key
'
,
this
.
disableKey
);
eventHub
.
$off
(
'
disable.key
'
,
this
.
disableKey
);
},
methods
:
{
fetchKeys
()
{
...
...
@@ -59,21 +74,6 @@
}
},
},
created
()
{
this
.
service
=
new
DeployKeysService
(
this
.
endpoint
);
eventHub
.
$on
(
'
enable.key
'
,
this
.
enableKey
);
eventHub
.
$on
(
'
remove.key
'
,
this
.
disableKey
);
eventHub
.
$on
(
'
disable.key
'
,
this
.
disableKey
);
},
mounted
()
{
this
.
fetchKeys
();
},
beforeDestroy
()
{
eventHub
.
$off
(
'
enable.key
'
,
this
.
enableKey
);
eventHub
.
$off
(
'
remove.key
'
,
this
.
disableKey
);
eventHub
.
$off
(
'
disable.key
'
,
this
.
disableKey
);
},
};
</
script
>
...
...
app/assets/javascripts/deploy_keys/components/key.vue
View file @
7c7f5266
...
...
@@ -3,6 +3,9 @@
import
{
getTimeago
}
from
'
../../lib/utils/datetime_utility
'
;
export
default
{
components
:
{
actionBtn
,
},
props
:
{
deployKey
:
{
type
:
Object
,
...
...
@@ -17,9 +20,6 @@
required
:
true
,
},
},
components
:
{
actionBtn
,
},
computed
:
{
timeagoDate
()
{
return
getTimeago
().
format
(
this
.
deployKey
.
created_at
);
...
...
@@ -61,9 +61,10 @@
</div>
<div
class=
"deploy-key-content prepend-left-default deploy-key-projects"
>
<a
v-for=
"
project
in deployKey.projects"
v-for=
"
(project, i)
in deployKey.projects"
class=
"label deploy-project-label"
:href=
"project.full_path"
:key=
"i"
>
{{
project
.
full_name
}}
</a>
...
...
app/assets/javascripts/deploy_keys/components/keys_panel.vue
View file @
7c7f5266
...
...
@@ -2,6 +2,9 @@
import
key
from
'
./key.vue
'
;
export
default
{
components
:
{
key
,
},
props
:
{
title
:
{
type
:
String
,
...
...
@@ -25,9 +28,6 @@
required
:
true
,
},
},
components
:
{
key
,
},
};
</
script
>
...
...
@@ -37,12 +37,14 @@
{{
title
}}
(
{{
keys
.
length
}}
)
</h5>
<ul
class=
"well-list"
<ul
class=
"well-list"
v-if=
"keys.length"
>
<li
v-for=
"deployKey in keys"
:key=
"deployKey.id"
>
:key=
"deployKey.id"
>
<key
:deploy-key=
"deployKey"
:store=
"store"
...
...
app/assets/javascripts/environments/components/container.vue
View file @
7c7f5266
...
...
@@ -4,6 +4,11 @@
import
environmentTable
from
'
../components/environments_table.vue
'
;
export
default
{
components
:
{
environmentTable
,
loadingIcon
,
tablePagination
,
},
props
:
{
isLoading
:
{
type
:
Boolean
,
...
...
@@ -26,12 +31,6 @@
required
:
true
,
},
},
components
:
{
environmentTable
,
loadingIcon
,
tablePagination
,
},
methods
:
{
onChangePage
(
page
)
{
this
.
$emit
(
'
onChangePage
'
,
page
);
...
...
@@ -47,7 +46,7 @@
label=
"Loading environments"
v-if=
"isLoading"
size=
"3"
/>
/>
<slot
name=
"emptyState"
></slot>
...
...
@@ -59,13 +58,13 @@
:environments=
"environments"
:can-create-deployment=
"canCreateDeployment"
:can-read-environment=
"canReadEnvironment"
/>
/>
<table-pagination
v-if=
"pagination && pagination.totalPages > 1"
:change=
"onChangePage"
:page
I
nfo=
"pagination"
/>
:page
-i
nfo=
"pagination"
/>
</div>
</div>
</
template
>
app/assets/javascripts/environments/components/empty_state.vue
View file @
7c7f5266
<
script
>
export
default
{
name
:
'
e
nvironmentsEmptyState
'
,
name
:
'
E
nvironmentsEmptyState
'
,
props
:
{
newPath
:
{
type
:
String
,
...
...
@@ -21,21 +21,22 @@
<div
class=
"blank-state-row"
>
<div
class=
"blank-state-center"
>
<h2
class=
"blank-state-title js-blank-state-title"
>
{{
s__
(
"
Environments|You don't have any environments right now.
"
)
}}
{{
s__
(
"
Environments|You don't have any environments right now.
"
)
}}
</h2>
<p
class=
"blank-state-text"
>
{{
s__
(
"
Environments|Environments are places where code gets deployed, such as staging or production.
"
)
}}
{{
s__
(
"
Environments|Environments are places where code gets deployed, such as staging or production.
"
)
}}
<br
/>
<a
:href=
"helpPath"
>
{{
s__
(
"
Environments|Read more about environments
"
)
}}
{{
s__
(
"
Environments|Read more about environments
"
)
}}
</a>
</p>
<a
v-if=
"canCreateEnvironment"
:href=
"newPath"
class=
"btn btn-create js-new-environment-button"
>
{{
s__
(
"
Environments|New environment
"
)
}}
class=
"btn btn-create js-new-environment-button"
>
{{
s__
(
"
Environments|New environment
"
)
}}
</a>
</div>
</div>
...
...
app/assets/javascripts/environments/components/environment_actions.vue
View file @
7c7f5266
<
script
>
import
playIconSvg
from
'
icons/_icon_play.svg
'
;
import
eventHub
from
'
../event_hub
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
import
playIconSvg
from
'
icons/_icon_play.svg
'
;
import
eventHub
from
'
../event_hub
'
;
import
loadingIcon
from
'
../../vue_shared/components/loading_icon.vue
'
;
import
tooltip
from
'
../../vue_shared/directives/tooltip
'
;
export
default
{
props
:
{
actions
:
{
type
:
Array
,
required
:
false
,
default
:
()
=>
[],
export
default
{
directives
:
{
tooltip
,
},
},
directives
:
{
tooltip
,
},
components
:
{
loadingIcon
,
},
components
:
{
loadingIcon
,
},
props
:
{
actions
:
{
type
:
Array
,
required
:
false
,
default
:
()
=>
[],
},
},
data
()
{
return
{
playIconSvg
,
isLoading
:
false
,
};
},
data
()
{
return
{
playIconSvg
,
isLoading
:
false
,
};
},
computed
:
{
title
()
{
return
'
Deploy to...
'
;
computed
:
{
title
()
{
return
'
Deploy to...
'
;
},
},
},
methods
:
{
onClickAction
(
endpoint
)
{
this
.
isLoading
=
true
;
methods
:
{
onClickAction
(
endpoint
)
{
this
.
isLoading
=
true
;
eventHub
.
$emit
(
'
postAction
'
,
endpoint
);
},
eventHub
.
$emit
(
'
postAction
'
,
endpoint
);
},
isActionDisabled
(
action
)
{
if
(
action
.
playable
===
undefined
)
{
return
false
;
}
isActionDisabled
(
action
)
{
if
(
action
.
playable
===
undefined
)
{
return
false
;
}
return
!
action
.
playable
;
return
!
action
.
playable
;
},
},
},
};
};
</
script
>
<
template
>
<div
...
...
@@ -63,27 +62,32 @@ export default {
data-toggle=
"dropdown"
:title=
"title"
:aria-label=
"title"
:disabled=
"isLoading"
>
:disabled=
"isLoading"
>
<span>
<span
v-html=
"playIconSvg"
></span>
<i
class=
"fa fa-caret-down"
aria-hidden=
"true"
/>
aria-hidden=
"true"
/>
<loading-icon
v-if=
"isLoading"
/>
</span>
</button>
<ul
class=
"dropdown-menu dropdown-menu-align-right"
>