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

Fix conflict in search interface #6659

Merged
merged 1 commit into from Jun 14, 2019

Conversation

@chefsalim
Copy link
Member

commented Jun 14, 2019

Fixing a conflict between a couple of PRs that broke the build

Signed-off-by: Salim Alam salam@chef.io

@chefsalim chefsalim requested a review from raskchanky as a code owner Jun 14, 2019

@chef-expeditor

This comment has been minimized.

Copy link

commented Jun 14, 2019

Hello chefsalim! Thanks for the pull request!

Here is what will happen next:

  1. Your PR will be reviewed by the maintainers.
  2. If everything looks good, one of them will approve it, and your PR will be merged.

Thank you for contributing!

Fix conflict in search interface
Signed-off-by: Salim Alam <salam@chef.io>

@chefsalim chefsalim force-pushed the SA/fix-conflict branch from d976332 to c2f98ec Jun 14, 2019

@chefsalim chefsalim merged commit 702cd73 into master Jun 14, 2019

4 of 5 checks passed

buildkite/habitat-sh-habitat-master-verify Build #2377 started
Details
DCO This commit has a DCO Signed-off-by
Details
buildkite/habitat-sh-habitat-master-website Build #2762 passed (34 seconds)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
expeditor/config-validation Validated your Expeditor config file
Details

@chefsalim chefsalim deleted the SA/fix-conflict branch Jun 14, 2019

chef-ci added a commit that referenced this pull request Jun 14, 2019

Update CHANGELOG.md with details from pull request #6659
Obvious fix; these changes are the result of automation not creative thinking.
@mwrock

This comment has been minimized.

Copy link
Contributor

commented Jun 14, 2019

Seems like all but the last line of new and create could be extracted to a separate function to eliminate duplication but I find the interface confusing. When would I use new over create it feeles like create should be create_boxed just to make that obvious.

@davidMcneil

This comment has been minimized.

Copy link
Contributor

commented Jun 14, 2019

That is a good idea. This PR removes the duplication.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.