Skip to content
Commits on Jan 14, 2013
  1. Merge remote-tracking branch 'norman/master' into conditional_destruc…

    Thomas Shafer committed
    …tion_of_historic_slugs
    
    Conflicts:
    	test/schema.rb
Commits on Jan 12, 2013
  1. @norman
Commits on Jan 11, 2013
  1. @parndt

    Merge pull request #355 from eschaefer/patch-1

    parndt committed
    Update README.md
  2. @eschaefer

    Update README.md

    eschaefer committed
    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. @parndt

    Merge pull request #351 from qnm/348

    parndt committed
    Fixes #348 Attempt to describe the use of multiple scopes
Commits on Dec 17, 2012
  1. @qnm
Commits on Dec 13, 2012
  1. @norman
  2. @linuxonrails
Commits on Dec 7, 2012
  1. @parndt

    Merge pull request #347 from qnm/master

    parndt committed
    Fix tiny typo in readme
  2. @qnm

    Fix tiny typo in readme

    qnm committed
Commits on Dec 6, 2012
  1. @parndt

    Merge pull request #346 from andyw8/master

    parndt committed
    Fix broken TravisCI image
  2. @andyw8

    Fix broken TravisCI image

    andyw8 committed
  3. @parndt

    Merge pull request #330 from btrepp/master

    parndt committed
    Fix LENGTH undefined in microsoft sqlserver
Commits on Nov 1, 2012
  1. @norman

    Bump version and update changelog

    norman committed
    [ci skip]
  2. @norman

    Fix relation code to support Rails 3.2.9.rc1

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

    Beau Trepp committed
    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
  1. @parndt
Commits on Aug 1, 2012
  1. @norman

    Set release data

    norman committed
    [ci skip]
  2. @norman

    Add @parndt to authors

    norman committed
    [ci skip]
  3. @norman

    Update changelog

    norman committed
    [ci skip]
  4. @parndt @norman

    Name anonymous class to fix marshalling.

    parndt committed with norman
    Resolves #314
  5. @norman
  6. @norman

    Updated changelog

    norman committed
  7. @norman

    Fix minitest version to 3.2.0

    norman committed
    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.
  8. @norman

    Merge pull request #316 from norman/optimisations

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

    Removed or begin in favour of ||= do

    parndt committed
    This uses one less block than previously.
Commits on Jul 10, 2012
  1. @amerine
Commits on Jul 4, 2012
  1. @norman

    Merge pull request #309 from robyurkowski/master

    norman committed
    Clarify globalize slug documentation further
  2. @robyurkowski

    Clarify globalize slug documentation further

    robyurkowski committed
    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. @parndt

    Merge pull request #308 from robyurkowski/master

    parndt committed
    Document necessary location of slug column with Globalize
  2. @robyurkowski

    Document necessary location of slug column (resolves #293)

    robyurkowski committed
    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. @norman

    Fix setting slugs with the Globalize module

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

    Always set locale in setup block

    norman committed
  3. @norman

    Simplify test name

    norman committed
Something went wrong with that request. Please try again.