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.

Sign up for GitHub

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

Jump to bottom

fix: Live workflow takes precedence during merge to correctly display in the UI #11336

Merged
merged 1 commit into from
Jul 11, 2023
Merged

fix: Live workflow takes precedence during merge to correctly display in the UI #11336

merged 1 commit into from
Jul 11, 2023

Conversation

terrytangyuan
Copy link
Member

@terrytangyuan terrytangyuan commented Jul 11, 2023 •
edited
Loading

See discussions in #11121 (comment)

Live workflow is more up-to-date.

@terrytangyuan
fix: Live workflow takes precedence during merge to correctly display…
d12ee2e 
… in the UI

Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
@terrytangyuan terrytangyuan mentioned this pull request Jul 11, 2023
Merged
rbreeze
rbreeze approved these changes Jul 11, 2023
View reviewed changes
Copy link
Member

@rbreeze rbreeze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@terrytangyuan terrytangyuan enabled auto-merge (squash) July 11, 2023 17:45
@terrytangyuan terrytangyuan merged commit fdb3ec0 into argoproj:master Jul 11, 2023
23 checks passed
@terrytangyuan terrytangyuan deleted the fix-status branch July 12, 2023 20:23
tico24 pushed a commit to tico24/argo-workflows that referenced this pull request Jul 13, 2023
@terrytangyuan @tico24
fix: Live workflow takes precedence during merge to correctly display…
345b8a7 
… in the UI (argoproj#11336)

Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
Signed-off-by: Tim Collins <tim@thecollins.team>
@terrytangyuan terrytangyuan mentioned this pull request Jul 18, 2023
Closed
61 tasks
@terrytangyuan terrytangyuan mentioned this pull request Aug 9, 2023
Closed
45 tasks
@terrytangyuan terrytangyuan mentioned this pull request Sep 5, 2023
Closed
5 tasks
@agilgur5 agilgur5 added area/api Argo Server API area/ui labels Nov 9, 2023
@agilgur5 agilgur5 mentioned this pull request Nov 9, 2023
Closed
3 tasks
isubasinghe pushed a commit to isubasinghe/argo-workflows that referenced this pull request May 6, 2024
@terrytangyuan @isubasinghe
fix: Live workflow takes precedence during merge to correctly display…
660bbb6 
… in the UI (argoproj#11336)

Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
@agilgur5 agilgur5 mentioned this pull request May 22, 2024
Merged
agilgur5 added a commit that referenced this pull request Jul 6, 2024
@agilgur5
revert: "fix: Live workflow takes precedence during merge to correctl…
bb7cc53 
…y display in the UI (#11336)"

This reverts commit 660bbb6, which was erroneously backported to `release-3.4` when it is a fix for a 3.5 feature

Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rbreeze rbreeze rbreeze approved these changes

@christianh814 christianh814 christianh814 approved these changes

Assignees
No one assigned
Labels
area/api Argo Server API area/ui
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@terrytangyuan @rbreeze @christianh814 @agilgur5