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

Revert "Merge pull request #4636 from rtfd/search_upgrade" #4716

Merged
merged 1 commit into from Oct 3, 2018

Conversation

@ericholscher
Copy link
Member

@ericholscher ericholscher commented Oct 3, 2018

This reverts commit 182ab8d, reversing
changes made to 6261427.

This reverts commit 182ab8d, reversing
changes made to 6261427.
@agjohnson
Copy link
Contributor

@agjohnson agjohnson commented Oct 3, 2018

Tests have passed, and we're mostly certain this is all search related PRs. Merging revert.

Still not sure what to do about the 2.7 tag, I think we need to roll back the release entirely.

@agjohnson agjohnson merged commit 183b176 into master Oct 3, 2018
1 check passed
ericholscher added a commit that referenced this issue Nov 20, 2018
Squashed commit of the following:

commit b5007bb
Author: Eric Holscher <eric@ericholscher.com>
Date:   Tue Nov 20 11:41:40 2018 -0500

    Clean up HTMLFile Admin

commit 27e3dd4
Author: Eric Holscher <eric@ericholscher.com>
Date:   Mon Nov 19 15:39:20 2018 -0500

    Set replicas to 2 so we have 3 total copies

commit ee13ed6
Merge: f221f97 ef0cd7b
Author: Eric Holscher <eric@ericholscher.com>
Date:   Tue Nov 20 11:54:57 2018 -0500

    Merge remote-tracking branch 'origin/rel' into search-reapply

commit f221f97
Merge: 57c7b57 7bea6d8
Author: Eric Holscher <25510+ericholscher@users.noreply.github.com>
Date:   Mon Nov 19 15:21:00 2018 -0500

    Merge pull request #4909 from safwanrahman/search_fix

    Tuning Elasticsearch for search improvements

commit 7bea6d8
Author: Safwan Rahman <safwan.rahman15@gmail.com>
Date:   Sat Nov 17 02:17:22 2018 +0600

    more fix

commit 10a6590
Author: Safwan Rahman <safwan.rahman15@gmail.com>
Date:   Sat Nov 17 01:50:48 2018 +0600

    adding comments

commit 40865ae
Author: Safwan Rahman <safwan.rahman15@gmail.com>
Date:   Sat Nov 17 00:54:28 2018 +0600

    fixing test

commit 536874e
Author: Safwan Rahman <safwan.rahman15@gmail.com>
Date:   Sat Nov 17 00:29:34 2018 +0600

    optimize for elasticsearch

commit 57c7b57
Author: Eric Holscher <eric@ericholscher.com>
Date:   Tue Nov 6 12:10:08 2018 -0600

    Update migration

commit a1bd6a4
Merge: 95b23c2 d2137df
Author: Eric Holscher <eric@ericholscher.com>
Date:   Tue Nov 6 12:08:38 2018 -0600

    Merge branch 'master' of github.com:rtfd/readthedocs.org into search-reapply

commit d2137df
Merge: b63ef59 953a4ee
Author: Eric Holscher <25510+ericholscher@users.noreply.github.com>
Date:   Tue Nov 6 11:52:42 2018 -0600

    Merge pull request #4545 from rtfd/davidfischer/enable-timezone-support

    Enable timezone support and set timezone to UTC

commit 95b23c2
Merge: 75445f1 bc248aa
Author: Eric Holscher <25510+ericholscher@users.noreply.github.com>
Date:   Thu Nov 1 14:48:13 2018 -0500

    Merge branch 'master' into search-reapply

commit 953a4ee
Merge: 0a01b96 104c3a6
Author: Eric Holscher <eric@ericholscher.com>
Date:   Thu Nov 1 14:21:37 2018 -0500

    Merge remote-tracking branch 'origin/master' into davidfischer/enable-timezone-support

commit 75445f1
Author: Eric Holscher <eric@ericholscher.com>
Date:   Wed Oct 10 15:45:29 2018 +0200

    One more test

commit fae116c
Author: Eric Holscher <eric@ericholscher.com>
Date:   Wed Oct 10 15:45:03 2018 +0200

    Fix tests

commit 5b823ad
Author: Eric Holscher <eric@ericholscher.com>
Date:   Wed Oct 10 15:43:53 2018 +0200

    Don't change the query param, keep it q

commit 621e14f
Author: Eric Holscher <eric@ericholscher.com>
Date:   Wed Oct 10 14:12:13 2018 +0200

    Fix logic around search processing

commit 5af8307
Merge: 97e3ad8 c38efc8
Author: Eric Holscher <eric@ericholscher.com>
Date:   Wed Oct 10 12:35:16 2018 +0200

    Merge remote-tracking branch 'origin/master' into search-reapply

commit 97e3ad8
Author: Eric Holscher <eric@ericholscher.com>
Date:   Thu Oct 4 09:49:59 2018 +0200

    Revert "Revert "Merge pull request #4636 from rtfd/search_upgrade" (#4716)"

    This reverts commit 183b176.

commit 0a01b96
Author: David Fischer <david@readthedocs.org>
Date:   Tue Sep 18 15:38:00 2018 -0700

    Fix a merge fail

commit 73ad35c
Merge: ad7c76c ba34164
Author: David Fischer <david@readthedocs.org>
Date:   Tue Sep 18 15:11:48 2018 -0700

    Merge branch 'master' into davidfischer/enable-timezone-support

commit ad7c76c
Author: David Fischer <david@readthedocs.org>
Date:   Tue Aug 21 12:54:05 2018 -0700

    Found one more naive datetime

commit 46db5d9
Author: David Fischer <david@readthedocs.org>
Date:   Mon Aug 20 12:09:31 2018 -0700

    Enable timezone support and set timezone to UTC
@stsewd stsewd deleted the revert-search branch Feb 27, 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

2 participants