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
Léo-Paul Géneau
gitlab-ce
Commits
f5b30609
Commit
f5b30609
authored
Dec 22, 2018
by
Jordi Llull
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove cancel all jobs button in general jobs list view
parent
549ee8ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
25 deletions
+5
-25
app/views/projects/jobs/index.html.haml
app/views/projects/jobs/index.html.haml
+0
-4
changelogs/unreleased/remove-cancel-all-button-in-job-list-view.yml
.../unreleased/remove-cancel-all-button-in-job-list-view.yml
+5
-0
spec/features/projects/jobs_spec.rb
spec/features/projects/jobs_spec.rb
+0
-21
No files found.
app/views/projects/jobs/index.html.haml
View file @
f5b30609
...
...
@@ -8,10 +8,6 @@
.nav-controls
-
if
can?
(
current_user
,
:update_build
,
@project
)
-
if
@all_builds
.
running_or_pending
.
limit
(
1
).
any?
# rubocop: disable CodeReuse/ActiveRecord
=
link_to
'Cancel running'
,
cancel_all_project_jobs_path
(
@project
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-danger'
,
method: :post
-
unless
@repository
.
gitlab_ci_yml
=
link_to
'Get started with Pipelines'
,
help_page_path
(
'ci/quick_start/README'
),
class:
'btn btn-info'
...
...
changelogs/unreleased/remove-cancel-all-button-in-job-list-view.yml
0 → 100644
View file @
f5b30609
---
title
:
Remove Cancel all jobs button in general jobs list view
merge_request
:
author
:
Jordi Llull
type
:
removed
spec/features/projects/jobs_spec.rb
View file @
f5b30609
...
...
@@ -28,7 +28,6 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
end
it
"shows Pending tab jobs"
do
expect
(
page
).
to
have_link
'Cancel running'
expect
(
page
).
to
have_selector
(
'.nav-links li.active'
,
text:
'Pending'
)
expect
(
page
).
to
have_content
job
.
short_sha
expect
(
page
).
to
have_content
job
.
ref
...
...
@@ -44,7 +43,6 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
it
"shows Running tab jobs"
do
expect
(
page
).
to
have_selector
(
'.nav-links li.active'
,
text:
'Running'
)
expect
(
page
).
to
have_link
'Cancel running'
expect
(
page
).
to
have_content
job
.
short_sha
expect
(
page
).
to
have_content
job
.
ref
expect
(
page
).
to
have_content
job
.
name
...
...
@@ -60,7 +58,6 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
it
"shows Finished tab jobs"
do
expect
(
page
).
to
have_selector
(
'.nav-links li.active'
,
text:
'Finished'
)
expect
(
page
).
to
have_content
'No jobs to show'
expect
(
page
).
to
have_link
'Cancel running'
end
end
...
...
@@ -75,7 +72,6 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
expect
(
page
).
to
have_content
job
.
short_sha
expect
(
page
).
to
have_content
job
.
ref
expect
(
page
).
to
have_content
job
.
name
expect
(
page
).
not_to
have_link
'Cancel running'
end
end
...
...
@@ -94,23 +90,6 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
end
end
describe
"POST /:project/jobs/:id/cancel_all"
do
before
do
job
.
run!
visit
project_jobs_path
(
project
)
click_link
"Cancel running"
end
it
'shows all necessary content'
do
expect
(
page
).
to
have_selector
(
'.nav-links li.active'
,
text:
'All'
)
expect
(
page
).
to
have_content
'canceled'
expect
(
page
).
to
have_content
job
.
short_sha
expect
(
page
).
to
have_content
job
.
ref
expect
(
page
).
to
have_content
job
.
name
expect
(
page
).
not_to
have_link
'Cancel running'
end
end
describe
"GET /:project/jobs/:id"
do
context
"Job from project"
do
let
(
:job
)
{
create
(
:ci_build
,
:success
,
:trace_live
,
pipeline:
pipeline
)
}
...
...
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