Permalink
Commits on Aug 15, 2011
  1. Update docs, bump version

    norman committed Aug 15, 2011
    [ci skip]
  2. Remove YARD links from Changelog

    norman committed Aug 15, 2011
    [ci skip]
  3. Added back generator from 4.0.0 branch

    norman committed Aug 15, 2011
    [ci skip]
  4. Removed more files from FriendlyId 3.x.

    norman committed Aug 15, 2011
    [ci skip]
  5. Update install instructions

    norman committed Aug 15, 2011
  6. Docs tweaks

    norman committed Aug 15, 2011
  7. Merge branch '4.0.0'

    norman committed Aug 15, 2011
    Conflicts:
    	.gitignore
    	README.md
    	Rakefile
    	friendly_id.gemspec
    	lib/friendly_id.rb
    	lib/friendly_id/configuration.rb
    	lib/friendly_id/slugged.rb
    	lib/generators/friendly_id_generator.rb
  8. Temporarily disable JRuby for CI

    norman committed Aug 15, 2011
    3.1 still causes problems.
  9. Small tweak needed for RBX.

    norman committed Aug 15, 2011
  10. Merge pull request #135 from parndt/patch-1

    norman committed Aug 15, 2011
    Added 1.9.3, REE, rbxx & rbx-2.0 to the tested rubies.
  11. Added Travis status image

    norman committed Aug 15, 2011
  12. Ok, don't do JRuby on Travis just yet.

    norman committed Aug 15, 2011
    Seeing lots of failures on Travis that I don't get locally, so
    let's lighten their load and just do this locally.
  13. Add JRuby to tested rubies

    norman committed Aug 15, 2011
  14. Rename ci/ to gemfiles/

    norman committed Aug 15, 2011
Commits on Aug 14, 2011
  1. Setting up multiple Travis builds

    norman committed Aug 14, 2011
  2. Move connections into one YAML

    norman committed Aug 14, 2011
  3. Set up multiple Gemfiles for CI

    norman committed Aug 14, 2011
Commits on Aug 13, 2011
  1. Fix for 1.8.7

    norman committed Aug 13, 2011
    For some reason this breaks in Travis CI, but not on my local
    machine. Commiting this change to see if it fixes it.
Commits on Aug 12, 2011
  1. Fix for 1.8.7

    norman committed Aug 12, 2011
  2. Added travis config

    norman committed Aug 12, 2011
  3. Doc tweaks

    norman committed Aug 12, 2011
Commits on Aug 11, 2011
  1. Bump version

    norman committed Aug 11, 2011
  2. Use :reserved by default

    norman committed Aug 11, 2011
Commits on Aug 9, 2011