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

Update various templates to use status-icon #6083

Conversation

benjaminapetersen
Copy link
Contributor

@@ -38,7 +31,7 @@
</span>
</dd>
</dl>
<h3>Configuration <span class="small" ng-if="buildConfigName">created from <a href="project/{{build.metadata.namespace}}/browse/builds/{{buildConfigName}}">{{buildConfigName}}</a></span></h3>
<h3>Configuration <span class="small" ng-if="buildConfigName">created from <a href="project/{{build.metadata.namespace}}/browse/builds/{{buildConfigName}}">{{buildConfigName}}</a></span></h3>
Copy link
Member

Choose a reason for hiding this comment

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

guessing you created a merge conflict with your other PR here, you can drop the whitespace fix

Copy link
Member

Choose a reason for hiding this comment

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

or wait and rebase after your other one merges, but who knows when that will actually go through :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My editor does it automatically... I'll have to live with it I suppose unless I disable the feature. One day we won't have those issues anymore 😄

@benjaminapetersen
Copy link
Contributor Author

[TEST]

@benjaminapetersen
Copy link
Contributor Author

@jwforres updated the comments

@jwforres jwforres added the lgtm Indicates that a PR is ready to be merged. label Nov 25, 2015
@jwforres
Copy link
Member

pretty sure this will end up with a merge conflict, but what the heck [merge] hopefully at least one of them passes and gets in :)

@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 26, 2015
@benjaminapetersen
Copy link
Contributor Author

[TEST] rebased

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to b129a68

@openshift-bot openshift-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 30, 2015
@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin/7546/)

@jwforres
Copy link
Member

jwforres commented Dec 1, 2015

[merge]

@jwforres
Copy link
Member

jwforres commented Dec 2, 2015

[merge]
On Dec 1, 2015 6:35 PM, "OpenShift Bot" notifications@github.com wrote:

continuous-integration/openshift-jenkins/merge FAILURE (
https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/4205/
)


Reply to this email directly or view it on GitHub
#6083 (comment).

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/4216/) (Image: devenv-rhel7_2856)

@jwforres
Copy link
Member

jwforres commented Dec 2, 2015

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to b129a68

openshift-bot pushed a commit that referenced this pull request Dec 2, 2015
@openshift-bot openshift-bot merged commit c3617a4 into openshift:master Dec 2, 2015
@benjaminapetersen benjaminapetersen deleted the bpeterse/refactor-status-icon branch December 2, 2015 16:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/web 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

3 participants