Permalink
Commits on Aug 28, 2011
  1. 2.0.6 release.

    pat committed Aug 28, 2011
  2. Merge branch 'master' into rails3

    pat committed Aug 28, 2011
    Conflicts:
    	HISTORY
    	lib/thinking_sphinx/version.rb
  3. 1.4.7 release.

    pat committed Aug 28, 2011
  4. Merge branch 'master' into rails3

    pat committed Aug 28, 2011
  5. Merge branch 'master' into rails3

    pat committed Aug 28, 2011
    Conflicts:
    	spec/fixtures/models.rb
  6. Don't check whether the record exists - let the update fail, we're ca…

    pat committed Aug 28, 2011
    …tching relevant exceptions.
Commits on Aug 25, 2011
Commits on Aug 22, 2011
  1. The database is storing times in UTC, Sphinx is storing times as UTC …

    pat committed Aug 22, 2011
    …integer timestamps - so why use local time as an integer in a filter?
    
    Long-standing scenario bug now fixed.
  2. Merge branch 'master' into rails3

    pat committed Aug 22, 2011
  3. Merge branch 'master' into rails3

    pat committed Aug 22, 2011
  4. Merge branch 'master' into rails3

    pat committed Aug 22, 2011
  5. Compare object ids - avoids internal implementation differences for r…

    pat committed Aug 22, 2011
    …ubies (Rubinius tries to query Sphinx).
  6. Merge branch 'master' into rails3

    pat committed Aug 22, 2011
    Conflicts:
    	thinking-sphinx.gemspec
  7. JRuby fixes for test suite.

    pat committed Aug 22, 2011
  8. Merge branch 'master' into rails3

    pat committed Aug 22, 2011
  9. Only use rcov on MRI.

    pat committed Aug 22, 2011
  10. Merge branch 'master' into rails3

    pat committed Aug 22, 2011
  11. Adding more rubies for Travis.

    pat committed Aug 22, 2011
  12. Merge branch 'master' into rails3

    pat committed Aug 22, 2011
    Conflicts:
    	lib/cucumber/thinking_sphinx/internal_world.rb
  13. Defaulting postgresql user to postgres, to match Travis' expectations…

    pat committed Aug 22, 2011
    …. And adding PG database to Travis setup script.
  14. Wordcount attributes aren't reliable for filtering - so let's remove …

    pat committed Aug 22, 2011
    …the scenario for that.
Commits on Aug 21, 2011
  1. Make sure we don't change superclass index defintions (otherwise sibl…

    pat committed Aug 21, 2011
    …ing subclasses can end up with each others' index definitions.
  2. Merge branch 'master' into rails3

    pat committed Aug 21, 2011
    Conflicts:
    	spec/spec_helper.rb
  3. Don't double-load TS in specs.

    pat committed Aug 21, 2011