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

fix(travis) prefer complete buildInfoUrl over composing it. #4143

Merged
merged 2 commits into from
Sep 27, 2017
Merged

fix(travis) prefer complete buildInfoUrl over composing it. #4143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f93b9c4
fix(travis) prefer complete buildInfoUrl over composing it.
gardleopard Sep 25, 2017
57e04ba
Merge branch 'master' into build_url_cluster_view
anotherchrisberry Sep 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/scripts/modules/core/src/serverGroup/ServerGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export class ServerGroup extends React.Component<IServerGroupProps, IServerGroup

jenkins = {
number: jenkinsConfig.number,
href: fromHost || fromFullUrl || fromBuildInfo,
href: fromBuildInfo || fromFullUrl || fromHost ,
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems like this should be fromBuildInfo || fromHost || fromFullUrl?

I honestly don't remember the nuance of when these various fields are populated and which takes precedence over which. Maybe it's fine as-is.

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess we can merge it and find out.

};
} else if (has(serverGroup, 'buildInfo.images')) {
images = serverGroup.buildInfo.images.join(', ');
Expand Down