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

Bug 1822647: Fix upstream regression [1] where login box can be narrower than view… #266

Merged
merged 1 commit into from Apr 3, 2020
Merged

Bug 1822647: Fix upstream regression [1] where login box can be narrower than view… #266

merged 1 commit into from Apr 3, 2020

Conversation

rhamilto
Copy link
Member

@rhamilto rhamilto commented Apr 1, 2020 •
edited

…port at mobile

[1] patternfly/patternfly#2913

After:
oauth-openshift apps rhamilto devcluster openshift com_oauth_authorize_client_id=console redirect_uri=https%3A%2F%2Fconsole-openshift-console apps rhamilto devcluster openshift com%2Fauth%2Fcallback response_type=code scope=user%3Afull stat
oauth-openshift apps rhamilto devcluster openshift com_login_kube_admin_then=%2Foauth%2Fauthorize%3Fclient_id%3Dconsole%26idp%3Dkube%253Aadmin%26redirect_uri%3Dhttps%253A%252F%252Fconsole-openshift-console apps rhamilto devcluster openshift
Screen Shot 2020-04-01 at 5 53 22 PM
Screen Shot 2020-04-01 at 5 53 38 PM

@rhamilto
Copy link
Member Author

rhamilto commented Apr 1, 2020

/hold for testing

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 1, 2020
@rhamilto
Copy link
Member Author

rhamilto commented Apr 1, 2020

/hold cancel

@stlaz, PTAL.

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 1, 2020
@rhamilto
Copy link
Member Author

rhamilto commented Apr 1, 2020

/hold

the bug fix introduced a new bug. :/

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 1, 2020
@rhamilto
Copy link
Member Author

rhamilto commented Apr 1, 2020

/hold cancel

fixed the bug. ready for review.

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 1, 2020
@stlaz
Copy link
Member

stlaz commented Apr 2, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 2, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhamilto, stlaz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 2, 2020
@stlaz
Copy link
Member

stlaz commented Apr 2, 2020

@rhamilto does this need any backporting?

@rhamilto
Copy link
Member Author

rhamilto commented Apr 2, 2020

@rhamilto does this need any backporting?

No as the changes are specific to 4.5.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@rhamilto
Copy link
Member Author

rhamilto commented Apr 2, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit bb4e355 into openshift:master Apr 3, 2020
@rhamilto rhamilto deleted the upstream-regression-fix branch April 3, 2020 11:41
@rhamilto
Copy link
Member Author

rhamilto commented Apr 9, 2020

@rhamilto does this need any backporting?

@stlaz, given the delay of 4.4, @spadgett, @benjaminapetersen, and I think we should aim to get the new logos in to 4.4. so this is going to require a back port.

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

@rhamilto: #266 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	manifests/06_branding_secret.yaml
Falling back to patching base and 3-way merge...
Auto-merging manifests/06_branding_secret.yaml
CONFLICT (content): Merge conflict in manifests/06_branding_secret.yaml
Patch failed at 0001 Fix upstream regression [1] where login box can be narrower than viewport at mobile

In response to this:

@rhamilto does this need any backporting?

@stlaz, given the delay of 4.4, @spadgett, @benjaminapetersen, and I think we should aim to get the new logos in to 4.4. so this is going to require a back port.

/cherry-pick release-4.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@rhamilto rhamilto changed the title Fix upstream regression [1] where login box can be narrower than view… Bug 1822647: Fix upstream regression [1] where login box can be narrower than view… Apr 9, 2020
@openshift-ci-robot
Copy link
Contributor

@rhamilto: Some pull requests linked via external trackers have merged: . The following pull requests linked via external trackers have not merged:

In response to this:

Bug 1822647: Fix upstream regression [1] where login box can be narrower than view…

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@rhamilto
Copy link
Member Author

rhamilto commented Apr 9, 2020

Manually created back port PR for 4.4: #267

@rhamilto rhamilto mentioned this pull request Apr 9, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deads2k deads2k Awaiting requested review from deads2k

@stlaz stlaz Awaiting requested review from stlaz

Assignees

@stlaz stlaz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@rhamilto @stlaz @openshift-ci-robot @openshift-bot @openshift-cherrypick-robot @openshift-merge-robot