Permalink
Commits on Apr 25, 2013
  1. ActiveRecord -> Active Record

    fxn committed Apr 25, 2013
  2. Revert "Merge pull request #10337 from eimermusic/fix_template_digest…

    rafaelfranca committed Apr 25, 2013
    …or_lookup"
    
    This reverts commit b423962, reversing
    changes made to f99ce3c.
    
    Reason: This broke the build
    https://travis-ci.org/rails/rails/jobs/6629894
  3. Merge pull request #10337 from eimermusic/fix_template_digestor_lookup

    rafaelfranca committed Apr 25, 2013
    Fix ActionView::Digestor to correctly pass format to LookupContext
    
    Conflicts:
    	actionpack/CHANGELOG.md
  4. Add support for extra options to `force_ssl`

    pixeltrix committed Apr 25, 2013
    This commit adds support for passing additional url options along
    with a :status option and any of the flash-related options to
    `redirect_to` (i.e. :flash, :alert & :notice).
    
    Closes #7570.
  5. AV Digestor correctly passes format to LookupContext

    eimermusic committed Apr 25, 2013
    ActionView::Digestor now passes arguments correctly to
    LookupContext::find method. This makes cache digests
    respect the format option correctly.
    
    FixtureFinder in tests also changed to reflect this.
  6. Use `request.fullpath` to build redirect url in `force_ssl`

    pixeltrix committed Apr 25, 2013
    The `force_ssl` command now builds the redirect url from `request.fullpath`.
    This ensures that the format is maintained and it doesn't redirect to a route
    that has the same parameters but is defined earlier in `routes.rb`. Also any
    optional segments are maintained.
    
    Fixes #7528.
    Fixes #9061.
    Fixes #10305.
Commits on Apr 24, 2013
  1. Merge pull request #10333 from ikataitsev/move-test-method-to-tests

    rafaelfranca committed Apr 24, 2013
    Move method used only in the test to the test code itself
  2. Merge pull request #10332 from vipulnsward/number_helper

    rafaelfranca committed Apr 24, 2013
    refactor number helper
  3. Use env == 'development' instead of env.development?

    drogus committed Apr 24, 2013
    It's simpler to assume that passed env is just a string without any
    extensions, especially when DatabaseTasks are intended to be used also
    without rails.
  4. refactor number helper

    vipulnsward committed Apr 24, 2013
  5. Merge pull request #10330 from kennyj/fix_10067

    rafaelfranca committed Apr 24, 2013
    Serialized column should not be wrapped twice. Fix #10067.
  6. Add some documentation to ActiveRecord::Tasks::DatabaseTasks

    drogus committed Apr 24, 2013
    This is a public class, which could be used directly in order to allow
    easier database management. Now it also contains settings, which will be
    used by databases.rake.
  7. Use DatabaseTasks.fixtures_path instead of FIXTURES_PATH in db.rake

    drogus committed Apr 24, 2013
    This will allow to set fixtures path in global config easier, it should
    be not needed to use FIXTURES_PATH every time user wants to load
    fixtures.
  8. Fix a SystemStackError that occurs when using time zone aware attribu…

    derikson authored and kennyj committed Apr 3, 2013
    …tes.
    
    This fixes issue #10066
  9. Merge pull request #10331 from neerajdotname/exec-migration-in-transa…

    guilleiguaran committed Apr 24, 2013
    …ction
    
    Remove code duplication
  10. Remove code duplication

    Neeraj Singh
    Neeraj Singh committed Apr 24, 2013
  11. Merge pull request #10256 from wangjohn/moving_check_for_test_environ…

    rafaelfranca committed Apr 24, 2013
    …ment_into_rails_env
    
    Moved the check for the rails test environment into rails.rb
    
    Closes #10238
  12. Lookup the class at runtime, not when the association is built

    pixeltrix committed Apr 24, 2013
    Trying to lookup the parent class when the association is being built
    runs the risk of generating uninitialized constant errors because
    classes haven't been fully defined yet. To work around this we look up
    the class at runtime through the `association` method.
    
    Fixes #10197.
  13. Removed unused associations

    pixeltrix committed Apr 24, 2013
  14. added test cases for #10197

    adamgamble authored and pixeltrix committed Apr 23, 2013
  15. Revert "Revert "`belongs_to :touch` behavior now touches old associat…

    pixeltrix committed Apr 24, 2013
    …ion when transitioning to new association" until a proper fix is found for #10197"
    
    This reverts commit 7389df1.
    
    Conflicts:
    	activerecord/test/cases/timestamp_test.rb
  16. Merge pull request #10324 from prijutme4ty/guides_fix

    fxn committed Apr 24, 2013
    fixed missing comma in example
Commits on Apr 23, 2013
  1. Moved the check for the rails test environment into rails/test_unit s…

    wangjohn committed Apr 17, 2013
    …o that you
    
    can select frameworks separately when running rake test.