Permalink
Commits on Aug 16, 2011
Commits on Aug 12, 2011
  1. Merge pull request #1264 from invisiblefunnel/master

    Fixes small typo in routes documentation
    josevalim committed Aug 12, 2011
  2. Fix documentation typo

    invisiblefunnel committed Aug 12, 2011
Commits on Aug 11, 2011
  1. 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 11, 2011
  2. 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 11, 2011
  3. Merge pull request #1237 from novalis/master

    friendly_token should be friendlier
    josevalim committed Aug 11, 2011
Commits on Aug 10, 2011
  1. Merge pull request #1258 from wildchild/master

    Don't require explicit scope in authenticate router extension
    josevalim committed Aug 10, 2011
Commits on Aug 8, 2011
  1. 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. 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. Merge pull request #1249 from ches/mongoid-fixes

    Tests that should no longer exclude Mongoid
    josevalim committed Aug 6, 2011
  2. Merge pull request #1250 from ches/unenforced-auth-keys

    Fix optional enforcement of particular authentication keys
    josevalim committed Aug 6, 2011
  3. 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
Commits on Aug 5, 2011
  1. Merge pull request #1241 from dbloete/patch-1

    Speed up tests by defaulting to 1 stretch in test env
    josevalim committed Aug 5, 2011
  2. Merge pull request #1247 from michaelklishin/patch-1

    It is #rbxday, lets test against Rubinius 2.0 preview, too
    josevalim committed Aug 5, 2011
  3. 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
  4. 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
  5. Merge pull request #1244 from ches/docs

    Doc tweaks
    josevalim committed Aug 5, 2011
Commits on Aug 4, 2011
  1. Merge pull request #1242 from ches/mongoid-fixes

    Fix failing Mongoid tests
    josevalim committed Aug 4, 2011
  2. Merge branch 'master' into mongoid-fixes

    * master:
      Untrack Gemfile.lock
    
    Conflicts:
    	Gemfile.lock
    ches committed Aug 4, 2011
  3. Fix failing Mongoid tests

    - attr_accessible not set for test user model, making Serializable tests
      inaccurate
    - Mongoid does not `include_root_in_json` by default, so enable this for
      consistency with AR tests
    - Mark tests pending for Mongoid < 2.1 that fail there due to known bugs
    - Add `:mongoid` key for i18n model labels
    - Remove outdated shim of `update_attribute` that caused mass assignment
      security to be applied (ugh, that took awhile to find)
    ches committed Aug 4, 2011
  4. Merge pull request #1239 from ches/gemfile-lock

    Untrack Gemfile.lock
    josevalim committed Aug 4, 2011
  5. Untrack Gemfile.lock

    Gemfile.lock is for app deployment, not public library development:
    
    http://yehudakatz.com/2010/12/16/clarifying-the-roles-of-the-gemspec-and-gemfile/
    ches committed Aug 4, 2011
Commits on Aug 2, 2011
  1. Merge pull request #1228 from dasil003/master

    Set up Recoverable to automatically confirm! if Comfirmable
    josevalim committed Aug 2, 2011