Permalink
Commits on Jun 7, 2011
  1. bumping to rails 3.1.0.rc2

    tenderlove committed Jun 7, 2011
  2. Ensure that the strings returned by SafeBuffer#gsub and friends aren'…

    …t considered html_safe?
    
    Also make sure that the versions of those methods which modify a string in place such as gsub! can't be called on safe buffers at all.
    
    Conflicts:
    
    	activesupport/test/safe_buffer_test.rb
    NZKoz committed with tenderlove Jun 7, 2011
  3. fix spacing

    Conflicts:
    
    	railties/guides/source/configuring.textile
    vijaydev committed with fxn Jun 7, 2011
  4. add missing generator configs

    vijaydev committed with fxn Jun 7, 2011
  5. sprockets gzips assets now

    Conflicts:
    
    	railties/lib/rails/tasks/assets.rake
    fxn committed Jun 7, 2011
  6. Merge pull request #1528 from chriseppstein/3-1-stable

    Update project Gemfile to use the sass-rails rc
    tenderlove committed Jun 7, 2011
  7. Merge pull request #1527 from guilleiguaran/3-1-stable

    Rails::Server#app should be nice with Rack::URLMap (3.1 stable)
    josevalim committed Jun 7, 2011
  8. adds missing require

    fxn committed Jun 7, 2011
Commits on Jun 6, 2011
  1. more oracle fixes

    tenderlove committed Jun 6, 2011
  2. updating configs for oracle

    tenderlove committed Jun 6, 2011
  3. comment the recorder methods

    vijaydev committed with fxn Jun 6, 2011
  4. document assets related rake tasks

    vijaydev committed with fxn Jun 6, 2011
  5. Validations guide: order of :after_save callback was incorrect.

    The guide was contracting itself. First it stated that 'there is a list
    of callbacks in order of execution', on the list 'after_save' was placed
    before 'after_create', and then there was a warning that 'after_save'
    runs after them. I am not sure about 'around_' callbacks, but let's
    leave that for another patch.
    Arsen7 committed with fxn Jun 6, 2011
  6. minor edits in migrations guide

    vijaydev committed with fxn Jun 5, 2011
  7. Remove trailing white-spaces

    guilleiguaran committed with fxn Jun 5, 2011