Skip to content
Commits on Jun 2, 2012
  1. @vijaydev

    starting with the Rails 4.0 release notes

    vijaydev committed
    just a consolidation of the changelogs with minimal formatting
    
    [ci skip]
  2. @vijaydev
  3. @vijaydev

    copy edit AS guide [ci skip]

    vijaydev committed
  4. @vijaydev
  5. @vijaydev
  6. @shime
Commits on Jun 1, 2012
  1. @rafaelfranca

    Revert some ActiveSupport::Callbacks changes.

    rafaelfranca committed
    This reverts commits 911a085 and
    30b31f5.
    
    Reason: these changes make the Active Model tests fail randomly.
    
    Some examples:
    http://travis-ci.org/#!/rails/rails/jobs/1498992
    http://travis-ci.org/#!/rails/rails/jobs/1496948
    http://travis-ci.org/#!/rails/rails/jobs/1489985
    
    This script was used to reproduce these breaks:
    https://gist.github.com/f6828a03ee4d40bffbc3
    
    200 times, 0 failures
  2. @drogus

    Allow to use mounted helpers in ActionView::TestCase

    drogus committed
    Similarly to 6525002, this allows to use routes helpers for mounted
    helpers, but this time in ActionView::TestCase
  3. @fxn

    minor comment revision

    fxn committed
  4. @josevalim

    Merge pull request #6588 from nbibler/polymorphic_to_model

    josevalim committed
    Correct the use of to_model in polymorphic routing
  5. @rafaelfranca
  6. @drogus

    Include routes.mounted_helpers into integration tests

    drogus committed
    In integration tests, you might want to use helpers from engines that
    you mounted in your application. It's not hard to add it by yourself,
    but it's unneeded boilerplate. mounted_helpers are now included by
    default. That means that given engine mounted like:
    
        mount Foo::Engine => "/foo", :as => "foo"
    
    you will be able to use paths from this engine in tests this way:
    
        foo.root_path #=> "/foo"
    
    (closes #6573)
  7. @rafaelfranca

    Merge pull request #6586 from amatsuda/generator_blank_line

    rafaelfranca committed
    remove unneeded blank line from !namespeced? generated controllers
  8. @amatsuda
  9. @drogus

    Merge pull request #6583 from amatsuda/rake_dsl_19

    drogus committed
    Revert "Only include Rake::DSL if it's defined."
  10. @fxn

    Merge pull request #6584 from amatsuda/ar_explain_inspect_readability

    fxn committed
    improve readability of AR explain result
  11. @amatsuda
  12. @josevalim

    Merge pull request #6579 from amatsuda/null_relation_modulize

    josevalim committed
    modulize AR::NullRelation
  13. change welcome_helper.rb to home_helper.rb

    spyhole committed
  14. @schneems

    routes are viewable in browser (update guides)

    schneems committed
    From the Pull Request #6461
  15. @amatsuda

    Revert "Only include Rake::DSL if it's defined."

    amatsuda committed
    This reverts commit 82c3aca.
    
    Reason: Ruby 1.9.3 is shipped with Rake > 0.9
  16. @amatsuda

    unused method arguments

    amatsuda committed
  17. @amatsuda

    modulize AR::NullRelation

    amatsuda committed
    now we can invoke previously added scope extension methods
Commits on May 31, 2012
  1. @jeremy
  2. @tenderlove

    Merge branch 'master-sec'

    tenderlove committed
    * master-sec:
      Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
      predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
  3. @jeremy
  4. @jeremy
  5. @jeremy

    Psych is always available on 1.9

    jeremy committed
  6. @rafaelfranca

    Merge pull request #6571 from jeremyf/extract-force-ssl-filter-logic-…

    rafaelfranca committed
    …to-separate-method
    
    Extracted redirect logic from ActionController::Force::ClassMethods.forc...
  7. @jeremyf

    Extracted redirect logic from ActionController::Force::ClassMethods.f…

    jeremyf committed
    …orce_ssl
    
    Prior to this patch the existing .force_ssl method handles both defining
    the filter and handling the logic for performing the redirect.
    
    With this patch the logic for redirecting to the HTTPS protocol is
    separated from the filter logic that determines if a redirect should
    occur.  By separating the two levels of behavior, an instance method
    for ActionController (i.e. #force_ssl_redirect) is exposed and available
    for more granular SSL enforcement.
    
    Cleaned up indentation.
  8. @pixeltrix

    Reduce warning messages when running Active Support tests

    pixeltrix committed
    Eliminate the warnings generated by redefining methods and constants.
Something went wrong with that request. Please try again.