Commits on Aug 25, 2011
  1. @josevalim

    Depend on latest bcrypt.

    josevalim committed Aug 25, 2011
Commits on Aug 20, 2011
  1. @josevalim

    Merge pull request #1282 from apocalyptiq/master

    Allow to set default 'from' header of Devise mails in custom mailer class
    josevalim committed Aug 20, 2011
  2. Allow to set default 'from' header of Devise mails in custom mailer c…

    …lass
    Szymon Przybył committed Aug 20, 2011
Commits on Aug 16, 2011
  1. @josevalim

    Merge pull request #1275 from bquorning/it's_not_"it's",_it's_"its"

    Fix usage of “its” / “it’s” in documentation
    josevalim committed Aug 16, 2011
  2. Fix usage of "its" / "it's" in documentation

    Benjamin Quorning committed Aug 16, 2011
  3. @josevalim
Commits on Aug 12, 2011
  1. @josevalim

    Merge pull request #1264 from invisiblefunnel/master

    Fixes small typo in routes documentation
    josevalim committed Aug 11, 2011
  2. @invisiblefunnel

    Fix documentation typo

    invisiblefunnel committed Aug 11, 2011
Commits on Aug 11, 2011
  1. @josevalim

    Merge pull request #1261 from rumblestrut/patch-1

    Changed "It's composed of 12 modules:" to "It's comprised of 12 modules .
    josevalim committed Aug 10, 2011
  2. @rumblestrut

    Changed "It's composed of 12 modules:" to "It's comprised of 12 modul…

    …es ..." Comprised is the better word choice in this instance, meaning "Consist of; be made up of."
    rumblestrut committed Aug 10, 2011
  3. @josevalim

    Merge pull request #1237 from novalis/master

    friendly_token should be friendlier
    josevalim committed Aug 10, 2011
Commits on Aug 10, 2011
  1. @josevalim

    Merge pull request #1258 from wildchild/master

    Don't require explicit scope in authenticate router extension
    josevalim committed Aug 10, 2011
  2. @wildchild
Commits on Aug 8, 2011
  1. @rafaelfranca

    Merge pull request #1251 from michaelklishin/patch-1

    Re-add JRuby to the build matrix
    rafaelfranca committed Aug 8, 2011
Commits on Aug 7, 2011
  1. @michaelklishin

    Re-add JRuby to the build matrix

    We hopefully resolved our JRuby woes on travis-ci.org.
    michaelklishin committed Aug 7, 2011
Commits on Aug 6, 2011
  1. @josevalim

    Merge pull request #1249 from ches/mongoid-fixes

    Tests that should no longer exclude Mongoid
    josevalim committed Aug 6, 2011
  2. @josevalim

    Merge pull request #1250 from ches/unenforced-auth-keys

    Fix optional enforcement of particular authentication keys
    josevalim committed Aug 6, 2011
  3. @ches

    Fix optional enforcement of particular authentication keys

    Documentation states that authentication_keys should accept a hash with
    values indicating whether or not each key is required. This was added in
    b2066cc but tests only covered request_keys, and 29afe2d later broke
    it with a << array operator.
    ches committed Aug 6, 2011
  4. @ches
Commits on Aug 5, 2011
  1. @josevalim
  2. @josevalim

    Merge pull request #1241 from dbloete/patch-1

    Speed up tests by defaulting to 1 stretch in test env
    josevalim committed Aug 5, 2011
  3. @josevalim

    Merge pull request #1247 from michaelklishin/patch-1

    It is #rbxday, lets test against Rubinius 2.0 preview, too
    josevalim committed Aug 5, 2011
  4. @michaelklishin
  5. @josevalim

    Merge pull request #1245 from michaelklishin/patch-1

    Disable testing against JRuby, it has known issues on travis-ci.org.
    josevalim committed Aug 5, 2011
  6. @michaelklishin

    Disable testing against JRuby, it has known issues on travis-ci.org.

    We will figure out JRuby issues with the JRuby core team and let you know
    michaelklishin committed Aug 5, 2011
  7. @josevalim

    Merge pull request #1244 from ches/docs

    Doc tweaks
    josevalim committed Aug 5, 2011
  8. @ches @josevalim
  9. @ches
  10. @ches
Commits on Aug 4, 2011
  1. @josevalim

    Merge pull request #1242 from ches/mongoid-fixes

    Fix failing Mongoid tests
    josevalim committed Aug 4, 2011
  2. @ches

    Merge branch 'master' into mongoid-fixes

    * master:
      Untrack Gemfile.lock
    
    Conflicts:
    	Gemfile.lock
    ches committed Aug 5, 2011
  3. @dbloete
  4. @dbloete
  5. @ches