Skip to content
Commits on Mar 27, 2012
  1. Don't ignore non Enumerable values passed to sanitize (closes #5585)

    When someone accidentally passes a string to sanitize like:
    
    sanitize("<span>foo</span>", :tags => "b")
    
    there is no indication that it's the wrong way and span
    will not be removed.
    committed Mar 27, 2012
Commits on Mar 26, 2012
  1. Merge pull request #5594 from lest/patch-1

    apply form_for namespace option to date_select
    committed Mar 26, 2012
  2. @gutenye

    ActiveRecord::Coders::YAMLColumn#dump should raise an error

    closes #2737
    
    Conflicts:
    
    	activerecord/lib/active_record/coders/yaml_column.rb
    gutenye committed with Aug 29, 2011
  3. @tenderlove

    Merge pull request #5595 from guilleiguaran/sprockets-rails-1.0.0

    sprockets-rails 1.0.0 was released, remove git dependency from Gemfile
    tenderlove committed Mar 26, 2012
  4. @guilleiguaran
  5. @lest
  6. @tenderlove
  7. @tenderlove
  8. @tenderlove

    Merge pull request #5593 from lukesarnacki/activemodel_name_compositi…

    …on_over_inheritance
    
    ActiveModel::Name does not inherit from string
    tenderlove committed Mar 26, 2012
  9. ActiveModel::Name does not inherit from string

    Lukasz Sarnacki committed Mar 26, 2012
  10. @josevalim

    Merge pull request #5183 from lest/patch-1

    use content_tag in button_to helper
    josevalim committed Mar 26, 2012
  11. @josevalim

    Merge pull request #5581 from jamie/custom_param_field

    Allow a defining custom member field on resources
    josevalim committed Mar 26, 2012
  12. @jamie

    Allow a defining custom member field on resources

    By default, resources routes are created with :resource/:id. A model
    defining to_param can make prettier urls by using something more
    readable than an integer ID, but since the route picks it up as :id you
    wind up with awkward User.find_by_username(params[:id]) calls.
    
    By overriding the key to be used in @request.params you can be more
    obvious in your intent.
    jamie committed Mar 25, 2012
  13. @fxn

    Merge pull request #5575 from phiggins/remove_conditional_from_statis…

    …tics_task
    
    Remove useless conditional.
    fxn committed Mar 25, 2012
  14. @phiggins

    Remove useless conditional.

    phiggins committed Mar 25, 2012
Commits on Mar 25, 2012
  1. @fxn

    restores example depicting the use of true or false in regular font

    There was an example here that mentioned reload_plugins?
    but it was deleted. This commit puts another example back.
    fxn committed Mar 25, 2012
  2. Merge pull request #5566 from lest/patch-3

    fix HashWithIndifferentAccess.[] method
    committed Mar 25, 2012
  3. @jeremy

    Merge pull request #5570 from avakhov/ac-caching-split

    ActionController caching small String#split optimization
    jeremy committed Mar 24, 2012
Commits on Mar 24, 2012
  1. @fxn

    Revert "Return an actual boolean from xml_http_request?"

    Reason: This commit changes code that was committed some year
    and a half ago. The original code is an ordinary predicate
    that delegates straight to a boolean operator with no further
    unnecessaru adorments, as clearly explained in #5329.
    
    This change also may confuse users who may now believe they can
    rely now on singletons, while predicates in Rails rely on
    standard Ruby semantics for boolean values and guarantee no
    singletons whatsover.
    
    This reverts commit 6349791.
    fxn committed Mar 25, 2012
  2. @avakhov
  3. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    Conflicts:
    	guides/source/ruby_on_rails_guides_guidelines.textile
    vijaydev committed Mar 24, 2012
  4. @vijaydev

    Merge pull request #5569 from arunagw/warning_remove_master

    removed warning: shadowing outer local variable - exception
    vijaydev committed Mar 24, 2012
  5. @vijaydev

    spacing fix in guide [ci skip]

    vijaydev committed Mar 24, 2012
  6. @arunagw
  7. @tenderlove

    Merge pull request #5567 from tpope/xhr-boolean

    Return an actual boolean from xml_http_request?
    tenderlove committed Mar 23, 2012
  8. @tpope
Commits on Mar 23, 2012
  1. [getting started][ci skip] fix link to the code

    Fabián Rodríguez committed Mar 22, 2012
  2. @lest
  3. @tenderlove
  4. @tenderlove
  5. @tenderlove

    Merge pull request #5550 from schneems/schneems/server_env

    Fix environment support for rails server, and match interface of rails console
    tenderlove committed Mar 23, 2012
  6. @josevalim

    Merge pull request #5518 from rafaelfranca/minor-refactor

    Remove code duplication
    josevalim committed Mar 23, 2012
  7. Merge pull request #5556 from rafaelfranca/remove-warning

    use the new scope syntax on the tests to avoid DEPRECATION WARNINGS.
    committed Mar 23, 2012
  8. @rafaelfranca

    Use the new scope syntax

    rafaelfranca committed Mar 22, 2012
  9. @josevalim

    Merge pull request #5374 from nertzy/remove_deprecated_partial_path_f…

    …rom_active_model_naming
    
    Remove ActiveModel::Naming#partial_path
    josevalim committed Mar 23, 2012
Something went wrong with that request. Please try again.