Permalink
Commits on Aug 29, 2011
  1. bumping to 3.1.0.rc8

    spastorino committed Aug 29, 2011
Commits on Aug 28, 2011
  1. bumping to 3.1.0.rc7

    spastorino committed Aug 28, 2011
  2. Merge pull request #2723 from guilleiguaran/3-1-0-changelogs

    Update changelogs for Rails 3.1.0
    spastorino committed Aug 28, 2011
  3. assert_no_match

    spastorino committed Aug 28, 2011
Commits on Aug 27, 2011
  1. deletes spurious arrow

    fxn committed Aug 27, 2011
  2. use sdoc to generate the API

    fxn committed Aug 27, 2011
Commits on Aug 25, 2011
Commits on Aug 24, 2011
  1. the command line guide is good to go

    fxn committed Aug 24, 2011
  2. Make ActionController::TestCase#recycle! set @protocol to nil

    This ensures that the protocol does not get carried over when there are
    two or more requests in functional tests. This was a problem when e.g.
    the first request was HTTP and the second request was HTTPS.
    
    Closes #2654.
    
    Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
    dmajda committed with spastorino Aug 23, 2011
  3. Add failing test case for #2654

    pixeltrix committed with spastorino Aug 23, 2011
  4. Bring in sprockets precompile task

    josh committed Aug 24, 2011
  5. Merge pull request #2644 from guilleiguaran/allow-assets-debugging

    Add config.allow_debugging option
    spastorino committed Aug 24, 2011
  6. Merge pull request #2668 from guilleiguaran/debug-assets-media-type

    Debug assets shouldn't ignore media type for stylesheets. Closes #2625
    spastorino committed Aug 24, 2011
  7. Merge pull request #2390 from arunagw/test_for_environment_file

    Test added to check development.rb, test.rb and production.rb content
    spastorino committed Aug 24, 2011
  8. Merge pull request #2647 from dmathieu/no_rescue

    remove useless rescue
    spastorino committed Aug 24, 2011
Commits on Aug 23, 2011
Commits on Aug 22, 2011
  1. Merge pull request #2411 from ai/debug_assets_by_config

    Debug assets by config
    spastorino committed Aug 22, 2011
  2. Merge branch '3-1-stable' into 3-1-0

    * 3-1-stable: (21 commits)
      Added a test to check for correct behaviour with no options in add_index command recorder
      Using .try to test for the existence of a method option in a nil-resistent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat
      Neatened up the invert_add_index method as per suggeston
      Simple fix for correctly inverting an add_index migration when a name has been provided
      Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251
      Fix Sprockets rewrite_asset_path
      Merge pull request #2620 from cesario/3-1-0
      Fix sprockets warnings
      Use typewriter styling on url_for in documentation
      Merge pull request #2609 from guilleiguaran/bump-sprockets-beta14
      remove extra space since comment_if already returns the space. (cherry picked from commit 5e73a2f)
      Merge pull request #2596 from dharmatech/patch-1
      Merge pull request #2595 from smartinez87/assets-guide
      Merge pull request #2597 from dharmatech/patch-2
      Merge pull request #2604 from vijaydev/params_wrapper_docs
      Merge pull request #2602 from ernie/fix_predicate_builder_primary_key_assumption
      Merge pull request #2603 from vijaydev/guides
      Merge pull request #2581 from guilleiguaran/debug-assets-in-dev
      Revert "Deprecate the use of non-public methods by Module#delegate"
      mailer guide: fixes indentation, and use fixed width fonts wherever necessary
      ...
    tenderlove committed Aug 22, 2011
  3. Added a test to check for correct behaviour with no options in add_in…

    …dex command recorder
    workmad3 committed with tenderlove May 24, 2011
  4. Using .try to test for the existence of a method option in a nil-resi…

    …stent manner. Inlined the determination of the options hash for reversing using a ternary operator. Shortens the method in a way that keeps the code neat
    workmad3 committed with tenderlove May 23, 2011
  5. Merge pull request #2216 from martinisoft/remove_generated_whitespace

    Remove generated whitespace
    spastorino committed Aug 22, 2011
  6. Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251

    Use mysql_creation_options inside rescue block
    spastorino committed Aug 22, 2011
  7. Merge pull request #2524 from JonathonMA/fix_ecd37084b28a05f05251

    Use mysql_creation_options inside rescue block
    spastorino committed Aug 22, 2011
Commits on Aug 21, 2011
  1. Merge pull request #2620 from cesario/3-1-0

    Fix CI and rename 1 misleading test case.
    spastorino committed Aug 21, 2011
  2. Merge pull request #2620 from cesario/3-1-0

    Fix CI and rename 1 misleading test case.
    spastorino committed Aug 21, 2011