Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show StartIcon for scheduled tasks on task listpage (bp #2840) #2841

Merged
merged 6 commits into from
Apr 7, 2021

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 7, 2021

This is an automatic backport of pull request #2840 done by Mergify.

Cherry-pick of ade4a80 has failed:

On branch mergify/bp/master/pr-2840
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit ade4a80441.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gsa/src/web/pages/tasks/actions.js

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of ecfa869 has failed:

On branch mergify/bp/master/pr-2840
Your branch is ahead of 'origin/master' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ecfa869467.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

no changes added to commit (use "git add" and/or "git commit -a")

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit ade4a80)

# Conflicts:
#	gsa/src/web/pages/tasks/actions.js
(cherry picked from commit ecfa869)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team April 7, 2021 11:26
@mergify mergify bot added the conflicts label Apr 7, 2021
@swaterkamp swaterkamp enabled auto-merge April 7, 2021 14:17
@codecov
Copy link

codecov bot commented Apr 7, 2021

Codecov Report

Merging #2841 (c8ccf90) into master (40db5ae) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #2841      +/-   ##
==========================================
- Coverage   64.75%   64.75%   -0.01%     
==========================================
  Files        1120     1120              
  Lines       29115    29114       -1     
  Branches     8233     8233              
==========================================
- Hits        18853    18852       -1     
  Misses       9283     9283              
  Partials      979      979              
Impacted Files Coverage Δ
gsa/src/web/pages/tasks/actions.js 100.00% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 40db5ae...c8ccf90. Read the comment docs.

@swaterkamp swaterkamp merged commit 8fae315 into master Apr 7, 2021
@swaterkamp swaterkamp deleted the mergify/bp/master/pr-2840 branch April 7, 2021 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant