Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: django-haystack/django-haystack
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: RueLaLa/django-haystack
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 9 files changed
  • 7 contributors

Commits on Oct 20, 2015

  1. Merge pull request #4 from django-haystack/master

    Bringing local fork up to Master from main django haystack project
    Eric Bressler (Platform) committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    878fa21 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2020

  1. Merge pull request #12 from RueLaLaTech/update-with-v2-4-1

    Update with v2 4 1
    arianamiri authored Jan 15, 2020
    Configuration menu
    Copy the full SHA
    9a38eb6 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2020

  1. Added in the ability for a "pre-processor" of the batches in haystack.

    This allows somone to do certain things outside of the base object layer.
    
    An example:  You have to call a 3rd party for some data and it is better
    to do it in bulk once and then do a lookup in memory while looping through
    the individual document creation.  This could avoid tons of round trip
    requests to that 3rd party.
    Eric Bressler authored and arianamiri committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    fd3802c View commit details
    Browse the repository at this point in the history
  2. fixing bad grammer

    Eric Bressler authored and arianamiri committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    558e2e0 View commit details
    Browse the repository at this point in the history
  3. Replaced print statements in update_index with logging statements, an…

    …d log batch execution times.
    arianamiri committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    17393b0 View commit details
    Browse the repository at this point in the history
  4. PR feedback

    arianamiri committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    332ea82 View commit details
    Browse the repository at this point in the history
  5. Disabled refresh

    ruebrenda authored and arianamiri committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    62007c4 View commit details
    Browse the repository at this point in the history
  6. Replaced commented code with explanation

    ruebrenda authored and arianamiri committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    f5624aa View commit details
    Browse the repository at this point in the history
  7. Fixed comment

    ruebrenda authored and arianamiri committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    cbfb137 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0c433be View commit details
    Browse the repository at this point in the history
  9. WEB-2469 __unicode__ method no longer exists in python3, so use the e…

    …xisting __str__ method instead since it is already working for both python 2 and 3
    rue-kcarlton authored and arianamiri committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    e8ca089 View commit details
    Browse the repository at this point in the history
  10. Force connections to close after workers complete their work.

    After the multiprocessing pool is done the connection that the parent
    process had established is stale.  For whatever reason, django is unable
    to detect this, and tries to reuse the connection, and gets an error on
    the next database query.
    
    I am forcing all DB connections to close immediately after the proc pool
    is closed, which means that it establishes a new connection before the
    next query.
    arianamiri committed Jan 21, 2020
    Configuration menu
    Copy the full SHA
    da7ddcc View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2020

  1. Removed default logging configuration because it was conflicting with

    logging configuration set up by our app, and double messages.
    arianamiri committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    215919e View commit details
    Browse the repository at this point in the history
  2. Replaced usages of the multiprocess logger introduced in the 2.5 branch

    with our own logger. The multiprocess logger is only useful if you are
    logging to a file.  We log to stdout.  This logger also forces messages
    to stderr with a specific format that we don't want.
    arianamiri committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    92fabdc View commit details
    Browse the repository at this point in the history
  3. Merge pull request #14 from RueLaLaTech/update-to-2.5.1

    Update to 2.5.1
    arianamiri authored Jan 22, 2020
    Configuration menu
    Copy the full SHA
    fcecbb7 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #15 from RueLaLaTech/bug/web-2808-SM-Reindex-Fails…

    …-To-Run-2
    
    Bug/web 2808 sm reindex fails to run 2
    arianamiri authored Jan 22, 2020
    Configuration menu
    Copy the full SHA
    76df13b View commit details
    Browse the repository at this point in the history
  5. rgg version bump

    arianamiri committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    7450f2b View commit details
    Browse the repository at this point in the history
  6. Merge pull request #16 from RueLaLaTech/rgg-version-bump

    rgg version bump
    arianamiri authored Jan 22, 2020
    Configuration menu
    Copy the full SHA
    258d938 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2021

  1. rename and re-version our fork to be compatible with semver

    modern pip doesn't like our made-up versioning scheme
    
    also added packaging steps
    jprestel-rue committed Dec 22, 2021
    Configuration menu
    Copy the full SHA
    35ea161 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2021

  1. Merge pull request #18 from RueLaLa/jp/rename-and-semver

    WEB-4967: Package rename and semver
    jprestel-rue authored Dec 23, 2021
    Configuration menu
    Copy the full SHA
    026281c View commit details
    Browse the repository at this point in the history
Loading