Permalink
Commits on Jan 25, 2012
  1. Merge pull request #4524 from nashby/datetime-18-code

    remove ruby 1.8 related code
    josevalim committed Jan 25, 2012
  2. Merge pull request #4667 from carlosantoniodasilva/av-number-helper

    Action View number helpers improvements
    josevalim committed Jan 25, 2012
  3. Merge pull request #4661 from janko-m/master

    Modify video_tag a bit and make audio_tag able to accept multiple sources
    josevalim committed Jan 25, 2012
  4. Merge pull request #4651 from paul/mysql-add-index-bug

    Handle nil in add_index :length option in MySQL
    josevalim committed Jan 25, 2012
Commits on Jan 24, 2012
  1. Handle nil in add_index :length option in MySQL

    Our schema.rb is being generated with an `add_index` line similar to this:
    
        add_index "foo", ["foo", "bar"], :name => "xxx", :length => {"foo"=>8, "bar=>nil}
    
    This is the same as it was on Rails 3.1.3, however, now when that
    schema.rb is evaluated, its generating bad SQL in MySQL:
    
        Mysql::Error: You have an error in your SQL syntax; check the manual
        that corresponds to your MySQL server version for the right syntax
        to use near '))' at line 1: CREATE UNIQUE INDEX
        `xxx` ON `foo` (`foo`(8), `bar`())
    
    This commit adds a check for nil on the length attribute to prevent the
    empty parens from being output.
    paul committed Jan 24, 2012
  2. Remove unused variables to avoid warnings

    Signed-off-by: José Valim <jose.valim@gmail.com>
    rafaelfranca committed with josevalim Jan 24, 2012
  3. Merge pull request #4606 from lest/patch-1

    remove unnecessary AS::Concern usage
    tenderlove committed Jan 24, 2012
  4. Merge pull request #4641 from rafaelfranca/date_select-fix-3-2

    date_select fixes [3-2-stable]
    josevalim committed Jan 24, 2012
  5. Merge pull request #4514 from brainopia/update_timezone_offets

    Update time zone offset information
    tenderlove committed Jan 24, 2012
  6. Merge pull request #3775 from karevn/master

    Please pull my changes - they fix a rare problem with tests framework
    tenderlove committed Jan 24, 2012
  7. Merge pull request #4630 from lest/patch-2

    Use instance_eval instead of Proc#bind
    tenderlove committed Jan 24, 2012
  8. Merge pull request #4637 from railsaholic/error_message_fix

    quote fix ` to ' in the ArgumentError message
    tenderlove committed Jan 24, 2012
  9. quote fix ` to ' in the ArgumentError message

    message quote fix
    hindenbug committed Jan 23, 2012
  10. Merge pull request #4636 from sachin87/code_improved

    code improved with better condition
    fxn committed Jan 24, 2012
  11. code improved

    sachin87 committed Jan 24, 2012
  12. Merge pull request #4628 from rafaelfranca/fix-build

    Fix broken build
    josevalim committed Jan 24, 2012
  13. Merge pull request #4596 from kennyj/fix_4344

    Fix GH #4344. Callback defined in a module is not triggered when the module extends an object under Rails 3.2rc2
    josevalim committed Jan 24, 2012
Commits on Jan 23, 2012
  1. Use instance_eval instead of Proc#bind

    Proc#bind is not useful when called immediately and previous check for #call method is not correct
    lest committed Jan 23, 2012
  2. updated the warning signature

    tenderlove committed Jan 20, 2012
  3. Merge pull request #4558 from stephencelis/type-cast-unknown-should-fail

    Don't type-cast unknown types to YAML.
    tenderlove committed Jan 23, 2012