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

Bug 1827218: change instances of fromNow to <Timestamp> in Creat… #5185

Merged
merged 1 commit into from Apr 26, 2020

Conversation

rhamilto
Copy link
Member

…ed cols so Created values dynamically update and align all column headers to 'Created'.

After:
Screen Shot 2020-04-24 at 2 14 31 PM
Screen Shot 2020-04-24 at 2 17 42 PM

…d cols

so Created values dynamically update and align all column headers to 'Created'.
@rhamilto rhamilto added the kind/bug Categorizes issue or PR as related to a bug. label Apr 24, 2020
@rhamilto rhamilto added this to the v4.5 milestone Apr 24, 2020
@openshift-ci-robot
Copy link
Contributor

@rhamilto: This pull request references Bugzilla bug 1827218, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1827218: change instances of fromNow to <Timestamp> in Creat…

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.

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/core Related to console core functionality labels Apr 24, 2020
@openshift-ci-robot openshift-ci-robot added component/knative Related to knative-plugin approved Indicates a PR has been approved by an approver from all required OWNERS files. component/kubevirt Related to kubevirt-plugin component/noobaa Related to noobaa-storage-plugin component/olm Related to OLM labels Apr 24, 2020
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

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

/lgtm

thanks @rhamilto 👍

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

/hold for @serenamarie125 approval.

@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 24, 2020
Copy link
Contributor

@serenamarie125 serenamarie125 left a comment

Choose a reason for hiding this comment

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

lgtm, thanks @rhamilto! Approved by UX Dev side

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhamilto, serenamarie125, spadgett

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

@rhamilto
Copy link
Member Author

/hold cancel

@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 26, 2020
@openshift-merge-robot openshift-merge-robot merged commit 7de6dd1 into openshift:master Apr 26, 2020
@openshift-ci-robot
Copy link
Contributor

@rhamilto: All pull requests linked via external trackers have merged: openshift/console#5185. Bugzilla bug 1827218 has been moved to the MODIFIED state.

In response to this:

Bug 1827218: change instances of fromNow to <Timestamp> in Creat…

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

/cherry-pick release-4.4

@openshift-cherrypick-robot

@rhamilto: #5185 failed to apply on top of branch "release-4.4":
```Applying: Bug 1827218: change instances of fromNow to `` in Created cols
Using index info to reconstruct a base tree...
M frontend/packages/console-app/src/components/nodes/NodesPage.tsx
M frontend/packages/kubevirt-plugin/src/components/vms/vm.tsx
M frontend/packages/noobaa-storage-plugin/src/components/noobaa-operator/resourceTable.tsx
M frontend/packages/operator-lifecycle-manager/mocks.ts
M frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.spec.tsx
M frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx
M frontend/public/components/build-config.tsx
M frontend/public/components/build.tsx
M frontend/public/components/chargeback.tsx
M frontend/public/components/configmap.jsx
M frontend/public/components/default-resource.jsx
M frontend/public/components/group.tsx
M frontend/public/components/image-stream.tsx
M frontend/public/components/machine-config.tsx
M frontend/public/components/machine-health-check.tsx
M frontend/public/components/namespace.jsx
M frontend/public/components/pod.tsx
M frontend/public/components/replicaset.jsx
M frontend/public/components/replication-controller.jsx
M frontend/public/components/secret.jsx
M frontend/public/components/service-account.jsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/public/components/service-account.jsx
Auto-merging frontend/public/components/secret.jsx
Auto-merging frontend/public/components/replication-controller.jsx
Auto-merging frontend/public/components/replicaset.jsx
Auto-merging frontend/public/components/pod.tsx
Auto-merging frontend/public/components/namespace.jsx
Auto-merging frontend/public/components/machine-health-check.tsx
Auto-merging frontend/public/components/machine-config.tsx
CONFLICT (content): Merge conflict in frontend/public/components/machine-config.tsx
Auto-merging frontend/public/components/image-stream.tsx
Auto-merging frontend/public/components/group.tsx
Auto-merging frontend/public/components/default-resource.jsx
Auto-merging frontend/public/components/configmap.jsx
Auto-merging frontend/public/components/chargeback.tsx
Auto-merging frontend/public/components/build.tsx
Auto-merging frontend/public/components/build-config.tsx
Auto-merging frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx
CONFLICT (content): Merge conflict in frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.tsx
Auto-merging frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.spec.tsx
CONFLICT (content): Merge conflict in frontend/packages/operator-lifecycle-manager/src/components/clusterserviceversion.spec.tsx
Auto-merging frontend/packages/operator-lifecycle-manager/mocks.ts
Auto-merging frontend/packages/noobaa-storage-plugin/src/components/noobaa-operator/resourceTable.tsx
Auto-merging frontend/packages/kubevirt-plugin/src/components/vms/vm.tsx
CONFLICT (content): Merge conflict in frontend/packages/kubevirt-plugin/src/components/vms/vm.tsx
Auto-merging frontend/packages/console-app/src/components/nodes/NodesPage.tsx
CONFLICT (content): Merge conflict in frontend/packages/console-app/src/components/nodes/NodesPage.tsx
error: Failed to merge in the changes.
Patch failed at 0001 Bug 1827218: change instances of `fromNow` to `` in Created cols


<details>

In response to [this](https://github.com/openshift/console/pull/5185#issuecomment-619942410):

>/cherry-pick release-4.4


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>

@rhamilto rhamilto deleted the bz1827218 branch April 27, 2020 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/core Related to console core functionality component/knative Related to knative-plugin component/kubevirt Related to kubevirt-plugin component/noobaa Related to noobaa-storage-plugin component/olm Related to OLM kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants