Permalink
Commits on Apr 28, 2017
  1. Ignore pem files

    mattpardee committed Apr 28, 2017
Commits on Jan 14, 2013
  1. Merge remote-tracking branch 'norman/master' into conditional_destruc…

    Thomas Shafer
    Thomas Shafer committed Jan 14, 2013
    …tion_of_historic_slugs
    
    Conflicts:
    	test/schema.rb
Commits on Jan 12, 2013
Commits on Jan 11, 2013
  1. Merge pull request #355 from eschaefer/patch-1

    parndt committed Jan 11, 2013
    Update README.md
  2. Update README.md

    eschaefer committed Jan 11, 2013
    Specify newer friendly_id gem after Rails 3.2.11 update. Older 4.0.1 won't work. Fixes #354.
Commits on Dec 28, 2012
  1. Merge pull request #351 from qnm/348

    parndt committed Dec 28, 2012
    Fixes #348 Attempt to describe the use of multiple scopes
Commits on Dec 17, 2012
  1. Fixes #348 Attempt to describe the use of multiple scopes

    Rob Sharp
    Rob Sharp committed Dec 16, 2012
Commits on Dec 13, 2012
Commits on Dec 7, 2012
  1. Merge pull request #347 from qnm/master

    parndt committed Dec 7, 2012
    Fix tiny typo in readme
  2. Fix tiny typo in readme

    Rob S
    Rob S committed Dec 7, 2012
Commits on Dec 6, 2012
  1. Merge pull request #346 from andyw8/master

    parndt committed Dec 6, 2012
    Fix broken TravisCI image
  2. Fix broken TravisCI image

    andyw8 committed Dec 6, 2012
  3. Merge pull request #330 from btrepp/master

    parndt committed Dec 6, 2012
    Fix LENGTH undefined in microsoft sqlserver
Commits on Nov 1, 2012
  1. Bump version and update changelog

    norman committed Nov 1, 2012
    [ci skip]
  2. Fix relation code to support Rails 3.2.9.rc1

    norman committed Nov 1, 2012
    See issue #332
Commits on Oct 8, 2012
  1. Uses LEN when using sqlserver as connection source

    Beau Trepp
    Beau Trepp committed Oct 8, 2012
    SQLServer does not support the LENGTH function, but has the same functionality implemented with LEN.
    This change detects if the 'sqlserver' connection adapter is being used, and changes the
    function accordingly.
Commits on Sep 14, 2012
Commits on Aug 1, 2012
  1. Set release data

    norman committed Aug 1, 2012
    [ci skip]
  2. Add @parndt to authors

    norman committed Aug 1, 2012
    [ci skip]
  3. Update changelog

    norman committed Aug 1, 2012
    [ci skip]
  4. Name anonymous class to fix marshalling.

    parndt authored and norman committed Jul 22, 2012
    Resolves #314
  5. Updated changelog

    norman committed Aug 1, 2012
  6. Fix minitest version to 3.2.0

    norman committed Aug 1, 2012
    Minitest 3.3.0 was released a few days ago and currently dies with:
    
    ```
    /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:826:in `block in _run_suite': undefined method `run' for #<ConfigurationTest:0x007faf1d5835f8> (NoMethodError)
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:818:in `map'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:818:in `_run_suite'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:805:in `block in _run_suites'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:805:in `map'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:805:in `_run_suites'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:778:in `_run_anything'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:967:in `run_tests'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:954:in `block in _run'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:953:in `each'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:953:in `_run'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:942:in `run'
      from /Users/norman/.rvm/gems/ruby-1.9.3-p194-perf/gems/minitest-3.3.0/lib/minitest/unit.rb:700:in `block in autorun'
    rake aborted!
    Command failed with status (1): [/Users/norman/.rvm/rubies/ruby-1.9.3-p194-...]
    ```
    
    I don't have time to track this down right now, will check later if this is a
    bug in our code or theirs.
  7. Merge pull request #316 from norman/optimisations

    norman committed Aug 1, 2012
    Removed or begin in favour of ||= do
Commits on Jul 26, 2012
Commits on Jul 22, 2012
  1. Removed or begin in favour of ||= do

    parndt committed Jul 22, 2012
    This uses one less block than previously.
Commits on Jul 10, 2012
Commits on Jul 4, 2012
  1. Merge pull request #309 from robyurkowski/master

    norman committed Jul 4, 2012
    Clarify globalize slug documentation further
  2. Clarify globalize slug documentation further

    robyurkowski committed Jul 4, 2012
    It should now be clear that both the model's table and the model's
    translation table must have a slug field, and the model must declare the
    slug field translatable.
Commits on Jul 3, 2012
  1. Merge pull request #308 from robyurkowski/master

    parndt committed Jul 3, 2012
    Document necessary location of slug column with Globalize
  2. Document necessary location of slug column (resolves #293)

    robyurkowski committed Jul 3, 2012
    This adds a point of clarification in the rdoc and inside the globalize module itself to point out that the slug column must be present on the translation table, not the primary model table itself. It also (real friendly-like) corrects some faulty parallelism.
Commits on Jun 21, 2012
  1. Fix setting slugs with the Globalize module

    norman committed Jun 21, 2012
    Model#slug= was completely ignored and non-functional. This replaces it
    with working functionality that has the same interface used by SimpleI18n.