Permalink
Commits on May 15, 2012
  1. Merge pull request #6325 from kennyj/fix_5832-3

    Remove unnecessary assertions.
    carlosantoniodasilva committed May 15, 2012
  2. Merge pull request #6327 from nashby/string-interpolation

    remove backported string interpolation
    carlosantoniodasilva committed May 15, 2012
  3. Expand and improve #pluck docs

    jeremy committed May 15, 2012
  4. Remove unnecessary assertions. We should only test the before_seq isn…

    …'t same to the after_seq when using sequencer.
    kennyj committed May 15, 2012
  5. Merge pull request #6322 from acapilleri/some_mispelling_errors

    corrected some misspelling
    rafaelfranca committed May 15, 2012
  6. corrected some misspelling

    acapilleri committed May 15, 2012
  7. Merge pull request #5571 from jarkko/5559-fix-dst-jump-bug-on-master

    [#5559] Do not black out the system timezone DST jump hour if Time.zone ...
    tenderlove committed May 15, 2012
  8. Merge pull request #6284 from acapilleri/dup_validation

    clean the erros if an object that includes validation  is duped.
    carlosantoniodasilva committed May 15, 2012
  9. Revert "Revert "Remove `:disable_with` in favor of `'data-disable-wit…

    …h'` option from `submit_tag`, `button_tag` and `button_to` helpers.""
    
    Finally remove `:disable_with` but use `:data => { :disable_with => ... }`
    in examples to show off a better API (which looks nicer in Ruby 1.9)
    
    This reverts commit a5c38a9.
    josevalim committed May 15, 2012
  10. Revert "Remove `:disable_with` in favor of `'data-disable-with'` opti…

    …on from `submit_tag`, `button_tag` and `button_to` helpers."
    
    `disable_with:` is much easier to type than `"data-disable-with" =>`,
    and the fact it uses "data-disable-with" => is an implementation concern,
    it should not affect the public API.
    
    This reverts commit 683fc4d.
    josevalim committed May 15, 2012
  11. Merge branch 'master' of github.com:lifo/docrails

    Conflicts:
    	actionpack/lib/action_view/helpers/asset_tag_helper.rb
    vijaydev committed May 15, 2012
  12. missing dot [ci skip]

    vijaydev committed May 15, 2012
  13. copy edit asset guide [ci skip]

    vijaydev committed May 15, 2012
  14. Merge pull request #6318 from mpapis/master

    fix `bundle exec rails new app` not running `bundle install` properly
    josevalim committed May 15, 2012
  15. Removing ==Examples and last blank lines of docs from actionpack

    Francesco Rodriguez committed May 15, 2012
  16. s/aff/add [ci skip]

    mark-rushakoff committed May 15, 2012
  17. Merge pull request #6317 from korny/routes-draw-backtrace

    add tests and external file backtrace for Routing::Mapper#draw
    drogus committed May 15, 2012
  18. Merge pull request #6186 from anydiem/fix_unconventional_pks

    Set the primary key during #copy_table if necessary. Fixes [#2312]
    rafaelfranca committed May 15, 2012
Commits on May 14, 2012
  1. Remove `:disable_with` in favor of `'data-disable-with'` option from …

    …`submit_tag`, `button_tag` and `button_to` helpers.
    Carlos Galdino + Rafael Mendonça França committed May 14, 2012
  2. remove docs on Range#step

    nashby committed May 14, 2012
  3. Merge pull request #6220 from frodsan/pass_multiple_value

    Allow define_attribute_methods to pass multiple values
    rafaelfranca committed May 14, 2012
  4. updating define_attribute_methods documentation

    Francesco Rodriguez committed May 14, 2012
  5. allow define_attribute_methods to pass multiple values

    Francesco Rodriguez committed May 14, 2012