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

Changes to master to support V2 of Google CSE Search API #1857

Merged
merged 8 commits into from Apr 11, 2018
Merged

Conversation

@RichardWallis
Copy link
Contributor

@RichardWallis RichardWallis commented Mar 9, 2018

Replaces closed PR(#1856)

Richard Wallis added 5 commits Mar 12, 2018
Updated nokogiri to 1.8.1
nokogiri (1.8.1)
mini_portile2 ~> 2.3.0
@danbri
Copy link
Contributor

@danbri danbri commented Apr 10, 2018

@RichardWallis is this the right one to merge into master still? (noting that we fixed live site already)

@RichardWallis
Copy link
Contributor Author

@RichardWallis RichardWallis commented Apr 11, 2018

Yes - it applies the changes, we patched into live, into master.

Richard Wallis added 2 commits Apr 11, 2018
Fixed conflict with master later version
@danbri danbri merged commit 17ae4ae into master Apr 11, 2018
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@RichardWallis RichardWallis deleted the CSEMasterUpdate branch Feb 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants