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

UI: Fix react UI bug with series going on and off #3693

Merged
merged 4 commits into from
Apr 11, 2021

Conversation

Namanl2001
Copy link
Contributor

Signed-off-by: Namanl2001 [email protected]

Fixes a subissue Fix react UI bug with series going on and off in #3541.

onprem
onprem previously approved these changes Jan 21, 2021
Copy link
Member

@onprem onprem left a comment

Choose a reason for hiding this comment

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

The failing E2E test seems unrelated. LGTM, thanks!

@squat
Copy link
Member

squat commented Jan 21, 2021

Thanks for this PR :) @Namanl2001 would you mind rebasing? With that done, we could merge

@Namanl2001
Copy link
Contributor Author

Namanl2001 commented Jan 22, 2021

@squat @prmsrswt I think if there is no problem in my this PR #3729 then it should be merged first. Otherwise after rebasing & merging of this PR I would have to rebase that PR too.

Update: ready to merge, Thanks!

@Namanl2001
Copy link
Contributor Author

Resolved all conflicts. Ready to Merge. Thanks

@Namanl2001 Namanl2001 requested a review from onprem April 4, 2021 16:19
@onprem
Copy link
Member

onprem commented Apr 10, 2021

Ah sorry, looks like we still managed to get a conflict after all this. Can you rebase this once again, please?

onprem
onprem previously approved these changes Apr 10, 2021
@onprem onprem changed the title Fix react UI bug with series going on and off UI: Fix react UI bug with series going on and off Apr 10, 2021
@onprem onprem enabled auto-merge (squash) April 10, 2021 20:32
Signed-off-by: Namanl2001 <[email protected]>
Signed-off-by: Namanl2001 <[email protected]>
Signed-off-by: Namanl2001 <[email protected]>
auto-merge was automatically disabled April 11, 2021 18:07

Head branch was pushed to by a user without write access

@Namanl2001
Copy link
Contributor Author

Ah sorry, looks like we still managed to get a conflict after all this. Can you rebase this once again, please?

Rebased this PR 3rd time. Let's see if it can be merged this time 😄 . @onprem

@Namanl2001 Namanl2001 requested a review from onprem April 11, 2021 18:17
Copy link
Member

@onprem onprem left a comment

Choose a reason for hiding this comment

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

Let's do this!

@onprem onprem merged commit 4bf956d into thanos-io:main Apr 11, 2021
@Namanl2001 Namanl2001 deleted the react-ui-bug branch April 16, 2021 13:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants