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
f3465c72
Commit
f3465c72
authored
Jan 10, 2019
by
Fernando Arias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update failing specs & linter errors & changelog
parent
42bfffc4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
7 deletions
+4
-7
app/assets/javascripts/jobs/store/getters.js
app/assets/javascripts/jobs/store/getters.js
+1
-4
changelogs/unreleased/move-job-cancel-btn.yml
changelogs/unreleased/move-job-cancel-btn.yml
+1
-1
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+1
-1
spec/javascripts/jobs/store/getters_spec.js
spec/javascripts/jobs/store/getters_spec.js
+1
-1
No files found.
app/assets/javascripts/jobs/store/getters.js
View file @
f3465c72
import
_
from
'
underscore
'
;
import
_
from
'
underscore
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
isScrolledToBottom
}
from
'
~/lib/utils/scroll_utils
'
;
import
{
isScrolledToBottom
}
from
'
~/lib/utils/scroll_utils
'
;
export
const
headerActions
=
state
=>
{
export
const
headerActions
=
()
=>
[];
return
[];
};
export
const
headerTime
=
state
=>
(
state
.
job
.
started
?
state
.
job
.
started
:
state
.
job
.
created_at
);
export
const
headerTime
=
state
=>
(
state
.
job
.
started
?
state
.
job
.
started
:
state
.
job
.
created_at
);
...
...
changelogs/unreleased/move-job-cancel-btn.yml
View file @
f3465c72
---
---
title
:
Move
job cancel button
title
:
Move
cancel & new issue button on job page
merge_request
:
24074
merge_request
:
24074
author
:
author
:
type
:
changed
type
:
changed
spec/features/projects/jobs_spec.rb
View file @
f3465c72
...
@@ -191,7 +191,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
...
@@ -191,7 +191,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
href
=
new_project_issue_path
(
project
,
options
)
href
=
new_project_issue_path
(
project
,
options
)
page
.
within
(
'.
header-action-buttons
'
)
do
page
.
within
(
'.
build-sidebar
'
)
do
expect
(
find
(
'.js-new-issue'
)[
'href'
]).
to
include
(
href
)
expect
(
find
(
'.js-new-issue'
)[
'href'
]).
to
include
(
href
)
end
end
end
end
...
...
spec/javascripts/jobs/store/getters_spec.js
View file @
f3465c72
...
@@ -10,7 +10,7 @@ describe('Job Store Getters', () => {
...
@@ -10,7 +10,7 @@ describe('Job Store Getters', () => {
describe
(
'
headerActions
'
,
()
=>
{
describe
(
'
headerActions
'
,
()
=>
{
describe
(
'
with new issue path
'
,
()
=>
{
describe
(
'
with new issue path
'
,
()
=>
{
it
(
'
returns an empty array
'
,
()
=>
{
it
(
'
returns an empty array
with no actions
'
,
()
=>
{
localState
.
job
.
new_issue_path
=
'
issues/new
'
;
localState
.
job
.
new_issue_path
=
'
issues/new
'
;
expect
(
getters
.
headerActions
(
localState
)).
toEqual
([]);
expect
(
getters
.
headerActions
(
localState
)).
toEqual
([]);
...
...
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