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
a4c72601
Commit
a4c72601
authored
Oct 16, 2017
by
Filipa Lacerda
Committed by
Phil Hughes
Oct 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move retry button to sidebar
parent
2087f121
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
20 deletions
+10
-20
app/assets/javascripts/jobs/components/header.vue
app/assets/javascripts/jobs/components/header.vue
+0
-10
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+2
-2
app/views/projects/jobs/_sidebar.html.haml
app/views/projects/jobs/_sidebar.html.haml
+3
-1
changelogs/unreleased/27654-retry-button.yml
changelogs/unreleased/27654-retry-button.yml
+5
-0
spec/javascripts/jobs/header_spec.js
spec/javascripts/jobs/header_spec.js
+0
-7
No files found.
app/assets/javascripts/jobs/components/header.vue
View file @
a4c72601
...
@@ -43,16 +43,6 @@
...
@@ -43,16 +43,6 @@
type
:
'
link
'
,
type
:
'
link
'
,
});
});
}
}
if
(
this
.
job
.
retry_path
)
{
actions
.
push
({
label
:
'
Retry
'
,
path
:
this
.
job
.
retry_path
,
cssClass
:
'
js-retry-button btn btn-inverted-secondary visible-md-block visible-lg-block
'
,
type
:
'
ujs-link
'
,
});
}
return
actions
;
return
actions
;
},
},
},
},
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
a4c72601
...
@@ -117,7 +117,7 @@
...
@@ -117,7 +117,7 @@
}
}
.right-sidebar
{
.right-sidebar
{
a
,
a
:not
(
.btn-retry
)
,
.btn-link
{
.btn-link
{
color
:
inherit
;
color
:
inherit
;
}
}
...
@@ -459,7 +459,7 @@
...
@@ -459,7 +459,7 @@
}
}
}
}
a
{
a
:not
(
.btn-retry
)
{
&
:hover
{
&
:hover
{
color
:
$md-link-color
;
color
:
$md-link-color
;
text-decoration
:
none
;
text-decoration
:
none
;
...
...
app/views/projects/jobs/_sidebar.html.haml
View file @
a4c72601
...
@@ -4,8 +4,10 @@
...
@@ -4,8 +4,10 @@
.sidebar-container
.sidebar-container
.blocks-container
.blocks-container
.block
.block
%strong
%strong
.prepend-top-10
=
@build
.
name
=
@build
.
name
-
if
can?
(
current_user
,
:update_build
,
@build
)
&&
@build
.
retryable?
=
link_to
"Retry"
,
retry_namespace_project_job_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'js-retry-button pull-right btn btn-inverted-secondary btn-retry visible-md-block visible-lg-block'
,
method: :post
%a
.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-build-toggle
{
href:
"#"
,
'aria-label'
:
'Toggle Sidebar'
,
role:
'button'
}
%a
.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-build-toggle
{
href:
"#"
,
'aria-label'
:
'Toggle Sidebar'
,
role:
'button'
}
=
icon
(
'angle-double-right'
)
=
icon
(
'angle-double-right'
)
...
...
changelogs/unreleased/27654-retry-button.yml
0 → 100644
View file @
a4c72601
---
title
:
Move retry button in job page to sidebar
merge_request
:
author
:
type
:
fixed
spec/javascripts/jobs/header_spec.js
View file @
a4c72601
...
@@ -30,7 +30,6 @@ describe('Job details header', () => {
...
@@ -30,7 +30,6 @@ describe('Job details header', () => {
email
:
'
foo@bar.com
'
,
email
:
'
foo@bar.com
'
,
avatar_url
:
'
link
'
,
avatar_url
:
'
link
'
,
},
},
retry_path
:
'
path
'
,
new_issue_path
:
'
path
'
,
new_issue_path
:
'
path
'
,
},
},
isLoading
:
false
,
isLoading
:
false
,
...
@@ -49,12 +48,6 @@ describe('Job details header', () => {
...
@@ -49,12 +48,6 @@ describe('Job details header', () => {
).
toEqual
(
'
failed Job #123 triggered 3 weeks ago by Foo
'
);
).
toEqual
(
'
failed Job #123 triggered 3 weeks ago by Foo
'
);
});
});
it
(
'
should render retry link
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.js-retry-button
'
).
getAttribute
(
'
href
'
),
).
toEqual
(
props
.
job
.
retry_path
);
});
it
(
'
should render new issue link
'
,
()
=>
{
it
(
'
should render new issue link
'
,
()
=>
{
expect
(
expect
(
vm
.
$el
.
querySelector
(
'
.js-new-issue
'
).
getAttribute
(
'
href
'
),
vm
.
$el
.
querySelector
(
'
.js-new-issue
'
).
getAttribute
(
'
href
'
),
...
...
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