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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
b64e7f46
Commit
b64e7f46
authored
Apr 19, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ee-30985-cancel-pipelines' into 'master'
Port of 30985-cancel-pipelines to EE See merge request !1676
parents
465b4ec5
5afa1a67
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
4 deletions
+20
-4
app/assets/javascripts/environments/components/environment_actions.js
...avascripts/environments/components/environment_actions.js
+3
-0
app/assets/javascripts/environments/components/environment_rollback.js
...vascripts/environments/components/environment_rollback.js
+2
-0
app/assets/javascripts/environments/components/environment_stop.js
...s/javascripts/environments/components/environment_stop.js
+2
-0
app/assets/javascripts/pipelines/components/async_button.vue
app/assets/javascripts/pipelines/components/async_button.vue
+10
-4
app/assets/javascripts/pipelines/components/pipelines_actions.js
...ets/javascripts/pipelines/components/pipelines_actions.js
+3
-0
No files found.
app/assets/javascripts/environments/components/environment_actions.js
View file @
b64e7f46
...
@@ -36,6 +36,8 @@ export default {
...
@@ -36,6 +36,8 @@ export default {
onClickAction
(
endpoint
)
{
onClickAction
(
endpoint
)
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
$
(
this
.
$refs
.
tooltip
).
tooltip
(
'
destroy
'
);
this
.
service
.
postAction
(
endpoint
)
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
{
.
then
(()
=>
{
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
...
@@ -63,6 +65,7 @@ export default {
...
@@ -63,6 +65,7 @@ export default {
class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container has-tooltip"
class="dropdown btn btn-default dropdown-new js-dropdown-play-icon-container has-tooltip"
data-container="body"
data-container="body"
data-toggle="dropdown"
data-toggle="dropdown"
ref="tooltip"
:title="title"
:title="title"
:aria-label="title"
:aria-label="title"
:disabled="isLoading">
:disabled="isLoading">
...
...
app/assets/javascripts/environments/components/environment_rollback.js
View file @
b64e7f46
...
@@ -37,6 +37,8 @@ export default {
...
@@ -37,6 +37,8 @@ export default {
onClick
()
{
onClick
()
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
$
(
this
.
$el
).
tooltip
(
'
destroy
'
);
this
.
service
.
postAction
(
this
.
retryUrl
)
this
.
service
.
postAction
(
this
.
retryUrl
)
.
then
(()
=>
{
.
then
(()
=>
{
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
...
...
app/assets/javascripts/environments/components/environment_stop.js
View file @
b64e7f46
...
@@ -37,6 +37,8 @@ export default {
...
@@ -37,6 +37,8 @@ export default {
if
(
confirm
(
'
Are you sure you want to stop this environment?
'
))
{
if
(
confirm
(
'
Are you sure you want to stop this environment?
'
))
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
$
(
this
.
$el
).
tooltip
(
'
destroy
'
);
this
.
service
.
postAction
(
this
.
retryUrl
)
this
.
service
.
postAction
(
this
.
retryUrl
)
.
then
(()
=>
{
.
then
(()
=>
{
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
...
...
app/assets/javascripts/pipelines/components/async_button.vue
View file @
b64e7f46
...
@@ -65,6 +65,8 @@ export default {
...
@@ -65,6 +65,8 @@ export default {
makeRequest
()
{
makeRequest
()
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
$
(
this
.
$el
).
tooltip
(
'
destroy
'
);
this
.
service
.
postAction
(
this
.
endpoint
)
this
.
service
.
postAction
(
this
.
endpoint
)
.
then
(()
=>
{
.
then
(()
=>
{
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
...
@@ -88,9 +90,13 @@ export default {
...
@@ -88,9 +90,13 @@ export default {
:aria-label=
"title"
:aria-label=
"title"
data-container=
"body"
data-container=
"body"
data-placement=
"top"
data-placement=
"top"
:disabled=
"isLoading"
:disabled=
"isLoading"
>
>
<i
<i
:class=
"iconClass"
aria-hidden=
"true"
></i>
:class=
"iconClass"
<i
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
v-if=
"isLoading"
></i>
aria-hidden=
"true"
/>
<i
class=
"fa fa-spinner fa-spin"
aria-hidden=
"true"
v-if=
"isLoading"
/>
</button>
</button>
</
template
>
</
template
>
app/assets/javascripts/pipelines/components/pipelines_actions.js
View file @
b64e7f46
...
@@ -28,6 +28,8 @@ export default {
...
@@ -28,6 +28,8 @@ export default {
onClickAction
(
endpoint
)
{
onClickAction
(
endpoint
)
{
this
.
isLoading
=
true
;
this
.
isLoading
=
true
;
$
(
this
.
$refs
.
tooltip
).
tooltip
(
'
destroy
'
);
this
.
service
.
postAction
(
endpoint
)
this
.
service
.
postAction
(
endpoint
)
.
then
(()
=>
{
.
then
(()
=>
{
this
.
isLoading
=
false
;
this
.
isLoading
=
false
;
...
@@ -57,6 +59,7 @@ export default {
...
@@ -57,6 +59,7 @@ export default {
data-toggle="dropdown"
data-toggle="dropdown"
data-placement="top"
data-placement="top"
aria-label="Manual job"
aria-label="Manual job"
ref="tooltip"
:disabled="isLoading">
:disabled="isLoading">
${
playIconSvg
}
${
playIconSvg
}
<i
<i
...
...
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