Permalink
Commits on Oct 26, 2012
  1. remove unused config option

    jonleighton committed Oct 26, 2012
  2. Remove ActiveRecord::Model consant from AS::TestCase

    Fixing the build.
    carlosantoniodasilva committed Oct 26, 2012
  3. Remove ActiveRecord::Model

    In the end I think the pain of implementing this seamlessly was not
    worth the gain provided.
    
    The intention was that it would allow plain ruby objects that might not
    live in your main application to be subclassed and have persistence
    mixed in. But I've decided that the benefit of doing that is not worth
    the amount of complexity that the implementation introduced.
    jonleighton committed Oct 26, 2012
  4. Add missing require for minitest assertions. Breaks calling 'app' in …

    …console otherwise. See 94248ff.
    jeremy committed Oct 26, 2012
  5. Merge pull request #8031 from gbchaosmaster/redcarpet-2.2.2

    Update redcarpet dependency
    carlosantoniodasilva committed Oct 26, 2012
  6. Update redcarpet dependency

    "~> 2.2.2" from "~> 2.1.1". Also converted all hash rockets in the
    Gemfile to the 1.9 syntax.
    Vinny Diehl committed Oct 25, 2012
Commits on Oct 25, 2012
  1. Merge pull request #8030 from calebthompson/fix-ternary

    Fix gratuitous use of ternary operator
    rafaelfranca committed Oct 25, 2012
  2. Merge pull request #8013 from noahhendrix/master

    Pass key to block in cache.fetch on miss
    tenderlove committed Oct 25, 2012
Commits on Oct 24, 2012
  1. Merge pull request #8021 from ugisozols/master

    Fix incorrect markdown by removing extra space. [ci skip]
    rafaelfranca committed Oct 24, 2012
Commits on Oct 23, 2012
  1. JS guide: AJAX -> Ajax

    We discussed this on Twitter, seems to be the best option.
    fxn committed Oct 23, 2012
  2. Merge pull request #8014 from insside/task-test-typos

    changed test case name
    rafaelfranca committed Oct 23, 2012
  3. changed test case name

    Tima Maslyuchenko committed Oct 23, 2012
Commits on Oct 22, 2012
  1. Add tests to make sure that the I18n taken message can be overrided i…

    …n the
    
    activerecord scope.
    
    Related with 5341b84
    rafaelfranca committed Oct 22, 2012
Commits on Oct 21, 2012
  1. Merge pull request #8006 from GRoguelon/master

    Remove extra line in Gemfile generated
    rafaelfranca committed Oct 21, 2012
  2. Merge branch 'master' of github.com:lifo/docrails

    Conflicts:
    	activesupport/lib/active_support/core_ext/hash/slice.rb
    	guides/source/active_support_core_extensions.md
    vijaydev committed Oct 21, 2012
  3. copy edits [ci skip]

    vijaydev committed Oct 21, 2012
  4. Merge pull request #7493 from steveklabnik/ajax_guide

    Re-writing the AJAX Guide
    fxn committed Oct 21, 2012
  5. minor edits in AM documentation [ci skip]

    Francesco Rodriguez committed Oct 21, 2012